Removed now useless calls to primitive wrapper's toString() on arguments of...

Jean-Noel Rouvignac

03.07.2014 9f8bc22aa6b924a06a284582043dc3e912705f68

Removed now useless calls to primitive wrapper's toString() on arguments of Logger.*(...) and ArgN.get(...).

 opendj3-server-dev/replace.rb

@@ -243,6 +243,19 @@
      ]
  }

  LOGGER_MSG_ARGN_PRIMITIVE_TOSTRING = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
        '\1',
        # Need to fix removing the last parentheses
        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
        '\1',
      ]
  }

  LOGGER_ISTRACEENABLED_TRACEEXCEPTION = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
@@ -256,7 +269,7 @@
  }

  # List of replacements to run
  REPLACEMENTS = [ LOGGER_TOSTRING ]
  REPLACEMENTS = [ LOGGER_MSG_ARGN_PRIMITIVE_TOSTRING ]


  ################################### Processing methods ########################################

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java

@@ -1494,8 +1494,7 @@
          {
            ae = new ApplicationException(
                ReturnCode.IMPORT_ERROR,
                INFO_ERROR_IMPORT_LDIF_TOOL_RETURN_CODE.get(
                    Integer.toString(result)), null);
                INFO_ERROR_IMPORT_LDIF_TOOL_RETURN_CODE.get(result), null);
          }
        } catch (Throwable t)
        {

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java

@@ -1245,7 +1245,7 @@
      if (globalAcis != null)
      {
        aciList.addAci(DN.rootDN(), globalAcis);
        logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(Integer.toString(globalAcis.size())));
        logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(globalAcis.size()));
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java

@@ -165,8 +165,7 @@
                        levels[numLevels++]=Integer.decode(v);
                    } else {
                        LocalizableMessage message =
                        WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED.
                              get(pattern, Integer.toString(MAX_LEVELS));
                        WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED.get(pattern, MAX_LEVELS);
                        throw new AciException(message);
                    }
                } catch (NumberFormatException ex) {

 opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java

@@ -549,8 +549,7 @@
    if(interval == 0) {
      DirectoryServer.registerShutdownListener(this);
      interval=newInterval;
      msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_STARTING.
              get(Long.toString(interval)));
      msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_STARTING.get(interval));
      setUpBackGroundProcessing();
    } else if(newInterval == 0) {
      LocalizableMessage message=
@@ -561,9 +560,7 @@
    } else {
      interval=newInterval;
      backGroundThread.interrupt();
      msgs.add(
             INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_UPDATE_INTERVAL_CHANGED.
                      get(Long.toString(interval),Long.toString(newInterval)));
      msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_UPDATE_INTERVAL_CHANGED.get(interval, newInterval));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -1499,11 +1499,11 @@
    {
    case IMPORT_ERROR_MESSAGE_BAD_REMOTE:
      msg = NOTE_ERR_FULL_UPDATE_IMPORT_FRACTIONAL_BAD_REMOTE.get(
          getBaseDNString(), Integer.toString(ieCtx.getImportSource()));
          getBaseDNString(), ieCtx.getImportSource());
      break;
    case IMPORT_ERROR_MESSAGE_REMOTE_IS_FRACTIONAL:
      msg = NOTE_ERR_FULL_UPDATE_IMPORT_FRACTIONAL_REMOTE_IS_FRACTIONAL.get(
          getBaseDNString(), Integer.toString(ieCtx.getImportSource()));
          getBaseDNString(), ieCtx.getImportSource());
      break;
    }
    ieCtx.setException(new DirectoryException(UNWILLING_TO_PERFORM, msg));
@@ -1525,7 +1525,7 @@
    if (target == RoutableMsg.ALL_SERVERS && fractionalConfig.isFractional())
    {
      LocalizableMessage msg = NOTE_ERR_FRACTIONAL_FORBIDDEN_FULL_UPDATE_FRACTIONAL.get(
            getBaseDNString(), Integer.toString(getServerId()));
            getBaseDNString(), getServerId());
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, msg);
    }

@@ -2065,8 +2065,7 @@
        } catch (TimeoutException ex)
        {
          // This exception may only be raised if assured replication is enabled
          logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
              Long.toString(getAssuredTimeout()), msg));
          logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), msg));
        }
      }

@@ -4522,13 +4521,12 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(
          getBaseDNString(), Integer.toString(getServerId()),
          sourceString, stackTraceToSingleLineString(e));
          getBaseDNString(), getServerId(), sourceString, stackTraceToSingleLineString(e));
      throw new DirectoryException(ResultCode.OTHER, message, e);
    }

    LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(getBaseDNString(),
        Integer.toString(getServerId()), Integer.toString(source), "");
    LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(
        getBaseDNString(), getServerId(), source, "");
    throw new DirectoryException(ResultCode.OTHER, message);
  }


 opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java

@@ -103,11 +103,8 @@
    {
      // Prevent useless error message (full update status cannot lead to bad
      // gen status)
      logger.info(NOTE_BAD_GEN_ID_IN_FULL_UPDATE, Integer.toString(replicationServer.getServerId()),
              getBaseDNString(),
              Integer.toString(serverId),
              Long.toString(generationId),
              Long.toString(newGenId));
      logger.info(NOTE_BAD_GEN_ID_IN_FULL_UPDATE, replicationServer.getServerId(),
              getBaseDNString(), serverId, generationId, newGenId);
      return;
    }

@@ -451,8 +448,7 @@
      catch(IOException e)
      {
        LocalizableMessage errMessage = ERR_DS_DISCONNECTED_DURING_HANDSHAKE.get(
          Integer.toString(inServerStartMsg.getServerId()),
          Integer.toString(replicationServer.getServerId()));
            inServerStartMsg.getServerId(), replicationServer.getServerId());
        throw new DirectoryException(ResultCode.OTHER, errMessage);
      }
      catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java

@@ -30,7 +30,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.TreeMap;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;

@@ -155,8 +154,7 @@
      if ((map.size() == 0) && (bytesCount != 0))
      {
        // should never happen
        LocalizableMessage msg = ERR_BYTE_COUNT.get(Integer.toString(bytesCount));
        logger.error(msg);
        logger.error(ERR_BYTE_COUNT, bytesCount);
        bytesCount = 0;
      }
      return update;

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java

@@ -592,7 +592,7 @@
    {
      // Should never happen
      logger.error(ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL.get(
        localReplicationServer.getServerId(), Byte.toString(safeDataLevel), baseDN, update));
          localReplicationServer.getServerId(), safeDataLevel, baseDN, update));
    } else if (sourceGroupId == groupId
    // Assured feature does not cross different group IDS
        && isSameGenerationId(sourceHandler.getGenerationId()))
@@ -741,8 +741,7 @@
             */
            LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
            mb.append(ERR_RS_ERROR_SENDING_ACK.get(
              Integer.toString(localReplicationServer.getServerId()),
              Integer.toString(origServer.getServerId()),
                localReplicationServer.getServerId(), origServer.getServerId(),
              csn, baseDN.toNormalizedString()));
            mb.append(" ");
            mb.append(stackTraceToSingleLineString(e));
@@ -819,8 +818,7 @@
             */
            LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
            mb.append(ERR_RS_ERROR_SENDING_ACK.get(
                Integer.toString(localReplicationServer.getServerId()),
                Integer.toString(origServer.getServerId()),
                localReplicationServer.getServerId(), origServer.getServerId(),
                csn, baseDN.toNormalizedString()));
            mb.append(" ");
            mb.append(stackTraceToSingleLineString(e));
@@ -1472,8 +1470,7 @@
        {
          // We log the error. The requestor will detect a timeout or
          // any other failure on the connection.
          logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(Integer.toString(msg
              .getDestination())));
          logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(msg.getDestination()));
        }
      }
    }
@@ -1505,8 +1502,7 @@
      RoutableMsg msg)
  {
    LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
    mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(
        baseDN.toNormalizedString(), Integer.toString(msg.getDestination())));
    mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toNormalizedString(), msg.getDestination()));
    mb.append(" In Replication Server=").append(
      this.localReplicationServer.getMonitorInstanceName());
    mb.append(" unroutable message =").append(msg.getClass().getSimpleName());
@@ -1549,8 +1545,7 @@
         */
        LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
        mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(
            baseDN.toNormalizedString(),
            Integer.toString(msg.getDestination())));
            baseDN.toNormalizedString(), msg.getDestination()));
        mb.append(" unroutable message =" + msg.getClass().getSimpleName());
        mb.append(" Details: " + ioe.getLocalizedMessage());
        final LocalizableMessage message = mb.toMessage();
@@ -1734,7 +1729,7 @@
              if (i == 2)
              {
                logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "directory",
                    Integer.toString(dsHandler.getServerId()), e.getMessage());
                    dsHandler.getServerId(), e.getMessage());
              }
            }
          }
@@ -1768,7 +1763,7 @@
            if (i == 2)
            {
              logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "replication",
                  Integer.toString(rsHandler.getServerId()), e.getMessage());
                  rsHandler.getServerId(), e.getMessage());
            }
          }
        }
@@ -1971,8 +1966,7 @@
        } catch (IOException e)
        {
          logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDN.toNormalizedString(),
              Integer.toString(dsHandler.getServerId()),
              e.getMessage()));
              dsHandler.getServerId(), e.getMessage()));
        }
      }

@@ -2099,10 +2093,8 @@
      }
      catch (IOException e)
      {
        logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER
            .get(baseDN.toNormalizedString(),
                Integer.toString(dsHandler.getServerId()),
                e.getMessage()));
        logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER.get(
            baseDN.toNormalizedString(), dsHandler.getServerId(), e.getMessage()));
      }

      if (newStatus == ServerStatus.INVALID_STATUS || newStatus == oldStatus)

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java

@@ -382,10 +382,8 @@
    catch (IOException e)
    {
      logger.traceException(e);
      LocalizableMessage errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
          Integer.toString(inReplServerStartMsg.getServerId()),
          Integer.toString(replicationServer.getServerId()));
      abortStart(errMessage);
      abortStart(ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
          inReplServerStartMsg.getServerId(), replicationServer.getServerId()));
    }
    catch (DirectoryException e)
    {

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java

@@ -1012,10 +1012,9 @@
        warn user and start heartbeat monitor to recover when a server
        with the right group id shows up.
        */
        logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(Byte
            .toString(groupId), Integer.toString(rs.getServerId()), rsInfo
            .getServerURL(), Byte.toString(rs.getGroupId()), baseDN
            .toNormalizedString(), Integer.toString(getServerId())));
        logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(
            groupId, rs.getServerId(), rsInfo.getServerURL(), rs.getGroupId(),
            baseDN.toNormalizedString(), getServerId()));
      }
      startRSHeartBeatMonitoring(rs);
      if (rsInfo.getProtocolVersion() >=
@@ -2948,8 +2947,7 @@
    } catch (IOException ex)
    {
      logger.error(ERR_EXCEPTION_SENDING_CS, getBaseDN().toNormalizedString(),
        Integer.toString(getServerId()),
        ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
        getServerId(), ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -341,8 +341,7 @@
    // Sanity check: is it a valid initial status?
    if (!isValidInitialStatus(initStatus))
    {
      logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus,
          getBaseDNString(), Integer.toString(getServerId())));
      logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus, getBaseDNString(), getServerId()));
    }
    else
    {
@@ -370,8 +369,7 @@
    StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
    if (event == StatusMachineEvent.INVALID_EVENT)
    {
      logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus,
          getBaseDNString(), Integer.toString(getServerId())));
      logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus, getBaseDNString(), getServerId()));
      return;
    }

@@ -1551,9 +1549,7 @@
    if (!ieCtx.failureList.isEmpty() && exportRootException == null)
    {
      exportRootException = new DirectoryException(ResultCode.OTHER,
              ERR_INIT_NO_SUCCESS_END_FROM_SERVERS.get(
                  Long.toString(getGenerationID()),
                  ieCtx.failureList));
              ERR_INIT_NO_SUCCESS_END_FROM_SERVERS.get(getGenerationID(), ieCtx.failureList));
    }

    // Don't forget to release IEcontext acquired at beginning.
@@ -1910,11 +1906,8 @@
          if (msg instanceof TopologyMsg
              && isRemoteDSConnected(ieCtx.importSource) == null)
          {
            LocalizableMessage errMsg =
              LocalizableMessage.raw(                  ERR_INIT_EXPORTER_DISCONNECTION.get(
                      getBaseDNString(),
                      Integer.toString(getServerId()),
                      Integer.toString(ieCtx.importSource)));
            LocalizableMessage errMsg = ERR_INIT_EXPORTER_DISCONNECTION.get(
                getBaseDNString(), getServerId(), ieCtx.importSource);
            ieCtx.setExceptionIfNoneSet(new DirectoryException(
                ResultCode.OTHER, errMsg));
            return null;
@@ -2006,8 +1999,7 @@
      if (isRemoteDSConnected(slowestServerId)==null)
      {
        ieCtx.setException(new DirectoryException(ResultCode.OTHER,
            ERR_INIT_HEARTBEAT_LOST_DURING_EXPORT.get(
                Integer.toString(ieCtx.getSlowestServer()))));
            ERR_INIT_HEARTBEAT_LOST_DURING_EXPORT.get(ieCtx.getSlowestServer())));

        throw new IOException("IOException with nested DirectoryException",
            ieCtx.getException());
@@ -2035,8 +2027,7 @@
        {
          // publish failed - store the error in the ieContext ...
          DirectoryException de = new DirectoryException(ResultCode.OTHER,
              ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(
                  Integer.toString(broker.getRsServerId())));
              ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(broker.getRsServerId()));
          ieCtx.setExceptionIfNoneSet(de);
          // .. and abandon the export by throwing an exception.
          throw new IOException(de.getMessage());
@@ -2063,8 +2054,7 @@
    {
      // publish failed - store the error in the ieContext ...
      DirectoryException de = new DirectoryException(ResultCode.OTHER,
          ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(
              Integer.toString(broker.getRsServerId())));
          ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(broker.getRsServerId()));
      ieCtx.setExceptionIfNoneSet(de);
      // .. and abandon the export by throwing an exception.
      throw new IOException(de.getMessage());
@@ -2567,8 +2557,7 @@
    if (!isConnected())
    {
      LocalizableMessage message = ERR_RESET_GENERATION_CONN_ERR_ID.get(getBaseDNString(),
          Integer.toString(getServerId()),
          Long.toString(genIdMessage.getGenerationId()));
          getServerId(), genIdMessage.getGenerationId());
      throw new DirectoryException(ResultCode.OTHER, message);
    }
    broker.publish(genIdMessage);
@@ -3427,8 +3416,7 @@
    } catch (TimeoutException ex)
    {
      // This exception may only be raised if assured replication is enabled
      logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
          Long.toString(getAssuredTimeout()), update));
      logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), update));
    }
  }


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java

@@ -887,8 +887,7 @@
          "ds-task-initialize-domain-dn: " + baseDN,
          "ds-task-initialize-replica-server-id: -3");
      addTask(taskInit, ResultCode.OTHER,
          ERR_INVALID_IMPORT_SOURCE.get(baseDN.toNormalizedString(),
              Integer.toString(server1ID),"-3",""));
          ERR_INVALID_IMPORT_SOURCE.get(baseDN.toNormalizedString(), server1ID,"-3",""));

      // Scope containing a serverID absent from the domain
      // createTask(taskInitTargetS2);
@@ -1140,7 +1139,7 @@
        "ds-task-initialize-replica-server-id: " + server1ID);

      addTask(taskInit, ResultCode.OTHER, ERR_INVALID_IMPORT_SOURCE.get(
          baseDN.toNormalizedString(), Integer.toString(server1ID),"20",""));
          baseDN.toNormalizedString(), server1ID, "20", ""));

      if (replDomain != null)
      {