From a2c984366f119a651851cb4aa8f16466d3ae4e96 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 11:23:21 +0000
Subject: [PATCH] AutoRefactor: remove unnecessary locals before return
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 5
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java | 20 +---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java | 9 +-
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java | 3
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java | 6 -
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java | 5
opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 16 +--
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java | 6 -
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java | 8 -
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java | 13 +--
opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java | 9 --
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 10 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java | 9 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 16 +--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 8 -
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java | 6 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java | 5
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java | 11 --
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 6 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java | 5
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java | 7 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java | 4
28 files changed, 69 insertions(+), 143 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
index e80a126..2b868a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.browser;
import java.util.ArrayList;
@@ -134,8 +134,7 @@
*/
public synchronized boolean isWorking(BasicNode node)
{
- boolean isWorking = workingList.get(node) != null;
- return isWorking;
+ return workingList.get(node) != null;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index ab632c6..401027a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.task;
@@ -468,8 +468,7 @@
DirectoryServer.getEnvironmentConfig().getSchemaDirectory(),
schemaFile);
}
- schemaFile = f.getAbsolutePath();
- return schemaFile;
+ return f.getAbsolutePath();
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
index 3e06268..da81eb2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.task;
import java.util.ArrayList;
@@ -40,7 +39,6 @@
/**
* An abstract class used to re-factor some code between the start, stop and
* restart tasks.
- *
*/
public abstract class StartStopTask extends Task
{
@@ -123,8 +121,7 @@
*/
protected ArrayList<String> getCommandLineArguments()
{
- ArrayList<String> args = new ArrayList<String>();
- return args;
+ return new ArrayList<String>();
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 93f5a91..af07931 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -1251,7 +1251,7 @@
private AttributeType getNewAttribute()
{
- AttributeType attr = new AttributeType("", getAttributeName(),
+ return new AttributeType("", getAttributeName(),
getAllNames(),
getOID(),
getDescription(),
@@ -1265,8 +1265,6 @@
collective.isSelected(), nonModifiable.isSelected(),
obsolete.isSelected(), singleValued.isSelected(),
getExtraProperties());
-
- return attr;
}
private void updateDefaultMatchingRuleNames()
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index e3326c0..6b5e47b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -528,12 +528,10 @@
*/
private boolean updatedByUser()
{
- boolean updatedByUser = !javaHome.getText().equals(readJavaHome) ||
- useOpenDSJavaHome.isSelected() != readUseOpenDSJavaHome ||
- useOpenDSJavaArgs.isSelected() != readUseOpenDSJavaArgs ||
- !readJavaArguments.equals(getCurrentJavaArguments());
-
- return updatedByUser;
+ return !javaHome.getText().equals(readJavaHome)
+ || useOpenDSJavaHome.isSelected() != readUseOpenDSJavaHome
+ || useOpenDSJavaArgs.isSelected() != readUseOpenDSJavaArgs
+ || !readJavaArguments.equals(getCurrentJavaArguments());
}
/**
@@ -1028,12 +1026,10 @@
*/
private String getPropertiesFile()
{
- String installPath = getInfo().getServerDescriptor().
- getInstancePath();
- String propertiesFile = Utils.getPath(
+ String installPath = getInfo().getServerDescriptor().getInstancePath();
+ return Utils.getPath(
Utilities.getInstanceRootDirectory(installPath).getAbsolutePath(),
Installation.RELATIVE_JAVA_PROPERTIES_FILE);
- return propertiesFile;
}
private void updateContentsOfPanelWithReadValues()
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 427e38c..b8c4e92 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -856,7 +856,7 @@
private AttributeType getAttribute()
{
- AttributeType attr = new AttributeType("", getAttributeName(),
+ return new AttributeType("", getAttributeName(),
getAllNames(),
getOID(),
getDescription(),
@@ -870,7 +870,5 @@
collective.isSelected(), nonModifiable.isSelected(),
obsolete.isSelected(), singleValued.isSelected(),
getExtraProperties());
-
- return attr;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 340982d..eb68e7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -1182,7 +1182,7 @@
{
String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
",cn=Backends,cn=config";
- String ldif = Utilities.makeLdif(
+ return Utilities.makeLdif(
"dn: "+dn,
"objectClass: top",
"objectClass: ds-cfg-backend",
@@ -1224,13 +1224,12 @@
"ds-cfg-attribute: objectClass",
"ds-cfg-index-type: equality"
);
- return ldif;
}
private String getAdditionalIndexLdif(String backendName)
{
String dn = "ds-cfg-backend-id="+backendName+",cn=Backends,cn=config";
- String ldif = Utilities.makeLdif(
+ return Utilities.makeLdif(
"dn: ds-cfg-attribute=cn,cn=Index,"+dn,
"objectClass: ds-cfg-local-db-index",
"objectClass: top",
@@ -1284,7 +1283,6 @@
"ds-cfg-attribute: uniqueMember",
"ds-cfg-index-type: equality"
);
- return ldif;
}
private void createBackend(String backendName, String baseDN)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 65d4666..30ff0dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -726,7 +726,7 @@
private ObjectClass getObjectClass()
{
- ObjectClass oc = new ObjectClass("", getObjectClassName(), getAllNames(),
+ return new ObjectClass("", getObjectClassName(), getAllNames(),
getOID(),
getDescription(),
getObjectClassSuperiors(),
@@ -735,8 +735,6 @@
getObjectClassType(),
obsolete.isSelected(),
getExtraProperties());
-
- return oc;
}
private ObjectClassType getObjectClassType()
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index e7e67b0..42acb6b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -499,10 +499,8 @@
*/
protected boolean isBinary(String attrName)
{
- boolean isBinary = false;
Schema schema = getInfo().getServerDescriptor().getSchema();
- isBinary = Utilities.hasBinarySyntax(attrName, schema);
- return isBinary;
+ return Utilities.hasBinarySyntax(attrName, schema);
}
/**
@@ -514,10 +512,8 @@
*/
protected boolean isPassword(String attrName)
{
- boolean isPassword = false;
Schema schema = getInfo().getServerDescriptor().getSchema();
- isPassword = Utilities.hasPasswordSyntax(attrName, schema);
- return isPassword;
+ return Utilities.hasPasswordSyntax(attrName, schema);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
index aff9f58..826c0a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
@@ -336,13 +336,11 @@
}
private int getMargin(Component c, ImageIcon icon)
{
- int margin = (c.getHeight() - icon.getIconHeight()) / 2;
- return margin;
+ return (c.getHeight() - icon.getIconHeight()) / 2;
}
private ImageIcon getClearIcon()
{
- ImageIcon icon = mousePressed ? clearIconPressed : clearIcon;
- return icon;
+ return mousePressed ? clearIconPressed : clearIcon;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
index cab5f90..56533bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.renderer;
@@ -341,9 +342,7 @@
private String getAttributeName(JTable table, int row)
{
- Object o = table.getValueAt(row, 0);
- String attrName = String.valueOf(o);
- return attrName;
+ return String.valueOf(table.getValueAt(row, 0));
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
index f7a12bb..da9266f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.renderer;
@@ -78,8 +79,7 @@
Utilities.getVLVNameInCellRenderer((VLVIndexDescriptor)value);
value = mustReindex ? name + " (*)" : name;
}
- Component comp = super.getListCellRendererComponent(list, value, index,
- isSelected, cellHasFocus);
- return comp;
+ return super.getListCellRendererComponent(
+ list, value, index, isSelected, cellHasFocus);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 548c060..5a7d7f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.renderer;
@@ -112,9 +112,7 @@
break;
}
}
- Component comp = super.getListCellRendererComponent(list, value, index,
- isSelected, cellHasFocus);
-
- return comp;
+ return super.getListCellRendererComponent(
+ list, value, index, isSelected, cellHasFocus);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
index beb95f6..af46758 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.renderer;
@@ -33,6 +34,7 @@
import javax.swing.JList;
import javax.swing.ListCellRenderer;
+import org.forgerock.i18n.LocalizableMessageDescriptor.Arg1;
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
/**
@@ -61,20 +63,12 @@
if (value instanceof VLVSortOrder)
{
VLVSortOrder v = (VLVSortOrder)value;
- if (v.isAscending())
- {
- value = INFO_CTRL_PANEL_VLV_ASCENDING_VLV_INDEX.get(
- v.getAttributeName()).toString();
- }
- else
- {
- value = INFO_CTRL_PANEL_VLV_DESCENDING_VLV_INDEX.get(
- v.getAttributeName()).toString();
- }
+ Arg1<Object> arg = v.isAscending()
+ ? INFO_CTRL_PANEL_VLV_ASCENDING_VLV_INDEX
+ : INFO_CTRL_PANEL_VLV_DESCENDING_VLV_INDEX;
+ value = arg.get(v.getAttributeName()).toString();
}
- Component comp = defaultRenderer.getListCellRendererComponent(
+ return defaultRenderer.getListCellRendererComponent(
list, value, index, isSelected, cellHasFocus);
-
- return comp;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
index eaf707e..1fdf8b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.uninstaller;
@@ -200,10 +200,9 @@
* {@inheritDoc}
*/
protected LocalizableMessage getFrameTitle() {
- LocalizableMessage title = Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
- INFO_FRAME_UNINSTALL_TITLE.get(
- DynamicConstants.PRODUCT_NAME), LocalizableMessage.class);
- return title;
+ return Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
+ INFO_FRAME_UNINSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ LocalizableMessage.class);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
index 6ce0f8b..978305e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -373,16 +373,13 @@
)
{
// returned status -- all is fine by default
- boolean status = true;
-
// Check if there is another entry cache installed at the same level.
if (!cacheOrderMap.isEmpty()) {
if (cacheOrderMap.containsKey(configuration.getCacheLevel())) {
unacceptableReasons.add(
ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
configuration.dn(), configuration.getCacheLevel()));
- status = false;
- return status;
+ return false;
}
}
@@ -399,11 +396,11 @@
catch (InitializationException ie)
{
unacceptableReasons.add (ie.getMessageObject());
- status = false;
+ return false;
}
}
- return status;
+ return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
index f8bb201..fe31f40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -343,14 +343,9 @@
ArrayList<LocalizableMessage> errorMessages
)
{
- ConfigErrorHandler errorHandler = null;
-
EntryCacheCommon ec = new EntryCacheCommon();
-
- errorHandler = ec.new ConfigErrorHandler (
- configPhase, unacceptableReasons, errorMessages
- );
- return errorHandler;
+ return ec.new ConfigErrorHandler(
+ configPhase, unacceptableReasons, errorMessages);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index e404a61..5aa5674 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -142,17 +142,13 @@
*/
public boolean isConfigurationChangeAcceptable(
ErrorLogAccountStatusNotificationHandlerCfg configuration,
- List<LocalizableMessage> unacceptableReasons
- )
+ List<LocalizableMessage> unacceptableReasons)
{
// Make sure that we can process the defined notification handler.
// If so, then we'll accept the new configuration.
boolean applyChanges = false;
- boolean isAcceptable = processNotificationHandlerConfig (
- configuration, applyChanges
- );
-
- return isAcceptable;
+ return processNotificationHandlerConfig (
+ configuration, applyChanges);
}
@@ -175,11 +171,9 @@
*/
public ConfigChangeResult applyConfigurationChange (
ErrorLogAccountStatusNotificationHandlerCfg configuration,
- boolean detailedResults
- )
+ boolean detailedResults)
{
- ConfigChangeResult changeResult = applyConfigurationChange (configuration);
- return changeResult;
+ return applyConfigurationChange(configuration);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
index ea1b5d5..f848d70 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -323,9 +323,7 @@
FingerprintCertificateMapperCfg configuration,
List<LocalizableMessage> unacceptableReasons)
{
- boolean configAcceptable = true;
-
- return configAcceptable;
+ return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 448d53c..533f7bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -287,8 +287,7 @@
configuration,
List<LocalizableMessage> unacceptableReasons)
{
- boolean configAcceptable = true;
- return configAcceptable;
+ return true;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
index c03b1a0..b155e65 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
@@ -193,16 +193,9 @@
*/
public Socket createSocket(String host, int port) throws IOException
{
- //
- // gets ssl socket factory
SSLSocketFactory sslSocketFactory = getSSLSocketFactory();
String realhost = getRealServerHostname(host);
-
- final SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(
- realhost,
- port);
-
- return sslSocket;
+ return (SSLSocket) sslSocketFactory.createSocket(realhost, port);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index cd5b001..a2d977e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -1334,9 +1334,7 @@
// associated with the provided message ID. The persistent
// search will ensure that all other related persistent
// searches are cancelled.
- CancelResult cancelResult = ps.cancel();
-
- return cancelResult;
+ return ps.cancel();
}
}
@@ -1344,9 +1342,7 @@
}
else
{
- CancelResult cancelResult = op.cancel(cancelRequest);
-
- return cancelResult;
+ return op.cancel(cancelRequest);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
index 79906d6..2aca065 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java
@@ -776,8 +776,7 @@
le.getResultCode(),
le.getErrorMessage(),
le.getMatchedDN());
- int code = le.getResultCode();
- return code;
+ return le.getResultCode();
} catch(LDAPConnectionException lce)
{
logger.traceException(lce);
@@ -785,8 +784,7 @@
lce.getResultCode(),
lce.getErrorMessage(),
lce.getMatchedDN());
- int code = lce.getResultCode();
- return code;
+ return lce.getResultCode();
} catch(Exception e)
{
logger.traceException(e);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
index 9cc5504..7a576d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java
@@ -1145,8 +1145,7 @@
LDAPToolUtils.printErrorMessage(err, le.getMessageObject(),
le.getResultCode(),
le.getErrorMessage(), le.getMatchedDN());
- int code = le.getResultCode();
- return code;
+ return le.getResultCode();
} catch(LDAPConnectionException lce)
{
logger.traceException(lce);
@@ -1154,8 +1153,7 @@
lce.getResultCode(),
lce.getErrorMessage(),
lce.getMatchedDN());
- int code = lce.getResultCode();
- return code;
+ return lce.getResultCode();
} catch (FileNotFoundException fe)
{
logger.traceException(fe);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index c072b8d..e924997 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -1786,8 +1786,7 @@
lce.getResultCode(),
lce.getErrorMessage(),
lce.getMatchedDN());
- int code = lce.getResultCode();
- return code;
+ return lce.getResultCode();
} catch(Exception e)
{
logger.traceException(e);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
index 11262ab..39316ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.tools;
import org.forgerock.i18n.LocalizableMessage;
@@ -146,9 +146,7 @@
err.println("Invalid format for criticality value:" + remainder);
return null;
}
- control = new LDAPControl(controlOID, controlCriticality);
- return control;
-
+ return new LDAPControl(controlOID, controlCriticality);
}
String critical = remainder.substring(0, idx);
@@ -167,8 +165,7 @@
String valString = remainder.substring(idx+1, remainder.length());
if (valString.length() == 0)
{
- control = new LDAPControl(controlOID, controlCriticality);
- return control;
+ return new LDAPControl(controlOID, controlCriticality);
}
if(valString.charAt(0) == ':')
{
@@ -192,9 +189,7 @@
controlValue = ByteString.valueOf(valString);
}
- control = new LDAPControl(controlOID, controlCriticality, controlValue);
- return control;
-
+ return new LDAPControl(controlOID, controlCriticality, controlValue);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
index bbc5bd6..06a02e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -235,8 +235,7 @@
new PurgeHistoricalScheduleInformation(uData);
ArrayList<RawAttribute> rawAttrs =
TaskClient.getTaskAttributes(information);
- BasicAttributes attrs = getAttributes(rawAttrs);
- return attrs;
+ return getAttributes(rawAttrs);
}
private static BasicAttributes getAttributes(ArrayList<RawAttribute> rawAttrs)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
index 92fb2e1..7a5f025 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
@@ -233,14 +233,12 @@
public Certificate getCertificate(String alias)
throws KeyStoreException {
ensureValid(alias, CERT_ALIAS_MSG);
- Certificate cert = null;
KeyStore ks = getKeyStore();
if (ks == null) {
LocalizableMessage msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
throw new KeyStoreException(msg.toString());
}
- cert = ks.getCertificate(alias);
- return cert;
+ return ks.getCertificate(alias);
}
--
Gitblit v1.10.0