From 6fa634b23cbf973205587020f5da040c1b259fa4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 13:29:16 +0000
Subject: [PATCH] AutoRefactor: fix primitive wrappers usage
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java | 8 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java | 2
opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ResultCodeFactory.java | 87 +++++++++++++---------------
opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java | 24 +++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java | 4
opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 6 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java | 4
opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 12 ++-
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java | 2
11 files changed, 74 insertions(+), 81 deletions(-)
diff --git a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 7b2099a..26a340a 100644
--- a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -171,7 +171,7 @@
try {
hostName = config.getServletContext().getInitParameter(HOST);
- port = new Integer(config.getServletContext().getInitParameter(PORT));
+ port = Integer.valueOf(config.getServletContext().getInitParameter(PORT));
userDN = config.getServletContext().getInitParameter(USERDN);
diff --git a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ResultCodeFactory.java b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ResultCodeFactory.java
index f47bdf4..07ecfc2 100644
--- a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ResultCodeFactory.java
+++ b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ResultCodeFactory.java
@@ -21,12 +21,10 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS.
+ * Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.dsml.protocol;
-
-
import java.util.HashMap;
/**
@@ -39,51 +37,48 @@
new HashMap<Integer,LDAPResultCode>();
static
{
- codeToDescr.put(new Integer(0), LDAPResultCode.SUCCESS);
- codeToDescr.put(new Integer(1), LDAPResultCode.OPERATIONS_ERROR);
- codeToDescr.put(new Integer(2), LDAPResultCode.PROTOCOL_ERROR);
- codeToDescr.put(new Integer(3), LDAPResultCode.TIME_LIMIT_EXCEEDED);
- codeToDescr.put(new Integer(4), LDAPResultCode.SIZE_LIMIT_EXCEEDED);
- codeToDescr.put(new Integer(5), LDAPResultCode.COMPARE_FALSE);
- codeToDescr.put(new Integer(6), LDAPResultCode.COMPARE_TRUE);
- codeToDescr.put(new Integer(7), LDAPResultCode.AUTH_METHOD_NOT_SUPPORTED);
+ codeToDescr.put(0, LDAPResultCode.SUCCESS);
+ codeToDescr.put(1, LDAPResultCode.OPERATIONS_ERROR);
+ codeToDescr.put(2, LDAPResultCode.PROTOCOL_ERROR);
+ codeToDescr.put(3, LDAPResultCode.TIME_LIMIT_EXCEEDED);
+ codeToDescr.put(4, LDAPResultCode.SIZE_LIMIT_EXCEEDED);
+ codeToDescr.put(5, LDAPResultCode.COMPARE_FALSE);
+ codeToDescr.put(6, LDAPResultCode.COMPARE_TRUE);
+ codeToDescr.put(7, LDAPResultCode.AUTH_METHOD_NOT_SUPPORTED);
// Note not STRONGER_AUTH_REQUIRED, that's the RFC 4511 name
- codeToDescr.put(new Integer(8), LDAPResultCode.STRONG_AUTH_REQUIRED);
- codeToDescr.put(new Integer(10), LDAPResultCode.REFERRAL);
- codeToDescr.put(new Integer(11), LDAPResultCode.ADMIN_LIMIT_EXCEEDED);
- codeToDescr.put(new Integer(12),
+ codeToDescr.put(8, LDAPResultCode.STRONG_AUTH_REQUIRED);
+ codeToDescr.put(10, LDAPResultCode.REFERRAL);
+ codeToDescr.put(11, LDAPResultCode.ADMIN_LIMIT_EXCEEDED);
+ codeToDescr.put(12,
LDAPResultCode.UNAVAILABLE_CRITICAL_EXTENSION);
- codeToDescr.put(new Integer(13), LDAPResultCode.CONFIDENTIALITY_REQUIRED);
- codeToDescr.put(new Integer(14), LDAPResultCode.SASL_BIND_IN_PROGRESS);
- codeToDescr.put(new Integer(16), LDAPResultCode.NO_SUCH_ATTRIBUTE);
- codeToDescr.put(new Integer(17), LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE);
- codeToDescr.put(new Integer(18), LDAPResultCode.INAPPROPRIATE_MATCHING);
- codeToDescr.put(new Integer(19), LDAPResultCode.CONSTRAINT_VIOLATION);
- codeToDescr.put(new Integer(20), LDAPResultCode.ATTRIBUTE_OR_VALUE_EXISTS);
- codeToDescr.put(new Integer(21), LDAPResultCode.INVALID_ATTRIBUTE_SYNTAX);
- codeToDescr.put(new Integer(32), LDAPResultCode.NO_SUCH_OBJECT);
- codeToDescr.put(new Integer(33), LDAPResultCode.ALIAS_PROBLEM);
- codeToDescr.put(new Integer(34), LDAPResultCode.INVALID_DN_SYNTAX);
- codeToDescr.put(new Integer(36),
- LDAPResultCode.ALIAS_DEREFERENCING_PROBLEM);
- codeToDescr.put(new Integer(48),
- LDAPResultCode.INAPPROPRIATE_AUTHENTICATION);
- codeToDescr.put(new Integer(49), LDAPResultCode.INVALID_CREDENTIALS);
- codeToDescr.put(new Integer(50), LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS);
- codeToDescr.put(new Integer(51), LDAPResultCode.BUSY);
- codeToDescr.put(new Integer(52), LDAPResultCode.UNAVAILABLE);
- codeToDescr.put(new Integer(53), LDAPResultCode.UNWILLING_TO_PERFORM);
- codeToDescr.put(new Integer(54), LDAPResultCode.LOOP_DETECT);
- codeToDescr.put(new Integer(64), LDAPResultCode.NAMING_VIOLATION);
- codeToDescr.put(new Integer(65), LDAPResultCode.OBJECT_CLASS_VIOLATION);
- codeToDescr.put(new Integer(66), LDAPResultCode.NOT_ALLOWED_ON_NON_LEAF);
- codeToDescr.put(new Integer(67), LDAPResultCode.NOT_ALLOWED_ON_RDN);
- codeToDescr.put(new Integer(68), LDAPResultCode.ENTRY_ALREADY_EXISTS);
- codeToDescr.put(new Integer(69),
- LDAPResultCode.OBJECT_CLASS_MODS_PROHIBITED);
+ codeToDescr.put(13, LDAPResultCode.CONFIDENTIALITY_REQUIRED);
+ codeToDescr.put(14, LDAPResultCode.SASL_BIND_IN_PROGRESS);
+ codeToDescr.put(16, LDAPResultCode.NO_SUCH_ATTRIBUTE);
+ codeToDescr.put(17, LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE);
+ codeToDescr.put(18, LDAPResultCode.INAPPROPRIATE_MATCHING);
+ codeToDescr.put(19, LDAPResultCode.CONSTRAINT_VIOLATION);
+ codeToDescr.put(20, LDAPResultCode.ATTRIBUTE_OR_VALUE_EXISTS);
+ codeToDescr.put(21, LDAPResultCode.INVALID_ATTRIBUTE_SYNTAX);
+ codeToDescr.put(32, LDAPResultCode.NO_SUCH_OBJECT);
+ codeToDescr.put(33, LDAPResultCode.ALIAS_PROBLEM);
+ codeToDescr.put(34, LDAPResultCode.INVALID_DN_SYNTAX);
+ codeToDescr.put(36, LDAPResultCode.ALIAS_DEREFERENCING_PROBLEM);
+ codeToDescr.put(48, LDAPResultCode.INAPPROPRIATE_AUTHENTICATION);
+ codeToDescr.put(49, LDAPResultCode.INVALID_CREDENTIALS);
+ codeToDescr.put(50, LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS);
+ codeToDescr.put(51, LDAPResultCode.BUSY);
+ codeToDescr.put(52, LDAPResultCode.UNAVAILABLE);
+ codeToDescr.put(53, LDAPResultCode.UNWILLING_TO_PERFORM);
+ codeToDescr.put(54, LDAPResultCode.LOOP_DETECT);
+ codeToDescr.put(64, LDAPResultCode.NAMING_VIOLATION);
+ codeToDescr.put(65, LDAPResultCode.OBJECT_CLASS_VIOLATION);
+ codeToDescr.put(66, LDAPResultCode.NOT_ALLOWED_ON_NON_LEAF);
+ codeToDescr.put(67, LDAPResultCode.NOT_ALLOWED_ON_RDN);
+ codeToDescr.put(68, LDAPResultCode.ENTRY_ALREADY_EXISTS);
+ codeToDescr.put(69, LDAPResultCode.OBJECT_CLASS_MODS_PROHIBITED);
// Note not AFFECTS_MULTIPLE_DSAS, xjc mangles the string.
- codeToDescr.put(new Integer(71), LDAPResultCode.AFFECT_MULTIPLE_DS_AS);
- codeToDescr.put(new Integer(80), LDAPResultCode.OTHER);
+ codeToDescr.put(71, LDAPResultCode.AFFECT_MULTIPLE_DS_AS);
+ codeToDescr.put(80, LDAPResultCode.OTHER);
}
/**
@@ -100,7 +95,7 @@
{
ResultCode result = objFactory.createResultCode();
result.setCode(resultCode);
- Integer r = new Integer(resultCode);
+ Integer r = Integer.valueOf(resultCode);
if (ResultCodeFactory.codeToDescr.containsKey(r))
{
result.setDescr(ResultCodeFactory.codeToDescr.get(r));
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index b47ba1b..a8c2f00 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -801,14 +801,15 @@
boolean enabled = "true".equalsIgnoreCase(
getFirstValue(sr, "ds-cfg-enabled"));
+ final Integer portNumber = Integer.valueOf(port);
if (isSecure)
{
- ldapsPorts.add(new Integer(port));
+ ldapsPorts.add(portNumber);
ldapsEnabled.add(enabled);
}
else
{
- ldapPorts.add(new Integer(port));
+ ldapPorts.add(portNumber);
ldapEnabled.add(enabled);
enabled = "true".equalsIgnoreCase(
getFirstValue(sr, "ds-cfg-allow-start-tls"));
@@ -846,7 +847,7 @@
while (listeners.hasMore()) {
SearchResult sr = listeners.next();
String port = getFirstValue(sr, "ds-cfg-listen-port");
- adminConnectorPort = new Integer(port);
+ adminConnectorPort = Integer.valueOf(port);
}
// Even if we have a single port, use an array to be consistent with
@@ -908,14 +909,15 @@
boolean enabled = "true".equalsIgnoreCase(
getFirstValue(sr, "ds-cfg-enabled"));
+ Integer portNumber = Integer.valueOf(port);
if (isSecure)
{
- jmxsPorts.add(new Integer(port));
+ jmxsPorts.add(portNumber);
jmxsEnabled.add(enabled);
}
else
{
- jmxPorts.add(new Integer(port));
+ jmxPorts.add(portNumber);
jmxEnabled.add(enabled);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
index 6a5f289..5f10e1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -127,8 +127,8 @@
{
if (desc1.getAddresses().equals(desc2.getAddresses()))
{
- Integer port1 = new Integer(desc1.getPort());
- Integer port2 = new Integer(desc2.getPort());
+ Integer port1 = Integer.valueOf(desc1.getPort());
+ Integer port2 = Integer.valueOf(desc2.getPort());
result = port1.compareTo(port2);
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index 826cb1d..94733c3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -299,8 +299,8 @@
int compare = 0;
if (desc1.getAddresses().equals(desc2.getAddresses()))
{
- Integer port1 = new Integer(desc1.getPort());
- Integer port2 = new Integer(desc2.getPort());
+ Integer port1 = Integer.valueOf(desc1.getPort());
+ Integer port2 = Integer.valueOf(desc2.getPort());
compare = port1.compareTo(port2);
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index b2e4a0f..4145512 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -633,7 +633,7 @@
try
{
baseDN.setAgeOfOldestMissingChange(
- new Long(ConnectionUtils.getFirstValue(sr,
+ Long.valueOf(ConnectionUtils.getFirstValue(sr,
"approx-older-change-not-synchronized-millis")));
}
catch (Throwable t)
@@ -641,7 +641,7 @@
}
try
{
- baseDN.setMissingChanges(new Integer(missingChanges));
+ baseDN.setMissingChanges(Integer.valueOf(missingChanges));
}
catch (Throwable t)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
index 3673f94..2bfe4ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
@@ -288,7 +288,7 @@
* @return String representing the major version
*/
public Integer getMajorVersion() {
- return new Integer(values.get(MAJOR_VERSION));
+ return Integer.valueOf(values.get(MAJOR_VERSION));
}
/**
@@ -297,7 +297,7 @@
* @return String representing the minor version
*/
public Integer getMinorVersion() {
- return new Integer(values.get(MINOR_VERSION));
+ return Integer.valueOf(values.get(MINOR_VERSION));
}
/**
@@ -306,7 +306,7 @@
* @return String representing the point version
*/
public Integer getPointVersion() {
- return new Integer(values.get(POINT_VERSION));
+ return Integer.valueOf(values.get(POINT_VERSION));
}
/**
@@ -315,7 +315,7 @@
* @return Integer representing the SVN revision number
*/
public Integer getRevisionNumber() {
- return new Integer(values.get(REVISION_NUMBER));
+ return Integer.valueOf(values.get(REVISION_NUMBER));
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
index dff8bb0..b17fea8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
@@ -583,7 +583,7 @@
String showText = params[i++];
String stackText = params[i++];
String closeDiv = params[i++];
- boolean isHide = Boolean.valueOf(params[i]);
+ boolean isHide = Boolean.parseBoolean(params[i]);
if (isHide)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index aa4e761..101d17c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -1126,12 +1126,12 @@
durationStr += "Maximum unit is \"" +
prop.getMaximumUnit().getLongName() + "\". ";
}
- long lowerLimitStr = new Double(prop.getBaseUnit().
+ long lowerLimitStr = Double.valueOf(prop.getBaseUnit().
fromMilliSeconds(prop.getLowerLimit())).longValue();
durationStr += "Lower limit is " + lowerLimitStr +
" " + prop.getBaseUnit().getLongName() + ". ";
if (prop.getUpperLimit() != null) {
- long upperLimitStr = new Double(prop.getBaseUnit().
+ long upperLimitStr = Double.valueOf(prop.getBaseUnit().
fromMilliSeconds(prop.getUpperLimit())).longValue();
durationStr += "Upper limit is " + upperLimitStr +
" " + prop.getBaseUnit().getLongName() + ". ";
@@ -1333,7 +1333,7 @@
}
private String getHeading(String str, int level) {
- String strLevel = (new Integer(level)).toString();
+ String strLevel = Integer.valueOf(level).toString();
return "<h" + strLevel + ">" +
"<a name=\"" + str + "\"></a>" +
str +
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
index e481d89..9ba43e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
@@ -25,27 +25,23 @@
* Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.api;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-import java.util.List;
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.opends.server.admin.std.server.EntryCacheCfg;
+import org.opends.server.monitors.EntryCacheMonitorProvider;
+import org.opends.server.types.Attribute;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.SearchFilter;
-import org.opends.server.admin.std.server.EntryCacheCfg;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.monitors.EntryCacheMonitorProvider;
-import org.opends.server.types.Attribute;
-
-
/**
* This class defines the set of methods that must be implemented by a
@@ -415,9 +411,9 @@
*
* @return The current number of cache hits for this cache.
*/
- public Long getCacheHits()
+ public long getCacheHits()
{
- return new Long(cacheHits.longValue());
+ return cacheHits.longValue();
}
@@ -427,9 +423,9 @@
*
* @return The current number of cache misses for this cache.
*/
- public Long getCacheMisses()
+ public long getCacheMisses()
{
- return new Long(cacheMisses.longValue());
+ return cacheMisses.longValue();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
index ab72f8b..8d49bfc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
@@ -355,7 +355,7 @@
} catch (LDAPConnectionException e) {
LocalizableMessage message;
if (isWrongPortException(e,
- new Integer(argParser.getArguments().getPort())))
+ Integer.valueOf(argParser.getArguments().getPort())))
{
message = ERR_TASK_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
argParser.getArguments().getHostName(),
--
Gitblit v1.10.0