From 2c8a16161b1baa152e3d39171838a5d9e8d4016b Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Oct 2014 12:54:40 +0000
Subject: [PATCH] AutoRefactored removing unnecessary local variable/dead store before return.
---
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java | 4 +---
opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 6 ++----
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java | 4 +---
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java | 4 +---
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java | 3 +--
opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java | 3 +--
opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java | 3 +--
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java | 3 +--
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java | 4 +---
9 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
index 17a552b..4682413 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
@@ -70,9 +70,7 @@
protected final TestParentCfg getParentCfg(final String name, final ServerManagementContext serverContext)
throws Exception {
ServerManagedObject<RootCfg> root = serverContext.getRootConfigurationManagedObject();
- TestParentCfg parent = root.getChild(TestCfg.getTestOneToManyParentRelationDefinition(), name)
- .getConfiguration();
- return parent;
+ return root.getChild(TestCfg.getTestOneToManyParentRelationDefinition(), name).getConfiguration();
}
protected static final Entry CONFIG_ENTRY = LDIF.makeEntry(
diff --git a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java
index a28b316..b88f92f 100644
--- a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java
+++ b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java
@@ -149,8 +149,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((first == null) ? 0 : first.hashCode());
- result = prime * result + ((second == null) ? 0 : second.hashCode());
- return result;
+ return prime * result + ((second == null) ? 0 : second.hashCode());
}
/** {@inheritDoc} */
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
index 08b0aee..36c879a 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
@@ -61,9 +61,8 @@
* @return a string containing a standard LDIF Change Record.
*/
public final String[] getStandardLDIFChangeRecord() {
-
// @formatter:off
- final String[] cr = {
+ return new String[] {
"version: 1",
"dn: uid=scarter,ou=People,dc=example,dc=com",
"changetype: add",
@@ -79,7 +78,6 @@
"modifiersName: cn=Internal Client,cn=Root DNs,cn=config"
};
// @formatter:on
- return cr;
}
/**
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
index bf079b9..04f4bf9 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
@@ -72,9 +72,8 @@
* @return a string containing a standard LDIF Change Record.
*/
public final String[] getStandardLDIFChangeRecord() {
-
// @formatter:off
- final String[] cr = {
+ return new String[] {
"version: 1",
"dn: uid=scarter,ou=People,dc=example,dc=com",
"changetype: add",
@@ -90,7 +89,6 @@
"modifiersName: cn=Internal Client,cn=Root DNs,cn=config"
};
// @formatter:on
- return cr;
}
/**
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
index fa3885c..ed05752 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
@@ -69,9 +69,8 @@
* @return a string containing a standard LDIF Change Record.
*/
public final String[] getAddLDIFChangeRecord() {
-
// @formatter:off
- final String[] cr = {
+ return new String[] {
"version: 1",
"dn: uid=scarter,ou=People,dc=example,dc=com",
"changetype: add",
@@ -88,7 +87,6 @@
"description::V2hhdCBhIGNhcmVmdWwgcmVhZGVyIHlvdSBhcmUgIQ=="
};
// @formatter:on
- return cr;
}
/**
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
index 328e1f4..ae47e51 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
@@ -71,7 +71,7 @@
*/
public final String[] getStandardEntry() {
// @formatter:off
- final String[] entry = {
+ return new String[] {
"dn: uid=user.0,ou=People,dc=example,dc=com",
"objectClass: person",
"objectClass: inetorgperson",
@@ -101,7 +101,6 @@
"modifiersName: cn=Internal Client,cn=Root DNs,cn=config"
};
// @formatter:on
- return entry;
}
/**
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
index e0445ac..a833b41 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
@@ -74,7 +74,7 @@
*/
public final String[] getStandardEntry() {
// @formatter:off
- final String[] entry = {
+ return new String[] {
"dn: uid=user.0,ou=People,dc=example,dc=com",
"objectClass: person",
"objectClass: inetorgperson",
@@ -104,7 +104,6 @@
"modifiersName: cn=Internal Client,cn=Root DNs,cn=config"
};
// @formatter:on
- return entry;
}
/**
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
index e7be097..f6d6ed6 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
@@ -44,7 +44,7 @@
@DataProvider(name = "validArguments")
Object[][] createValidArguments() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ args("-c", "numusers=1", "example.template"),
// 2 base entries + users
expectedErrOutput(INFO_MAKELDIF_PROCESSING_COMPLETE.get(3)) },
@@ -53,12 +53,11 @@
// 2 base entries + users
expectedErrOutput(INFO_MAKELDIF_PROCESSING_COMPLETE.get(7)) },
};
- return data;
}
@DataProvider(name = "invalidArguments")
Object[][] createInValidArguments() throws Exception {
- Object[][] data = new Object[][] {
+ return new Object[][] {
{ // check that usage is written to output when arguments are invalid
args(),
expectedErrOutput(INFO_MAKELDIF_TOOL_DESCRIPTION.get()) },
@@ -76,7 +75,6 @@
{ args("-s", "non-numeric" , "example.template"),
expectedErrOutput(ERR_ERROR_PARSING_ARGS.get("")) },
};
- return data;
}
@Test(dataProvider = "validArguments")
diff --git a/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java b/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
index ef5bc87..7fd6256 100644
--- a/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
+++ b/opendj-sdk/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
@@ -310,8 +310,7 @@
CompareResult result =
Responses.newCompareResult(getResultCode(compareOperation));
- result = getResponseResult(compareOperation, result);
- return result;
+ return getResponseResult(compareOperation, result);
}
@Override
--
Gitblit v1.10.0