From 66be6c035cb58baccacb6831f7403d5c2247f4b2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Oct 2014 12:46:58 +0000
Subject: [PATCH] AutoRefactored modifier's order + removed useless modifiers implied by context
---
opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java | 12 +-
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationDeleteListener.java | 4
opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java | 6
opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java | 24 ++--
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationChangeListener.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java | 18 +-
opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListener.java | 4
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResource.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigDeleteListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java | 2
opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java | 2
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java | 8
opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigAddListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java | 4
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java | 12 +-
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java | 12 -
opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java | 2
opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java | 8
opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java | 8
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationAddListener.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java | 4
opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java | 2
opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigChangeListener.java | 4
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java | 8
63 files changed, 137 insertions(+), 142 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
index d847bd9..92faca9 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
@@ -52,7 +52,7 @@
* The enumeration that should be used for values of this
* property definition.
*/
- public final static class Builder<E extends Enum<E>> extends AbstractBuilder<E, EnumPropertyDefinition<E>> {
+ public static final class Builder<E extends Enum<E>> extends AbstractBuilder<E, EnumPropertyDefinition<E>> {
/** The enumeration class. */
private Class<E> enumClass;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResource.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResource.java
index 9bb8fa1..8270b8a 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResource.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResource.java
@@ -68,7 +68,7 @@
}
/** Get a resource instance creating it if necessary. */
- private synchronized static ManagedObjectDefinitionI18NResource getInstance(String prefix) {
+ private static synchronized ManagedObjectDefinitionI18NResource getInstance(String prefix) {
ManagedObjectDefinitionI18NResource instance = INSTANCES.get(prefix);
if (instance == null) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
index 0834779..14d6bca 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
@@ -58,7 +58,7 @@
* @param <D>
* The type of property definition constructed by this builder.
*/
- protected abstract static class AbstractBuilder<T, D extends PropertyDefinition<T>> {
+ protected static abstract class AbstractBuilder<T, D extends PropertyDefinition<T>> {
/** The administrator action. */
private AdministratorAction adminAction;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
index c901eb5..9fa7699 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
@@ -39,7 +39,7 @@
* A property provider which always returns empty property values,
* indicating default behavior.
*/
- public static final PropertyProvider DEFAULT_PROVIDER = new PropertyProvider() {
+ PropertyProvider DEFAULT_PROVIDER = new PropertyProvider() {
/** {@inheritDoc} */
public <T> Collection<T> getPropertyValues(PropertyDefinition<T> d) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
index 3347088..7f72156 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
@@ -92,7 +92,7 @@
* @param <D>
* The type of relation definition constructed by this builder.
*/
- protected abstract static class AbstractBuilder<C extends ConfigurationClient, S extends Configuration,
+ protected static abstract class AbstractBuilder<C extends ConfigurationClient, S extends Configuration,
D extends RelationDefinition<C, S>> {
/** Common fields. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 0f32167..75b26a7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -95,12 +95,12 @@
public final class DSConfig extends ConsoleApplication {
/** The name of this tool. */
- final static String DSCONFIGTOOLNAME = "dsconfig";
+ static final String DSCONFIGTOOLNAME = "dsconfig";
/**
* The name of a command-line script used to launch an administrative tool.
*/
- final static String PROPERTY_SCRIPT_NAME = "org.opends.server.scriptName";
+ static final String PROPERTY_SCRIPT_NAME = "org.opends.server.scriptName";
/**
* A menu call-back which runs a sub-command interactively.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationAddListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationAddListener.java
index 4f6f46d..f34b1f4 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationAddListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationAddListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed addition is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationAddAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
+ boolean isConfigurationAddAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
/**
* Adds a new configuration to this add listener.
@@ -62,5 +62,5 @@
* The configuration that will be added.
* @return Returns information about the result of adding the configuration.
*/
- public ConfigChangeResult applyConfigurationAdd(T configuration);
+ ConfigChangeResult applyConfigurationAdd(T configuration);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationChangeListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationChangeListener.java
index bb708f5..e0d8a31 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationChangeListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationChangeListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed change is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationChangeAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
+ boolean isConfigurationChangeAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
/**
* Applies the configuration changes to this change listener.
@@ -63,5 +63,5 @@
* @return Returns information about the result of changing the
* configuration.
*/
- public ConfigChangeResult applyConfigurationChange(T configuration);
+ ConfigChangeResult applyConfigurationChange(T configuration);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationDeleteListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationDeleteListener.java
index ffa4c11..926d40f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationDeleteListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigurationDeleteListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed deletion is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationDeleteAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
+ boolean isConfigurationDeleteAcceptable(T configuration, List<LocalizableMessage> unacceptableReasons);
/**
* Deletes an existing configuration from this delete listener.
@@ -63,5 +63,5 @@
* @return Returns information about the result of deleting the
* configuration.
*/
- public ConfigChangeResult applyConfigurationDelete(T configuration);
+ ConfigChangeResult applyConfigurationDelete(T configuration);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListener.java
index 0ff3399..2269a87 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed addition is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationAddAcceptable(ServerManagedObject<? extends T> mo,
+ boolean isConfigurationAddAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons);
/**
@@ -64,5 +64,5 @@
* @return Returns information about the result of adding the server managed
* object.
*/
- public ConfigChangeResult applyConfigurationAdd(ServerManagedObject<? extends T> mo);
+ ConfigChangeResult applyConfigurationAdd(ServerManagedObject<? extends T> mo);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListener.java
index e59938e..29fe8f3 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed change is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationChangeAcceptable(ServerManagedObject<? extends T> mo,
+ boolean isConfigurationChangeAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons);
/**
@@ -64,5 +64,5 @@
* @return Returns information about the result of changing the server
* managed object.
*/
- public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo);
+ ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListener.java
index 34340c7..cbaa07b 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListener.java
@@ -53,7 +53,7 @@
* @return Returns <code>true</code> if the proposed deletion is acceptable,
* or <code>false</code> if it is not.
*/
- public boolean isConfigurationDeleteAcceptable(ServerManagedObject<? extends T> mo,
+ boolean isConfigurationDeleteAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons);
/**
@@ -64,5 +64,5 @@
* @return Returns information about the result of deleting the server
* managed object.
*/
- public ConfigChangeResult applyConfigurationDelete(ServerManagedObject<? extends T> mo);
+ ConfigChangeResult applyConfigurationDelete(ServerManagedObject<? extends T> mo);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigAddListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigAddListener.java
index 7c8938b..0a6b4a2 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigAddListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigAddListener.java
@@ -48,7 +48,7 @@
* @return {@code true} if the proposed entry contains an acceptable
* configuration, or {@code false} if it does not.
*/
- public boolean configAddIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
+ boolean configAddIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
/**
* Attempts to apply a new configuration based on the provided added entry.
@@ -59,5 +59,5 @@
* @return Information about the result of processing the configuration
* change.
*/
- public ConfigChangeResult applyConfigurationAdd(Entry configEntry);
+ ConfigChangeResult applyConfigurationAdd(Entry configEntry);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigChangeListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigChangeListener.java
index b91a990..2e4a4d0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigChangeListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigChangeListener.java
@@ -48,7 +48,7 @@
* @return {@code true} if the proposed entry contains an acceptable
* configuration, or {@code false} if it does not.
*/
- public boolean configChangeIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
+ boolean configChangeIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
/**
* Attempts to apply a new configuration to this Directory Server component
@@ -60,5 +60,5 @@
* @return Information about the result of processing the configuration
* change.
*/
- public ConfigChangeResult applyConfigurationChange(Entry configEntry);
+ ConfigChangeResult applyConfigurationChange(Entry configEntry);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigDeleteListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigDeleteListener.java
index 8716433..d374f6e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigDeleteListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigDeleteListener.java
@@ -48,7 +48,7 @@
* @return {@code true} if the proposed entry may be removed from the
* configuration, or {@code false} if not.
*/
- public boolean configDeleteIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
+ boolean configDeleteIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason);
/**
* Attempts to apply a new configuration based on the provided deleted
@@ -59,5 +59,5 @@
* @return Information about the result of processing the configuration
* change.
*/
- public ConfigChangeResult applyConfigurationDelete(Entry configEntry);
+ ConfigChangeResult applyConfigurationDelete(Entry configEntry);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
index d5bd8fe..bb4c41f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
@@ -83,7 +83,7 @@
* @param listener
* The add listener that should be registered.
*/
- public void registerAddListener(DN dn, ConfigAddListener listener);
+ void registerAddListener(DN dn, ConfigAddListener listener);
/**
* Registers the provided delete listener so that it will be notified if any
@@ -95,7 +95,7 @@
* @param listener
* The delete listener that should be registered.
*/
- public void registerDeleteListener(DN dn, ConfigDeleteListener listener);
+ void registerDeleteListener(DN dn, ConfigDeleteListener listener);
/**
* Registers the provided change listener so that it will be notified of any
@@ -107,7 +107,7 @@
* @param listener
* The change listener that should be registered.
*/
- public void registerChangeListener(DN dn, ConfigChangeListener listener);
+ void registerChangeListener(DN dn, ConfigChangeListener listener);
/**
* Deregisters the provided add listener so that it will no longer be
@@ -119,7 +119,7 @@
* @param listener
* The add listener that should be deregistered.
*/
- public void deregisterAddListener(DN dn, ConfigAddListener listener);
+ void deregisterAddListener(DN dn, ConfigAddListener listener);
/**
* Deregisters the provided delete listener so that it will no longer be
@@ -131,7 +131,7 @@
* @param listener
* The delete listener that should be deregistered.
*/
- public void deregisterDeleteListener(DN dn, ConfigDeleteListener listener);
+ void deregisterDeleteListener(DN dn, ConfigDeleteListener listener);
/**
* Attempts to deregister the provided change listener with the provided DN.
@@ -143,7 +143,7 @@
* @return <CODE>true</CODE> if the specified listener was deregistered, or
* <CODE>false</CODE> if it was not.
*/
- public boolean deregisterChangeListener(DN dn, ConfigChangeListener listener);
+ boolean deregisterChangeListener(DN dn, ConfigChangeListener listener);
/**
* Retrieves the add listeners that have been registered with the provided
@@ -153,7 +153,7 @@
* The DN of the configuration entry.
* @return The list of add listeners.
*/
- public List<ConfigAddListener> getAddListeners(DN dn);
+ List<ConfigAddListener> getAddListeners(DN dn);
/**
* Retrieves the delete listeners that have been registered with the
@@ -163,7 +163,7 @@
* The DN of the configuration entry.
* @return The list of delete listeners.
*/
- public List<ConfigDeleteListener> getDeleteListeners(DN dn);
+ List<ConfigDeleteListener> getDeleteListeners(DN dn);
/**
* Retrieves the change listeners that have been registered with the
@@ -173,6 +173,6 @@
* The DN of the configuration entry.
* @return The list of change listeners.
*/
- public List<ConfigChangeListener> getChangeListeners(DN dn);
+ List<ConfigChangeListener> getChangeListeners(DN dn);
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
index 184e0ca..2701603 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
@@ -74,7 +74,7 @@
* @throws Exception
* If an unexpected error occurred.
*/
- public synchronized static void setUp() throws Exception {
+ public static synchronized void setUp() throws Exception {
initializeAndRegisterBundle(TestParentCfgDefn.getInstance());
initializeAndRegisterBundle(TestChildCfgDefn.getInstance());
@@ -95,7 +95,7 @@
/**
* Deregisters the test configurations from the administration framework.
*/
- public synchronized static void cleanup() {
+ public static synchronized void cleanup() {
LDAPProfile.getInstance().popWrapper();
AbstractManagedObjectDefinition<?, ?> root = RootCfgDefn.getInstance();
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
index 4b54477..d60f2ac 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
@@ -91,7 +91,7 @@
/** Construct a dummy path. */
// @Checkstyle:off
- private synchronized static <C extends ConfigurationClient, S extends Configuration> ManagedObjectPath<C, S>
+ private static synchronized <C extends ConfigurationClient, S extends Configuration> ManagedObjectPath<C, S>
getPath(AbstractManagedObjectDefinition<C, S> d) {
// @Checkstyle:on
if (!isProfileRegistered) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
index b21d7ab..eab9c65 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
@@ -73,7 +73,7 @@
* @see Connections#uncloseable(ConnectionFactory)
*/
@Override
- public void close();
+ void close();
/**
* Asynchronously obtains a connection to the Directory Server associated
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
index 181957e..8833e0f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
@@ -42,7 +42,7 @@
* associated connection factories.
*/
@Override
- public void close();
+ void close();
/**
* Returns a connection factory which should be used in order to satisfy the
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
index 6ba3194..c894f66 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
@@ -432,7 +432,7 @@
/**
* Search request context implementation.
*/
- private final static class SearchRequestContextImpl extends RequestContextImpl<Result, ResultHandler<Result>>
+ private static final class SearchRequestContextImpl extends RequestContextImpl<Result, ResultHandler<Result>>
implements SearchResultHandler {
private final SearchResultHandler entryHandler;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
index 97bcd0b..adb3d7a 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
@@ -46,7 +46,7 @@
* A schema resolver which always returns the current default schema as
* returned by {@link Schema#getDefaultSchema()}.
*/
- public static final SchemaResolver DEFAULT = new SchemaResolver() {
+ SchemaResolver DEFAULT = new SchemaResolver() {
public Schema resolveSchema(String dn) {
return Schema.getDefaultSchema();
@@ -66,5 +66,5 @@
* @return The appropriate schema for use with the provided distinguished
* name.
*/
- public abstract Schema resolveSchema(String dn);
+ Schema resolveSchema(String dn);
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java
index 640fd1a..438e4e4 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java
@@ -44,7 +44,7 @@
* @return The delay to wait before next timeout callback in milliseconds,
* or zero if this listener should no longer be notified.
*/
- long handleTimeout(final long currentTime);
+ long handleTimeout(long currentTime);
/**
* Returns the timeout for this listener.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
index b768e62..fa32967 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
@@ -120,7 +120,7 @@
}
};
- private final static ByteString CONTROL_VALUE = ByteString.valueOf("0");
+ private static final ByteString CONTROL_VALUE = ByteString.valueOf("0");
/**
* Creates a new Netscape password expired response control.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
index 3cfe126..f1a40ec 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
@@ -59,7 +59,7 @@
* The name of the SASL mechanism that does not provide any authentication
* but rather uses anonymous access.
*/
- public static final String SASL_MECHANISM_NAME = "ANONYMOUS";
+ String SASL_MECHANISM_NAME = "ANONYMOUS";
@Override
AnonymousSASLBindRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
index 5727cac..12f78a2 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
@@ -36,7 +36,7 @@
*/
final class AnonymousSASLBindRequestImpl extends AbstractSASLBindRequest<AnonymousSASLBindRequest>
implements AnonymousSASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private Client(final AnonymousSASLBindRequestImpl initialBindRequest,
final String serverName) {
super(initialBindRequest);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
index 9a8bda6..9f312ab 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
@@ -45,12 +45,12 @@
/**
* The authentication type value (0x80) reserved for simple authentication.
*/
- public static final byte AUTHENTICATION_TYPE_SIMPLE = (byte) 0x80;
+ byte AUTHENTICATION_TYPE_SIMPLE = (byte) 0x80;
/**
* The authentication type value (0xA3) reserved for SASL authentication.
*/
- public static final byte AUTHENTICATION_TYPE_SASL = (byte) 0xA3;
+ byte AUTHENTICATION_TYPE_SASL = (byte) 0xA3;
@Override
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
index e425df5..6bbe198 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
@@ -60,7 +60,7 @@
/**
* The name of the SASL mechanism based on CRAM-MD5 authentication.
*/
- public static final String SASL_MECHANISM_NAME = "CRAM-MD5";
+ String SASL_MECHANISM_NAME = "CRAM-MD5";
@Override
CRAMMD5SASLBindRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
index 513223a..75ff8d1 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
@@ -52,7 +52,7 @@
*/
final class CRAMMD5SASLBindRequestImpl extends AbstractSASLBindRequest<CRAMMD5SASLBindRequest>
implements CRAMMD5SASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private final String authenticationID;
private final ByteString password;
private final SaslClient saslClient;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
index 90b378c..cb05081 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
@@ -53,13 +53,13 @@
/**
* A decoder which can be used to decode cancel extended operation requests.
*/
- public static final ExtendedRequestDecoder<CancelExtendedRequest, ExtendedResult> DECODER =
+ ExtendedRequestDecoder<CancelExtendedRequest, ExtendedResult> DECODER =
new CancelExtendedRequestImpl.RequestDecoder();
/**
* The OID for the cancel extended operation request.
*/
- public static final String OID = "1.3.6.1.1.8";
+ String OID = "1.3.6.1.1.8";
@Override
CancelExtendedRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
index 79dde24..a067cda 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
@@ -62,52 +62,52 @@
* Indicates that the client will accept connection encryption using the
* high strength triple-DES cipher.
*/
- public static final String CIPHER_3DES = "3des";
+ String CIPHER_3DES = "3des";
/**
* Indicates that the client will accept connection encryption using the
* medium strength DES cipher.
*/
- public static final String CIPHER_DES = "des";
+ String CIPHER_DES = "des";
/**
* Indicates that the client will accept connection encryption using the
* strongest supported cipher, as long as the cipher is considered to be
* high strength.
*/
- public static final String CIPHER_HIGH = "high";
+ String CIPHER_HIGH = "high";
/**
* Indicates that the client will accept connection encryption using the
* strongest supported cipher, even if the strongest cipher is considered to
* be medium or low strength.
*/
- public static final String CIPHER_LOW = "low";
+ String CIPHER_LOW = "low";
/**
* Indicates that the client will accept connection encryption using the
* strongest supported cipher, as long as the cipher is considered to be
* high or medium strength.
*/
- public static final String CIPHER_MEDIUM = "medium";
+ String CIPHER_MEDIUM = "medium";
/**
* Indicates that the client will accept connection encryption using the
* high strength 128-bit RC4 cipher.
*/
- public static final String CIPHER_RC4_128 = "rc4";
+ String CIPHER_RC4_128 = "rc4";
/**
* Indicates that the client will accept connection encryption using the low
* strength 40-bit RC4 cipher.
*/
- public static final String CIPHER_RC4_40 = "rc4-40";
+ String CIPHER_RC4_40 = "rc4-40";
/**
* Indicates that the client will accept connection encryption using the
* medium strength 56-bit RC4 cipher.
*/
- public static final String CIPHER_RC4_56 = "rc4-56";
+ String CIPHER_RC4_56 = "rc4-56";
/**
* Indicates that the client will accept authentication only. More
@@ -116,25 +116,25 @@
* SSL/TLS. This is the default if no QOP option is present in the bind
* request.
*/
- public static final String QOP_AUTH = "auth";
+ String QOP_AUTH = "auth";
/**
* Indicates that the client will accept authentication with connection
* integrity protection and encryption.
*/
- public static final String QOP_AUTH_CONF = "auth-conf";
+ String QOP_AUTH_CONF = "auth-conf";
/**
* Indicates that the client will accept authentication with connection
* integrity protection. More specifically, the underlying connection will
* not be encrypted, unless previously established using SSL/TLS.
*/
- public static final String QOP_AUTH_INT = "auth-int";
+ String QOP_AUTH_INT = "auth-int";
/**
* The name of the SASL mechanism based on DIGEST-MD5 authentication.
*/
- public static final String SASL_MECHANISM_NAME = "DIGEST-MD5";
+ String SASL_MECHANISM_NAME = "DIGEST-MD5";
/**
* Adds the provided additional authentication parameter to the list of
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
index ba6228d..8e5b8ef 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
@@ -62,7 +62,7 @@
*/
final class DigestMD5SASLBindRequestImpl extends AbstractSASLBindRequest<DigestMD5SASLBindRequest>
implements DigestMD5SASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private final String authenticationID;
private final ByteString password;
private final String realm;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
index e4bc658..91b6e98 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
@@ -59,7 +59,7 @@
/**
* The name of the SASL mechanism based on external authentication.
*/
- public static final String SASL_MECHANISM_NAME = "EXTERNAL";
+ String SASL_MECHANISM_NAME = "EXTERNAL";
@Override
ExternalSASLBindRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
index 9ddaeca..1157e8e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
@@ -44,7 +44,7 @@
*/
final class ExternalSASLBindRequestImpl extends AbstractSASLBindRequest<ExternalSASLBindRequest>
implements ExternalSASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private final SaslClient saslClient;
private Client(final ExternalSASLBindRequestImpl initialBindRequest, final String serverName)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
index 8c07ddf..935db60 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
@@ -64,25 +64,25 @@
* SSL/TLS. This is the default if no QOP option is present in the bind
* request.
*/
- public static final String QOP_AUTH = "auth";
+ String QOP_AUTH = "auth";
/**
* Indicates that the client will accept authentication with connection
* integrity protection and encryption.
*/
- public static final String QOP_AUTH_CONF = "auth-conf";
+ String QOP_AUTH_CONF = "auth-conf";
/**
* Indicates that the client will accept authentication with connection
* integrity protection. More specifically, the underlying connection will
* not be encrypted, unless previously established using SSL/TLS.
*/
- public static final String QOP_AUTH_INT = "auth-int";
+ String QOP_AUTH_INT = "auth-int";
/**
* The name of the SASL mechanism based on GSS-API authentication.
*/
- public static final String SASL_MECHANISM_NAME = "GSSAPI";
+ String SASL_MECHANISM_NAME = "GSSAPI";
/**
* Adds the provided additional authentication parameter to the list of
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
index c4b8407..bc48a25 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
@@ -68,7 +68,7 @@
@SuppressWarnings("restriction")
final class GSSAPISASLBindRequestImpl extends AbstractSASLBindRequest<GSSAPISASLBindRequest>
implements GSSAPISASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private static Subject kerberos5Login(final String authenticationID,
final ByteString password, final String realm, final String kdc) throws LdapException {
if (authenticationID == null) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
index 5997d58..f6254bd 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
@@ -50,7 +50,7 @@
* A decoder which can be used to decode generic extended operation
* requests.
*/
- public static final ExtendedRequestDecoder<GenericExtendedRequest, GenericExtendedResult> DECODER =
+ ExtendedRequestDecoder<GenericExtendedRequest, GenericExtendedResult> DECODER =
new GenericExtendedRequestImpl.RequestDecoder();
@Override
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
index ce3066d..637f067 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
@@ -76,13 +76,13 @@
* A decoder which can be used to decode password modify extended operation
* requests.
*/
- public static final ExtendedRequestDecoder<PasswordModifyExtendedRequest, PasswordModifyExtendedResult> DECODER =
+ ExtendedRequestDecoder<PasswordModifyExtendedRequest, PasswordModifyExtendedResult> DECODER =
new PasswordModifyExtendedRequestImpl.RequestDecoder();
/**
* The OID for the password modify extended operation request.
*/
- public static final String OID = "1.3.6.1.4.1.4203.1.11.1";
+ String OID = "1.3.6.1.4.1.4203.1.11.1";
@Override
PasswordModifyExtendedRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
index 3374d17..76c045f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
@@ -68,7 +68,7 @@
/**
* The name of the SASL mechanism based on PLAIN authentication.
*/
- public static final String SASL_MECHANISM_NAME = "PLAIN";
+ String SASL_MECHANISM_NAME = "PLAIN";
@Override
PlainSASLBindRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
index 903ff5f..72aa288 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
@@ -49,7 +49,7 @@
*/
final class PlainSASLBindRequestImpl extends AbstractSASLBindRequest<PlainSASLBindRequest>
implements PlainSASLBindRequest {
- private final static class Client extends SASLBindClientImpl {
+ private static final class Client extends SASLBindClientImpl {
private final String authenticationID;
private final ByteString password;
private final SaslClient saslClient;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
index 9c1f78c..860db12 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
@@ -72,13 +72,13 @@
* A decoder which can be used to decode start TLS extended operation
* requests.
*/
- public static final ExtendedRequestDecoder<StartTLSExtendedRequest, ExtendedResult> DECODER =
+ ExtendedRequestDecoder<StartTLSExtendedRequest, ExtendedResult> DECODER =
new StartTLSExtendedRequestImpl.RequestDecoder();
/**
* The OID for the start TLS extended operation request.
*/
- public static final String OID = "1.3.6.1.4.1.1466.20037";
+ String OID = "1.3.6.1.4.1.1466.20037";
@Override
StartTLSExtendedRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
index 07d4f56..a7af9dc 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
@@ -83,13 +83,13 @@
* A decoder which can be used to decode who am I extended operation
* requests.
*/
- public static final ExtendedRequestDecoder<WhoAmIExtendedRequest, WhoAmIExtendedResult> DECODER =
+ ExtendedRequestDecoder<WhoAmIExtendedRequest, WhoAmIExtendedResult> DECODER =
new WhoAmIExtendedRequestImpl.RequestDecoder();
/**
* The OID for the who am I extended operation request.
*/
- public static final String OID = "1.3.6.1.4.1.4203.1.11.3";
+ String OID = "1.3.6.1.4.1.4203.1.11.3";
@Override
WhoAmIExtendedRequest addControl(Control control);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
index 5165fa1..c2dfcb0 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
@@ -77,8 +77,7 @@
* decoder.
*/
<R extends ExtendedResult> ResultHandler<S> adaptExtendedResultHandler(
- final ExtendedRequest<R> request, final ResultHandler<? super R> resultHandler,
- DecodeOptions options);
+ ExtendedRequest<R> request, ResultHandler<? super R> resultHandler, DecodeOptions options);
/**
* Decodes the provided extended operation result as a {@code Result} of
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index 1ef8c31..994d5e1 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -62,7 +62,7 @@
/**
* A fluent API for incrementally constructing matching rules.
*/
- public final static class Builder extends SchemaElementBuilder<Builder> {
+ public static final class Builder extends SchemaElementBuilder<Builder> {
private String oid;
private final List<String> names = new LinkedList<String>();
private boolean isObsolete = false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index f5a7f1d..011d50b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -54,7 +54,7 @@
/**
* A fluent API for incrementally constructing name forms.
*/
- public final static class Builder extends SchemaElementBuilder<Builder> {
+ public static final class Builder extends SchemaElementBuilder<Builder> {
private boolean isObsolete = false;
private final List<String> names = new LinkedList<String>();
private String oid;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
index 545df8c..fe1520e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
@@ -58,7 +58,7 @@
/**
* A fluent API for incrementally constructing syntaxes.
*/
- public final static class Builder extends SchemaElementBuilder<Builder> {
+ public static final class Builder extends SchemaElementBuilder<Builder> {
private String oid;
private SyntaxImpl impl;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
index 4016e88..7f822e8 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
@@ -42,7 +42,7 @@
* attributes with this syntax, or {@code null} if approximate
* matches will not be allowed for this type by default.
*/
- public String getApproximateMatchingRule();
+ String getApproximateMatchingRule();
/**
* Retrieves the default equality matching rule that will be used for
@@ -52,14 +52,14 @@
* attributes with this syntax, or {@code null} if equality matches
* will not be allowed for this type by default.
*/
- public String getEqualityMatchingRule();
+ String getEqualityMatchingRule();
/**
* Retrieves the common name for this attribute syntax.
*
* @return The common name for this attribute syntax.
*/
- public String getName();
+ String getName();
/**
* Retrieves the default ordering matching rule that will be used for
@@ -69,7 +69,7 @@
* attributes with this syntax, or {@code null} if ordering matches
* will not be allowed for this type by default.
*/
- public String getOrderingMatchingRule();
+ String getOrderingMatchingRule();
/**
* Retrieves the default substring matching rule that will be used for
@@ -79,7 +79,7 @@
* attributes with this syntax, or {@code null} if substring matches
* will not be allowed for this type by default.
*/
- public String getSubstringMatchingRule();
+ String getSubstringMatchingRule();
/**
* Indicates whether this attribute syntax requires that values must be
@@ -92,7 +92,7 @@
* @see <a href="http://tools.ietf.org/html/rfc4522">RFC 4522 - Lightweight
* Directory Access Protocol (LDAP): The Binary Encoding Option </a>
*/
- public boolean isBEREncodingRequired();
+ boolean isBEREncodingRequired();
/**
* Indicates whether this attribute syntax would likely be a human readable
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
index e4e1763..85f2585 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
@@ -56,13 +56,13 @@
* The lock that will be used to provide threadsafe access to the date
* formatter.
*/
- private final static Object DATE_FORMAT_LOCK;
+ private static final Object DATE_FORMAT_LOCK;
/**
* The date formatter that will be used to convert dates into UTC time
* values. Note that all interaction with it must be synchronized.
*/
- private final static SimpleDateFormat DATE_FORMAT;
+ private static final SimpleDateFormat DATE_FORMAT;
/**
* The date formatter needs help converting 2-digit years.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
index 159f58c..c76cf3f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
@@ -47,14 +47,14 @@
*
* @return The address used by the connections.
*/
- public InetSocketAddress getSocketAddress();
+ InetSocketAddress getSocketAddress();
/**
* Returns the hostname used by the connections created by this factory.
*
* @return The hostname used by the connections.
*/
- public String getHostName();
+ String getHostName();
/**
* Returns the remote port number used by the connections created by this
@@ -62,6 +62,6 @@
*
* @return The remote port number used by the connections.
*/
- public int getPort();
+ int getPort();
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
index ce001da..d95991e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
@@ -45,7 +45,7 @@
*
* @return The address that this LDAP listener is listening on.
*/
- public InetSocketAddress getSocketAddress();
+ InetSocketAddress getSocketAddress();
/**
* Closes this stream and releases any system resources associated
@@ -53,6 +53,6 @@
* method has no effect.
*/
@Override
- public void close();
+ void close();
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
index 9efc973..1d31b45 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
@@ -113,7 +113,7 @@
/**
* Result handler that places all responses in a queue.
*/
- private final static class BufferHandler implements SearchResultHandler, ResultHandler<Result> {
+ private static final class BufferHandler implements SearchResultHandler, ResultHandler<Result> {
private final BlockingQueue<Response> responses;
private volatile boolean isInterrupted = false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
index e2639d9..762e0eb 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
@@ -48,19 +48,16 @@
* A handler which terminates processing by throwing a
* {@code DecodeException} as soon as a change is rejected.
*/
- public final static RejectedChangeRecordListener FAIL_FAST =
- new RejectedChangeRecordListener() {
+ RejectedChangeRecordListener FAIL_FAST = new RejectedChangeRecordListener() {
public Entry handleDuplicateEntry(final AddRequest change, final Entry existingEntry)
throws DecodeException {
- throw DecodeException.error(REJECTED_CHANGE_FAIL_ADD_DUPE.get(change.getName()
- .toString()));
+ throw DecodeException.error(REJECTED_CHANGE_FAIL_ADD_DUPE.get(change.getName()));
}
public Entry handleDuplicateEntry(final ModifyDNRequest change,
final Entry existingEntry, final Entry renamedEntry) throws DecodeException {
- throw DecodeException.error(REJECTED_CHANGE_FAIL_MODIFYDN_DUPE.get(renamedEntry
- .getName().toString()));
+ throw DecodeException.error(REJECTED_CHANGE_FAIL_MODIFYDN_DUPE.get(renamedEntry.getName()));
}
public void handleRejectedChangeRecord(final AddRequest change,
@@ -90,8 +87,7 @@
* tolerates duplicate entries by overwriting the existing entry with the
* new entry.
*/
- public final static RejectedChangeRecordListener OVERWRITE =
- new RejectedChangeRecordListener() {
+ RejectedChangeRecordListener OVERWRITE = new RejectedChangeRecordListener() {
public Entry handleDuplicateEntry(final AddRequest change, final Entry existingEntry)
throws DecodeException {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
index 49524e6..cf9b52f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
@@ -42,7 +42,7 @@
* processing by throwing a {@code DecodeException} as soon as a record is
* found to be malformed or rejected due to a schema validation failure.
*/
- public static final RejectedLDIFListener FAIL_FAST = new RejectedLDIFListener() {
+ RejectedLDIFListener FAIL_FAST = new RejectedLDIFListener() {
@Override
public void handleMalformedRecord(final long lineNumber, final List<String> lines,
@@ -74,7 +74,7 @@
/**
* A handler which ignores all rejected record notifications.
*/
- public static final RejectedLDIFListener IGNORE_ALL = new RejectedLDIFListener() {
+ RejectedLDIFListener IGNORE_ALL = new RejectedLDIFListener() {
@Override
public void handleMalformedRecord(final long lineNumber, final List<String> lines,
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
index 0bf9dc7..d8c8bd8 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
@@ -514,7 +514,7 @@
* Base tag to use to base presence of one attribute on the absence/presence
* of another attribute and/or attribute value.
*/
- abstract static class IfTag extends TemplateTag {
+ static abstract class IfTag extends TemplateTag {
/** The attribute type for which to make the determination. */
AttributeType attributeType;
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
index 70cc764..5c3f26b 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
@@ -84,7 +84,7 @@
private static final String TEST_DN = "cn=test";
interface LDAPWrite {
- public void perform(LDAPWriter<? extends ASN1Writer> writer) throws IOException;
+ void perform(LDAPWriter<? extends ASN1Writer> writer) throws IOException;
}
@DataProvider
@@ -504,16 +504,16 @@
/**
* Returns a writer specific to the transport module.
*/
- abstract protected LDAPWriter<? extends ASN1Writer> getLDAPWriter();
+ protected abstract LDAPWriter<? extends ASN1Writer> getLDAPWriter();
/**
* Returns a reader specific to the transport module.
*/
- abstract protected LDAPReader<? extends ASN1Reader> getLDAPReader();
+ protected abstract LDAPReader<? extends ASN1Reader> getLDAPReader();
/**
* Transfer raw data from writer to the reader.
*/
- abstract protected void transferFromWriterToReader(LDAPWriter<? extends ASN1Writer> writer,
+ protected abstract void transferFromWriterToReader(LDAPWriter<? extends ASN1Writer> writer,
LDAPReader<? extends ASN1Reader> reader);
}
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
index 4d025ea..ed37b09 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -120,13 +120,13 @@
}
private interface SequenceLimiter {
- public void checkLimit(int readSize) throws IOException;
+ void checkLimit(int readSize) throws IOException;
- public SequenceLimiter endSequence() throws IOException;
+ SequenceLimiter endSequence() throws IOException;
- public int remaining();
+ int remaining();
- public SequenceLimiter startSequence(int readLimit);
+ SequenceLimiter startSequence(int readLimit);
}
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
index 598031a..45e6911 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
@@ -144,13 +144,13 @@
}
private interface SequenceBuffer {
- public SequenceBuffer endSequence() throws IOException;
+ SequenceBuffer endSequence() throws IOException;
- public SequenceBuffer startSequence(byte type) throws IOException;
+ SequenceBuffer startSequence(byte type) throws IOException;
- public void writeByte(byte b) throws IOException;
+ void writeByte(byte b) throws IOException;
- public void writeByteArray(byte[] bs, int offset, int length) throws IOException;
+ void writeByteArray(byte[] bs, int offset, int length) throws IOException;
}
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
index 0a080fd..c1188bc 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
@@ -159,7 +159,7 @@
* @throws IOException
* if an error occurs during writing
*/
- abstract protected void writeResult(final LDAPWriter<ASN1BufferWriter> ldapWriter,
+ protected abstract void writeResult(final LDAPWriter<ASN1BufferWriter> ldapWriter,
final R result) throws IOException;
/**
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
index 1f7f65a..d367c02 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
@@ -48,9 +48,9 @@
*/
final class DataSource {
private static interface IDataSource {
- public IDataSource duplicate();
+ IDataSource duplicate();
- public Object getData();
+ Object getData();
}
private static class IncrementLineFileDataSource implements IDataSource {
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java
index a453f88..49e8933 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java
@@ -68,21 +68,21 @@
* authorization identity for this operation, or {@code null} if the
* authorization identity should be the unauthenticated user.
*/
- public Entry getAuthorizationEntry();
+ Entry getAuthorizationEntry();
/**
* Returns a connection for performing internal operations.
*
* @return A connection for performing internal operations.
*/
- public Connection getConnection();
+ Connection getConnection();
/**
* Retrieves the operation ID for this operation.
*
* @return The operation ID for this operation.
*/
- public long getOperationID();
+ long getOperationID();
/**
* Indicates whether the authenticate client has all of the specified
@@ -93,7 +93,7 @@
* @return {@code true} if the authenticated client has all of the specified
* privileges, or {@code false} if not.
*/
- public boolean hasAllPrivileges(Collection<Privilege> privileges);
+ boolean hasAllPrivileges(Collection<Privilege> privileges);
/**
* Indicates whether the authenticated client has the specified privilege.
@@ -103,7 +103,7 @@
* @return {@code true} if the authenticated client has the specified
* privilege, or {@code false} if not.
*/
- public boolean hasPrivilege(Privilege privilege);
+ boolean hasPrivilege(Privilege privilege);
/**
* Sets the entry for the user that should be considered the authorization
@@ -114,7 +114,7 @@
* authorization identity for this operation, or {@code null} if
* it should be the unauthenticated user.
*/
- public void setAuthorizationEntry(Entry authorizationEntry);
+ void setAuthorizationEntry(Entry authorizationEntry);
/**
* Retrieves the entry for the user as whom the client is authenticated.
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
index 2dedd19..4bf0d60 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
@@ -47,9 +47,9 @@
*/
final class SetupLog {
- static private File logFile = null;
- static private FileHandler fileHandler = null;
- final static String LOGNAME = "setup.log";
+ private static File logFile = null;
+ private static FileHandler fileHandler = null;
+ static final String LOGNAME = "setup.log";
private SetupLog() {
// Nothing to do.
@@ -117,7 +117,7 @@
*
* @return File representing the log file
*/
- static public File getLogFile() {
+ public static File getLogFile() {
return logFile;
}
}
diff --git a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java
index 1d8c318..efd1ff7 100644
--- a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java
+++ b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/EmbeddedServerTestCaseUtils.java
@@ -56,17 +56,17 @@
/**
* The configuration properties for the tests.
*/
- final static Properties CONFIG_PROPERTIES = new Properties();
+ static final Properties CONFIG_PROPERTIES = new Properties();
/**
* The path to the test classes.
*/
- final static String TEST_CLASSES_PATH = "./target/test-classes/";
+ static final String TEST_CLASSES_PATH = "./target/test-classes/";
/**
* The path to the configuration folder.
*/
- final static String TEST_CLASSES_PATH_CONFIG = "./target/test-classes/config/";
+ static final String TEST_CLASSES_PATH_CONFIG = "./target/test-classes/config/";
/**
* Starts the embedded server.
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
index 5e8549c..d55b523 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
+++ b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
@@ -55,17 +55,17 @@
/**
* The configuration properties for the tests.
*/
- final static Properties CONFIG_PROPERTIES = new Properties();
+ static final Properties CONFIG_PROPERTIES = new Properties();
/**
* The path to the test classes.
*/
- final static String TEST_CLASSES_PATH = "./target/test-classes/";
+ static final String TEST_CLASSES_PATH = "./target/test-classes/";
/**
* The path to the configuration folder.
*/
- final static String TEST_CLASSES_PATH_CONFIG = "./target/test-classes/config/";
+ static final String TEST_CLASSES_PATH_CONFIG = "./target/test-classes/config/";
/**
* Starts the embedded server.
--
Gitblit v1.10.0