From 5490f7613ec1d76f3a3baff40a86bb4adbf20fbd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 09:17:17 +0000
Subject: [PATCH] AutoRefactor'ed removing the 'final' keyword of 'static final' methods because 'final' keyword is implied by 'static' keyword.
---
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java | 2 +-
opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java | 4 ++--
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java | 2 +-
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java | 8 ++++----
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java | 2 +-
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java | 2 +-
opendj-sdk/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +-
opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java | 2 +-
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java | 2 +-
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java | 20 ++++++++------------
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java | 2 +-
11 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
index 0f5f23c..e17c6bc 100755
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
@@ -544,7 +544,7 @@
* @throws ClientException
* If an error occurs when reading the password.
*/
- public static final char[] readPassword() throws ClientException {
+ public static char[] readPassword() throws ClientException {
try {
return System.console().readPassword();
} catch (IOError e) {
diff --git a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
index d4e8987..1022b9c 100644
--- a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
+++ b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
@@ -60,7 +60,7 @@
super(out, err);
}
- static final MockConsoleApplication getDefault() {
+ static MockConsoleApplication getDefault() {
out = new ByteArrayOutputStream();
final PrintStream psOut = new PrintStream(out);
err = new ByteArrayOutputStream();
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
index 9fc2d81..13f84c5 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
@@ -241,7 +241,7 @@
Element<C, S> {
/** Factory method. */
- private static final <C extends ConfigurationClient, S extends Configuration> InstantiableElement<C, S> create(
+ private static <C extends ConfigurationClient, S extends Configuration> InstantiableElement<C, S> create(
InstantiableRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d,
String name) {
return new InstantiableElement<C, S>(r, d, name);
@@ -287,7 +287,7 @@
Element<C, S> {
/** Factory method. */
- private static final <C extends ConfigurationClient, S extends Configuration> OptionalElement<C, S> create(
+ private static <C extends ConfigurationClient, S extends Configuration> OptionalElement<C, S> create(
OptionalRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
return new OptionalElement<C, S>(r, d);
}
@@ -322,7 +322,7 @@
Element<C, S> {
/** Factory method. */
- private static final <C extends ConfigurationClient, S extends Configuration> SetElement<C, S> create(
+ private static <C extends ConfigurationClient, S extends Configuration> SetElement<C, S> create(
SetRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
return new SetElement<C, S>(r, d);
}
@@ -356,7 +356,7 @@
Element<C, S> {
/** Factory method. */
- private static final <C extends ConfigurationClient, S extends Configuration> SingletonElement<C, S> create(
+ private static <C extends ConfigurationClient, S extends Configuration> SingletonElement<C, S> create(
SingletonRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
return new SingletonElement<C, S>(r, d);
}
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java
index 1163c11..3c60abc 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java
@@ -35,7 +35,7 @@
public interface Assertion {
/** An assertion that always return UNDEFINED for matches and that creates a match all query. */
- public static final Assertion UNDEFINED_ASSERTION = new Assertion() {
+ Assertion UNDEFINED_ASSERTION = new Assertion() {
@Override
public ConditionResult matches(final ByteSequence normalizedAttributeValue) {
return ConditionResult.UNDEFINED;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java
index 98bc438..e5ef3e8 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java
@@ -455,7 +455,7 @@
* @throws NullPointerException
* If {@code attributeDescription} was {@code null}.
*/
- public static final Attribute emptyAttribute(final AttributeDescription attributeDescription) {
+ public static Attribute emptyAttribute(final AttributeDescription attributeDescription) {
return new EmptyAttribute(attributeDescription);
}
@@ -475,7 +475,7 @@
* @throws NullPointerException
* If {@code attributeDescription} was {@code null}.
*/
- public static final Attribute emptyAttribute(final String attributeDescription) {
+ public static Attribute emptyAttribute(final String attributeDescription) {
return emptyAttribute(AttributeDescription.valueOf(attributeDescription));
}
@@ -493,7 +493,7 @@
* If {@code attribute} or {@code attributeDescription} was
* {@code null}.
*/
- public static final Attribute renameAttribute(final Attribute attribute,
+ public static Attribute renameAttribute(final Attribute attribute,
final AttributeDescription attributeDescription) {
Reject.ifNull(attribute, attributeDescription);
@@ -523,8 +523,7 @@
* If {@code attribute} or {@code attributeDescription} was
* {@code null}.
*/
- public static final Attribute renameAttribute(final Attribute attribute,
- final String attributeDescription) {
+ public static Attribute renameAttribute(final Attribute attribute, final String attributeDescription) {
Reject.ifNull(attribute, attributeDescription);
return renameAttribute(attribute, AttributeDescription.valueOf(attributeDescription));
}
@@ -547,8 +546,7 @@
* If {@code attributeDescription} or {@code value} was
* {@code null}.
*/
- public static final Attribute singletonAttribute(
- final AttributeDescription attributeDescription, final Object value) {
+ public static Attribute singletonAttribute(final AttributeDescription attributeDescription, final Object value) {
return new SingletonAttribute(attributeDescription, value);
}
@@ -574,8 +572,7 @@
* If {@code attributeDescription} or {@code value} was
* {@code null}.
*/
- public static final Attribute singletonAttribute(final String attributeDescription,
- final Object value) {
+ public static Attribute singletonAttribute(final String attributeDescription, final Object value) {
return singletonAttribute(AttributeDescription.valueOf(attributeDescription), value);
}
@@ -591,12 +588,11 @@
* @throws NullPointerException
* If {@code attribute} was {@code null}.
*/
- public static final Attribute unmodifiableAttribute(final Attribute attribute) {
+ public static Attribute unmodifiableAttribute(final Attribute attribute) {
if (attribute instanceof UnmodifiableAttribute) {
return attribute;
- } else {
- return new UnmodifiableAttribute(attribute);
}
+ return new UnmodifiableAttribute(attribute);
}
/** Prevent instantiation. */
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
index 770a9cb..55fa9b9 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
@@ -306,7 +306,7 @@
* @throws NullPointerException
* If {@code sortKey} was {@code null}.
*/
- public static final SortKey valueOf(String sortKey) {
+ public static SortKey valueOf(String sortKey) {
Reject.ifNull(sortKey);
boolean reverseOrder = false;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
index 789b88b..e916fc1 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
@@ -173,7 +173,7 @@
* @throws NullPointerException
* If {@code authorizationName} was {@code null}.
*/
- public static final ProxiedAuthV2RequestControl newControl(final String authorizationID) {
+ public static ProxiedAuthV2RequestControl newControl(final String authorizationID) {
if (authorizationID.length() == 0) {
// Anonymous.
return ANONYMOUS;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
index 39ddc63..239eea6 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
@@ -929,7 +929,7 @@
* If {@code fromEntry} or {@code toEntry} were {@code null}.
* @see Entries#diffEntries(Entry, Entry)
*/
- public static final ModifyRequest newModifyRequest(final Entry fromEntry, final Entry toEntry) {
+ public static ModifyRequest newModifyRequest(final Entry fromEntry, final Entry toEntry) {
return Entries.diffEntries(fromEntry, toEntry);
}
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
index d0d02c8..e8cba29 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
@@ -53,7 +53,7 @@
*
* @return an Entry with pre-defined attributes
*/
- private static final Entry getStandardEntry() {
+ private static Entry getStandardEntry() {
final Entry entry = new LinkedHashMapEntry("cn=John Doe,ou=people,dc=example,dc=com");
entry.addAttribute("objectClass", "top", "person", "inetOrgPerson");
entry.addAttribute("cn", "John Doe");
diff --git a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
index 2192c72..7fc7b0e 100644
--- a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
+++ b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java
@@ -70,7 +70,7 @@
*
* @return The installation path.
*/
- static final String getInstallationPath() {
+ static String getInstallationPath() {
return "/home/violette/OpenDJ-3.0.0/";
}
@@ -79,7 +79,7 @@
*
* @return The instance path.
*/
- static final String getInstancePath() {
+ static String getInstancePath() {
return "/home/violette/OpenDJ-3.0.0/";
}
diff --git a/opendj-sdk/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/opendj-sdk/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index 9fb5365..2814f33 100644
--- a/opendj-sdk/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/opendj-sdk/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -63,7 +63,7 @@
*
* @return the StaticLoggerBinder singleton
*/
- public static final StaticLoggerBinder getSingleton() {
+ public static StaticLoggerBinder getSingleton() {
return SINGLETON;
}
--
Gitblit v1.10.0