From 0d4ba91f61ab46065c63c17784090c1d318ab674 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Oct 2014 14:39:14 +0000
Subject: [PATCH] Autorefactored removing default values for field initializers
---
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java | 6
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java | 6
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java | 2
opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java | 6
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java | 4
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java | 7
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java | 2
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java | 10
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 8
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java | 4
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java | 21 +-
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java | 4
opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java | 6
opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java | 4
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java | 40 ++--
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java | 12 -
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java | 2
opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java | 6
opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java | 6
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java | 2
opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 10
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java | 2
opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java | 20 +-
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java | 11 -
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java | 4
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java | 10
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java | 4
opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java | 4
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java | 6
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java | 12
opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java | 2
opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java | 4
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java | 2
opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java | 2
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java | 14 -
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java | 4
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java | 8
opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java | 2
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java | 25 --
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java | 6
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java | 6
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 15 -
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java | 2
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java | 6
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java | 4
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java | 4
opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java | 4
opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java | 2
78 files changed, 187 insertions(+), 242 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
index 398559c..132124f 100755
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
@@ -63,7 +63,7 @@
/**
* The default keyManager.
*/
- private X509KeyManager keyManager = null;
+ private X509KeyManager keyManager;
/**
* The default constructor.
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java
index 2ac104e..3c33bb3 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java
@@ -40,10 +40,10 @@
public final class ArgumentGroup implements Comparable<ArgumentGroup> {
/** Description for this group of arguments. */
- private LocalizableMessage description = null;
+ private LocalizableMessage description;
/** List of arguments belonging to this group. */
- private List<Argument> args = null;
+ private List<Argument> args;
/** Governs groups position within usage statement. */
private final Integer priority;
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
index f7eae61..fb21e1b 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
@@ -73,58 +73,58 @@
static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The 'hostName' global argument. */
- private StringArgument hostNameArg = null;
+ private StringArgument hostNameArg;
/** The 'port' global argument. */
- private IntegerArgument portArg = null;
+ private IntegerArgument portArg;
/** The 'bindDN' global argument. */
- private StringArgument bindNameArg = null;
+ private StringArgument bindNameArg;
/** The 'bindPasswordFile' global argument. */
- private FileBasedArgument bindPasswordFileArg = null;
+ private FileBasedArgument bindPasswordFileArg;
/** The 'password' value. */
- private char[] password = null;
+ private char[] password;
/** The 'bindPassword' global argument. */
- private StringArgument bindPasswordArg = null;
+ private StringArgument bindPasswordArg;
/** The 'connectTimeOut' global argument. */
- private IntegerArgument connectTimeOut = null;
+ private IntegerArgument connectTimeOut;
/** The 'trustAllArg' global argument. */
- private BooleanArgument trustAllArg = null;
+ private BooleanArgument trustAllArg;
/** The 'trustStore' global argument. */
- private StringArgument trustStorePathArg = null;
+ private StringArgument trustStorePathArg;
/** The 'trustStorePassword' global argument. */
- private StringArgument trustStorePasswordArg = null;
+ private StringArgument trustStorePasswordArg;
/** The 'trustStorePasswordFile' global argument. */
- private FileBasedArgument trustStorePasswordFileArg = null;
+ private FileBasedArgument trustStorePasswordFileArg;
/** The 'keyStore' global argument. */
- private StringArgument keyStorePathArg = null;
+ private StringArgument keyStorePathArg;
/** The 'keyStorePassword' global argument. */
- private StringArgument keyStorePasswordArg = null;
+ private StringArgument keyStorePasswordArg;
/** The 'keyStorePasswordFile' global argument. */
- private FileBasedArgument keyStorePasswordFileArg = null;
+ private FileBasedArgument keyStorePasswordFileArg;
/** The 'certNicknameArg' global argument. */
- private StringArgument certNicknameArg = null;
+ private StringArgument certNicknameArg;
/** The 'useSSLArg' global argument. */
- private BooleanArgument useSSLArg = null;
+ private BooleanArgument useSSLArg;
/** The 'useStartTLSArg' global argument. */
- private BooleanArgument useStartTLSArg = null;
+ private BooleanArgument useStartTLSArg;
/** Argument indicating a SASL option. */
- private StringArgument saslOptionArg = null;
+ private StringArgument saslOptionArg;
/**
* Whether to request that the server return the authorization ID in the
@@ -150,13 +150,13 @@
protected ConnectionFactory authenticatedConnFactory;
/** The bind request to connect with. */
- private BindRequest bindRequest = null;
+ private BindRequest bindRequest;
/** The console application linked to this connection in interactive mode. */
private final ConsoleApplication app;
/** If this connection should be an admin connection. */
- private boolean isAdminConnection = false;
+ private boolean isAdminConnection;
/**
* Default constructor to create a connection factory designed for use with command line tools,
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
index 9e9eb36..1941e9c 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
@@ -310,7 +310,7 @@
* Indicates whether the menu will allow selection of multiple
* numeric options.
*/
- private boolean allowMultiSelect = false;
+ private boolean allowMultiSelect;
/** The application console. */
private final ConsoleApplication app;
@@ -331,10 +331,10 @@
private final List<Integer> columnWidths = new ArrayList<Integer>();
/** The call-back for the optional default action. */
- private MenuCallback<T> defaultCallback = null;
+ private MenuCallback<T> defaultCallback;
/** The description of the optional default action. */
- private LocalizableMessage defaultDescription = null;
+ private LocalizableMessage defaultDescription;
/** The numeric option call-backs. */
private final List<MenuCallback<T>> numericCallbacks = new ArrayList<MenuCallback<T>>();
@@ -343,10 +343,10 @@
private final List<List<LocalizableMessage>> numericFields = new ArrayList<List<LocalizableMessage>>();
/** The menu title. */
- private LocalizableMessage title = null;
+ private LocalizableMessage title;
/** The menu prompt. */
- private LocalizableMessage prompt = null;
+ private LocalizableMessage prompt;
/**
* The maximum number of times that we allow the user to provide an invalid
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
index 73bc229..5e24087 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
@@ -123,35 +123,22 @@
*/
public final class MultiColumnPrinter {
- /**
- * Left ID.
- */
+ /** Left ID. */
public static final int LEFT = 0;
-
- /**
- * Center ID.
- */
+ /** Center ID. */
public static final int CENTER = 1;
-
- /**
- * Right ID.
- */
+ /** Right ID. */
public static final int RIGHT = 2;
private int numCol = 2;
-
private int gap = 4;
private int align = CENTER;
-
private int titleAlign = CENTER;
- private String border = null;
-
- private List<String[]> titleTable = null;
-
- private List<int[]> titleSpanTable = null;
-
+ private String border;
+ private List<String[]> titleTable;
+ private List<int[]> titleSpanTable;
private final int[] curLength;
private final ConsoleApplication app;
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
index 29d92bf..68b2275 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
@@ -48,7 +48,7 @@
* Counts the number of separators that should be output the next time a non-empty cell is displayed. The tab
* separators are not displayed immediately so that we can avoid displaying unnecessary trailing separators.
*/
- private int requiredSeparators = 0;
+ private int requiredSeparators;
/** Private constructor. */
private Serializer() {
@@ -114,10 +114,10 @@
}
/** Indicates whether or not the headings should be output. */
- private boolean displayHeadings = false;
+ private boolean displayHeadings;
/** The output destination. */
- private PrintWriter writer = null;
+ private PrintWriter writer;
/**
* Creates a new tab separated table printer for the specified output stream. Headings will not be displayed by
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java
index 44b8eae..e323a22 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java
@@ -43,7 +43,7 @@
* The current column number in the current row where 0 represents
* the left-most column in the table.
*/
- private int column = 0;
+ private int column;
/** The current with of each column. */
private List<Integer> columnWidths = new ArrayList<Integer>();
@@ -52,7 +52,7 @@
private List<LocalizableMessage> header = new ArrayList<LocalizableMessage>();
/** The current number of rows in the table. */
- private int height = 0;
+ private int height;
/** The list of table rows. */
private List<List<String>> rows = new ArrayList<List<String>>();
@@ -64,7 +64,7 @@
private List<Integer> sortKeys = new ArrayList<Integer>();
/** The current number of columns in the table. */
- private int width = 0;
+ private int width;
/**
* Creates a new table printer.
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
index 7842c9d..5d88eb0 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
@@ -56,7 +56,7 @@
private final List<String> currentRow = new ArrayList<String>();
/** Width of the table in columns. */
- private int totalColumns = 0;
+ private int totalColumns;
/** The padding to use for indenting the table. */
private final String indentPadding;
@@ -310,7 +310,7 @@
private final Map<Integer, Integer> fixedColumns = new HashMap<Integer, Integer>();
/** The number of characters the table should be indented. */
- private int indentWidth = 0;
+ private int indentWidth;
/**
* The character which should be used to separate the table
@@ -319,7 +319,7 @@
private char headingSeparator = DEFAULT_HEADING_SEPARATOR;
/** The column where the heading separator should begin. */
- private int headingSeparatorStartColumn = 0;
+ private int headingSeparatorStartColumn;
/**
* The padding which will be used to separate a cell's
@@ -334,7 +334,7 @@
private int totalWidth = MAX_LINE_WIDTH;
/** The output destination. */
- private PrintWriter writer = null;
+ private PrintWriter writer;
/**
* Creates a new text table printer for the specified output stream. The text table printer will have the following
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 258f11c..d4e8987 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
@@ -52,9 +52,9 @@
private static class MockConsoleApplication extends ConsoleApplication {
private static ByteArrayOutputStream out;
private static ByteArrayOutputStream err;
- private boolean verbose = false;
- private boolean interactive = false;
- private boolean quiet = false;
+ private boolean verbose;
+ private boolean interactive;
+ private boolean quiet;
private MockConsoleApplication(PrintStream out, PrintStream err) {
super(out, err);
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
index 974c152..1821563 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
@@ -82,15 +82,11 @@
private final class DefaultManagedObjectFactory implements RelationDefinitionVisitor<Void, Void> {
/** Possible exceptions. */
- private ManagedObjectAlreadyExistsException moaee = null;
-
- private MissingMandatoryPropertiesException mmpe = null;
-
- private ConcurrentModificationException cme = null;
-
- private OperationRejectedException ore = null;
-
- private LdapException ere = null;
+ private ManagedObjectAlreadyExistsException moaee;
+ private MissingMandatoryPropertiesException mmpe;
+ private ConcurrentModificationException cme;
+ private OperationRejectedException ore;
+ private LdapException ere;
/** {@inheritDoc} */
@Override
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
index dc37177..1a95394 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
@@ -87,7 +87,7 @@
* Any exception that occurred whilst retrieving inherited default
* values.
*/
- private PropertyException exception = null;
+ private PropertyException exception;
/** The path of the managed object containing the first property. */
private final ManagedObjectPath<?, ?> firstPath;
@@ -96,10 +96,10 @@
private final boolean isCreate;
/** The path of the managed object containing the next property. */
- private ManagedObjectPath<?, ?> nextPath = null;
+ private ManagedObjectPath<?, ?> nextPath;
/** The next property whose default values were required. */
- private PropertyDefinition<T> nextProperty = null;
+ private PropertyDefinition<T> nextProperty;
/** Private constructor. */
private DefaultValueFinder(ManagedObjectPath<?, ?> p, boolean isCreate) {
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
index 600251c..f745941 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
@@ -88,7 +88,7 @@
}
/** The strongly typed private implementation. */
- private Impl<?> impl = null;
+ private Impl<?> impl;
/** The property name. */
private final String propertyName;
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 75b26a7..785c1ec 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -258,8 +258,8 @@
public static final String GENERIC_TYPE = "generic";
private long sessionStartTime;
- private boolean sessionStartTimePrinted = false;
- private int sessionEquivalentOperationNumber = 0;
+ private boolean sessionStartTimePrinted;
+ private int sessionEquivalentOperationNumber;
/**
* Provides the command-line arguments to the main application for processing.
@@ -309,15 +309,15 @@
/**
* The factory which the application should use to retrieve its management context.
*/
- private LDAPManagementContextFactory factory = null;
+ private LDAPManagementContextFactory factory;
/**
* Flag indicating whether or not the global arguments have already been initialized.
*/
- private boolean globalArgumentsInitialized = false;
+ private boolean globalArgumentsInitialized;
/** The sub-command handler factory. */
- private SubCommandHandlerFactory handlerFactory = null;
+ private SubCommandHandlerFactory handlerFactory;
/** Mapping of sub-commands to their implementations. */
private final Map<SubCommand, SubCommandHandler> handlers = new HashMap<SubCommand, SubCommandHandler>();
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index 6c6834f..cb3d1f1 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -346,7 +346,7 @@
implements MenuCallback<Void> {
/** Any exception that was caught during processing. */
- private ClientException e = null;
+ private ClientException e;
/** The managed object being edited. */
private final ManagedObject<?> mo;
@@ -561,7 +561,7 @@
implements MenuCallback<Boolean> {
/** Any exception that was caught during processing. */
- private ClientException e = null;
+ private ClientException e;
/** The managed object being edited. */
private final ManagedObject<?> mo;
@@ -1276,7 +1276,7 @@
MenuCallback<Boolean> {
/** Any exception that was caught during processing. */
- private ClientException e = null;
+ private ClientException e;
/** The managed object being edited. */
private final ManagedObject<?> mo;
@@ -1357,7 +1357,7 @@
implements MenuCallback<Boolean> {
/** Any exception that was caught during processing. */
- private ClientException e = null;
+ private ClientException e;
/** The managed object being edited. */
private final ManagedObject<?> mo;
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
index 573ce31..5a9c453 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
@@ -467,7 +467,7 @@
/**
* Any argument exception thrown when creating the naming arguments.
*/
- private ArgumentException e = null;
+ private ArgumentException e;
/**
* Indicates whether the sub-command is a create-xxx sub-command, in which case the final path element will have
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
index ffda2c0..2f4507e 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
@@ -148,13 +148,13 @@
private final SortedSet<DeleteSubCommandHandler> deleteHandlers = new TreeSet<DeleteSubCommandHandler>();
/** Any exception that occurred whilst creating the sub-commands. */
- private ArgumentException exception = null;
+ private ArgumentException exception;
/** The set of get-xxx-prop available sub-commands. */
private final SortedSet<GetPropSubCommandHandler> getPropHandlers = new TreeSet<GetPropSubCommandHandler>();
/** The help sub-command handler. */
- private HelpSubCommandHandler helpHandler = null;
+ private HelpSubCommandHandler helpHandler;
/** The set of list-xxx available sub-commands. */
private final SortedSet<ListSubCommandHandler> listHandlers = new TreeSet<ListSubCommandHandler>();
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
index 02d8f0f..35ac48f 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
@@ -98,7 +98,7 @@
* Any exception that occurred whilst retrieving inherited default
* values.
*/
- private PropertyException exception = null;
+ private PropertyException exception;
/**
* Optional new configuration entry which does not yet exist in
@@ -107,10 +107,10 @@
private final Entry newConfigEntry;
/** The path of the managed object containing the next property. */
- private ManagedObjectPath<?, ?> nextPath = null;
+ private ManagedObjectPath<?, ?> nextPath;
/** The next property whose default values were required. */
- private PropertyDefinition<T> nextProperty = null;
+ private PropertyDefinition<T> nextProperty;
/** Private constructor. */
private DefaultValueFinder(Entry newConfigEntry) {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java
index a196670..5775496 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java
@@ -35,7 +35,7 @@
@SuppressWarnings("javadoc")
public class BooleanPropertyDefinitionTest extends ConfigTestCase {
- BooleanPropertyDefinition.Builder builder = null;
+ private BooleanPropertyDefinition.Builder builder;
@BeforeClass
public void setUp() throws Exception {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
index f02d773..00a3a78 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
@@ -27,9 +27,6 @@
package org.forgerock.opendj.config;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
import java.util.Comparator;
import java.util.List;
@@ -37,6 +34,9 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.forgerock.opendj.config.ClassPropertyDefinition.*;
+import static org.testng.Assert.*;
+
@SuppressWarnings("javadoc")
public class ClassPropertyDefinitionTest extends ConfigTestCase {
@@ -48,6 +48,7 @@
public Comparator<Dummy> comparator() {
return new Comparator<ClassPropertyDefinitionTest.Dummy>() {
+ @Override
public int compare(Dummy o1, Dummy o2) {
// No implementation required.
return 0;
@@ -56,8 +57,6 @@
}
}
- ClassPropertyDefinition.Builder builder = null;
-
@DataProvider(name = "validClassNames")
public Object[][] createBuilderAddInstanceOfData() {
return new Object[][] {
@@ -69,8 +68,7 @@
@Test(dataProvider = "validClassNames")
public void testBuilderAddInstanceOf(String classNameToAdd) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(classNameToAdd);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
List<String> instances = propertyDef.getInstanceOfInterface();
@@ -92,8 +90,7 @@
@Test(dataProvider = "invalidClassNames", expectedExceptions = { IllegalArgumentException.class })
public void testBuilderAddInstanceInvalid(String className) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(className);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
List<String> instances = propertyDef.getInstanceOfInterface();
@@ -115,8 +112,7 @@
@Test(dataProvider = "loadClasses")
public <T> void testLoadClass(String interfaceName, String loadClassName, Class<T> instanceOfClass,
Class<?> expectedClass) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(interfaceName);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
Class<?> clazz = propertyDef.loadClass(loadClassName, instanceOfClass);
@@ -134,8 +130,7 @@
@Test(dataProvider = "loadClassesIllegal", expectedExceptions = { PropertyException.class })
public <T> void testLoadClassIllegal(String interfaceName, String loadClassName, Class<T> instanceOfClass,
Class<?> expectedClass) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(interfaceName);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
Class<?> clazz = propertyDef.loadClass(loadClassName, instanceOfClass);
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
index c9ca475..cb72718 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
@@ -41,7 +41,7 @@
ONE, TWO, THREE
}
- private EnumPropertyDefinition.Builder<TestEnum> builder = null;
+ private EnumPropertyDefinition.Builder<TestEnum> builder;
@BeforeClass
public void setUp() {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java
index d36243c..622d3f9 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java
@@ -36,7 +36,7 @@
@SuppressWarnings("javadoc")
public class ManagedObjectDefinitionI18NResourceTest extends ConfigTestCase {
- ManagedObjectDefinitionI18NResource definitionI18NResource = null;
+ private ManagedObjectDefinitionI18NResource definitionI18NResource;
@BeforeClass
public void setUp() {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
index 64a0010..e4fece8 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
@@ -38,7 +38,7 @@
private TestParentCfgDefn parentDefinition;
- private RelativeInheritedDefaultBehaviorProvider<Boolean> defaultBehaviorProvider = null;
+ private RelativeInheritedDefaultBehaviorProvider<Boolean> defaultBehaviorProvider;
@BeforeClass
public void setUp() {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
index d60f2ac..c662672 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
@@ -49,7 +49,7 @@
private static final String DUMMY_TEST_RELATION = "*dummy*test*relation*";
/** Indicates if the dummy relation profile has been registered. */
- private static boolean isProfileRegistered = false;
+ private static boolean isProfileRegistered;
/** Prevent instantiation. */
private AdminTestCaseUtils() {
diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
index afb056e..c66b3ca 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
@@ -229,17 +229,17 @@
* definition.
*/
private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg>
- aggregationPropertyDefinitionDefault = null;
+ aggregationPropertyDefinitionDefault;
/**
* An aggregation where the target must be enabled if the source is enabled.
*/
private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg>
- aggregationPropertyDefinitionTargetAndSourceMustBeEnabled = null;
+ aggregationPropertyDefinitionTargetAndSourceMustBeEnabled;
/** An aggregation where the target must be enabled. */
private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg>
- aggregationPropertyDefinitionTargetMustBeEnabled = null;
+ aggregationPropertyDefinitionTargetMustBeEnabled;
// @Checkstyle:on
@BeforeClass
diff --git a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
index 1cd870c..b0f4a6f 100644
--- a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
+++ b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
@@ -150,13 +150,11 @@
return new GetSymmetricKeyExtendedRequest();
}
- private String requestSymmetricKey = null;
-
- private String instanceKeyID = null;
+ private String requestSymmetricKey;
+ private String instanceKeyID;
/** Instantiation via factory. */
private GetSymmetricKeyExtendedRequest() {
-
}
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java
index a487ffe..e84b662 100644
--- a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java
+++ b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java
@@ -38,7 +38,7 @@
*/
public final class Iterators {
private static final class ArrayIterator<M> implements Iterator<M> {
- private int i = 0;
+ private int i;
private final M[] a;
/** Constructed via factory methods. */
@@ -88,7 +88,7 @@
private boolean hasNextMustIterate = true;
private final Iterator<M> iterator;
- private M next = null;
+ private M next;
private final P parameter;
private final Predicate<? super M, P> predicate;
diff --git a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
index b532911..f7aca17 100644
--- a/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
+++ b/opendj-sdk/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
@@ -103,9 +103,9 @@
}
}
- private T instance = null;
+ private T instance;
private final Object lock = new Object();
- private int refCount = 0;
+ private int refCount;
/**
* Creates a new referenced object whose reference count is initially zero.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
index 248de9e..0fd941a 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
@@ -46,15 +46,10 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private int state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
-
- private byte peekType = 0;
-
+ private byte peekType;
private int peekLength = -1;
-
private final int maxElementSize;
-
private ByteSequenceReader reader;
-
private final LinkedList<ByteSequenceReader> readerStack;
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
index 001861d..320c7e3 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
@@ -49,19 +49,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private int state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
-
- private byte peekType = 0;
-
+ private byte peekType;
private int peekLength = -1;
-
- private int lengthBytesNeeded = 0;
-
+ private int lengthBytesNeeded;
private final int maxElementSize;
-
private InputStream in;
-
private final LinkedList<InputStream> streamStack;
-
private byte[] buffer;
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
index e9a0aaa..48a8b8b 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
@@ -586,10 +586,10 @@
private final ByteString attributeValue;
/** Cached normalized value using equality matching rule. */
- private ByteString equalityNormalizedAttributeValue = null;
+ private ByteString equalityNormalizedAttributeValue;
/** Cached normalized value using ordering matching rule. */
- private ByteString orderingNormalizedAttributeValue = null;
+ private ByteString orderingNormalizedAttributeValue;
/**
* Creates a new attribute value assertion (AVA) using the provided
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
index 9372d6f..07d38f9 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
@@ -264,7 +264,7 @@
/**
* Guarded by stateLock.
*/
- private int offlineFactoriesCount = 0;
+ private int offlineFactoriesCount;
private final long monitoringInterval;
private final TimeUnit monitoringIntervalTimeUnit;
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
index 8c0d989..a26514e 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
@@ -60,10 +60,10 @@
*/
public final class AttributeFilter {
// TODO: exclude specific attributes, matched values, custom predicates, etc.
- private boolean includeAllOperationalAttributes = false;
+ private boolean includeAllOperationalAttributes;
/** Depends on constructor. */
private boolean includeAllUserAttributes;
- private boolean typesOnly = false;
+ private boolean typesOnly;
/**
* Use a map so that we can perform membership checks as well as recover the
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
index 56f0913..0433e0c 100755
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
@@ -34,7 +34,7 @@
public final class ByteSequenceReader {
/** The current position in the byte sequence. */
- private int pos = 0;
+ private int pos;
/** The underlying byte sequence. */
private final ByteSequence sequence;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
index 94e0acb..06c60e1 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
@@ -143,8 +143,8 @@
private final Connection connection;
private LdapException error;
private final AtomicBoolean isClosed = new AtomicBoolean(false);
- private boolean isDisconnectNotification = false;
- private List<ConnectionEventListener> listeners = null;
+ private boolean isDisconnectNotification;
+ private List<ConnectionEventListener> listeners;
private final Object stateLock = new Object();
PooledConnection(final Connection connection) {
@@ -700,7 +700,7 @@
private final FailureHandler<LdapException> connectionFailureHandler = new ConnectionFailureHandler();
private final int corePoolSize;
private final ConnectionFactory factory;
- private boolean isClosed = false;
+ private boolean isClosed;
private final ScheduledFuture<?> idleTimeoutFuture;
private final long idleTimeoutMillis;
private final int maxPoolSize;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
index 18635c9..2dcbc74 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
@@ -83,7 +83,7 @@
* When true, attribute values are compared byte for byte, otherwise
* they are compared using their matching rules.
*/
- private boolean useExactMatching = false;
+ private boolean useExactMatching;
/**
* When greater than 0, modifications with REPLACE type will be
@@ -91,7 +91,7 @@
* "useReplaceMaxValues" attribute values. Otherwise, modifications with
* DELETE + ADD types will be generated.
*/
- private int useReplaceMaxValues = 0;
+ private int useReplaceMaxValues;
private DiffOptions() {
// Nothing to do.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
index 0f22726..8faf910 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
@@ -447,20 +447,14 @@
};
private static final MultiValueImpl MULTI_VALUE_IMPL = new MultiValueImpl();
-
private static final SingleValueImpl SINGLE_VALUE_IMPL = new SingleValueImpl();
-
private static final ZeroValueImpl ZERO_VALUE_IMPL = new ZeroValueImpl();
private final AttributeDescription attributeDescription;
-
- private Map<ByteString, ByteString> multipleValues = null;
-
- private ByteString normalizedSingleValue = null;
-
+ private Map<ByteString, ByteString> multipleValues;
+ private ByteString normalizedSingleValue;
private Impl pimpl = ZERO_VALUE_IMPL;
-
- private ByteString singleValue = null;
+ private ByteString singleValue;
/**
* Creates a new attribute having the same attribute description and
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
index 04207af..0f7275a 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
@@ -125,25 +125,16 @@
}
protected final H resultHandler;
-
/** These should be notified when a cancel request arrives, at most once. */
- private List<CancelRequestListener> cancelRequestListeners = null;
-
- private LocalizableMessage cancelRequestReason = null;
-
+ private List<CancelRequestListener> cancelRequestListeners;
+ private LocalizableMessage cancelRequestReason;
/** These should be notified when the result is set. */
- private List<ExtendedResultHandlerHolder<?>> cancelResultHandlers = null;
-
+ private List<ExtendedResultHandlerHolder<?>> cancelResultHandlers;
private final ServerConnectionImpl clientConnection;
-
private final boolean isCancelSupported;
-
private final int messageID;
-
private boolean sendResult = true;
-
private RequestState state = RequestState.PENDING;
-
/** Cancellation state guarded by lock. */
private final Object stateLock = new Object();
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
index ff8f26e..3784371 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
@@ -94,14 +94,14 @@
*/
public static final String PROTOCOL_TLS1_1 = "TLSv1.1";
- private TrustManager trustManager = null;
- private KeyManager keyManager = null;
+ private TrustManager trustManager;
+ private KeyManager keyManager;
private String protocol = PROTOCOL_TLS1;
- private SecureRandom random = null;
+ private SecureRandom random;
/** These are mutually exclusive. */
- private Provider provider = null;
- private String providerName = null;
+ private Provider provider;
+ private String providerName;
/**
* Creates a new SSL context builder using default parameters.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java
index 5f84083..92b73d8 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java
@@ -77,7 +77,7 @@
/**
* Used to signal thread shutdown.
*/
- private volatile boolean shutdownRequested = false;
+ private volatile boolean shutdownRequested;
/**
* Contains the minimum delay for listeners which were added while the
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
index 8e5b8ef..7e5f147 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
@@ -220,19 +220,19 @@
private final Map<String, String> additionalAuthParams = new LinkedHashMap<String, String>();
private String authenticationID;
- private String authorizationID = null;
+ private String authorizationID;
- private String cipher = null;
- private Integer maxReceiveBufferSize = null;
- private Integer maxSendBufferSize = null;
+ private String cipher;
+ private Integer maxReceiveBufferSize;
+ private Integer maxSendBufferSize;
private byte[] password;
private final List<String> qopValues = new LinkedList<String>();
- private String realm = null;
+ private String realm;
/**
* Do not use primitives for these so that we can distinguish between default
* settings (null) and values set by the caller.
*/
- private Boolean serverAuth = null;
+ private Boolean serverAuth;
DigestMD5SASLBindRequestImpl(final DigestMD5SASLBindRequest digestMD5SASLBindRequest) {
super(digestMD5SASLBindRequest);
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
index 1157e8e..b23acf4 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
@@ -96,7 +96,7 @@
}
}
- private String authorizationID = null;
+ private String authorizationID;
ExternalSASLBindRequestImpl() {
// Nothing to do.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
index bc48a25..2193fef 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
@@ -296,26 +296,24 @@
private final Map<String, String> additionalAuthParams = new LinkedHashMap<String, String>();
/** Ignored if subject is non-null. */
- private String authenticationID = null;
+ private String authenticationID;
/** Optional authorization ID. */
- private String authorizationID = null;
- private String kdcAddress = null;
+ private String authorizationID;
+ private String kdcAddress;
- private Integer maxReceiveBufferSize = null;
+ private Integer maxReceiveBufferSize;
+ private Integer maxSendBufferSize;
- private Integer maxSendBufferSize = null;
-
- private byte[] password = null;
+ private byte[] password;
private final List<String> qopValues = new LinkedList<String>();
-
- private String realm = null;
+ private String realm;
/**
* Don't use primitives for these so that we can distinguish between default
* settings (null) and values set by the caller.
*/
- private Boolean serverAuth = null;
+ private Boolean serverAuth;
/** If null then authenticationID and password must be present. */
- private Subject subject = null;
+ private Subject subject;
GSSAPISASLBindRequestImpl(final GSSAPISASLBindRequest gssapiSASLBindRequest) {
super(gssapiSASLBindRequest);
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
index b248156..1d77004 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
@@ -101,7 +101,7 @@
new GenericExtendedResultDecoder();
private String requestName;
- private ByteString requestValue = null;
+ private ByteString requestValue;
GenericExtendedRequestImpl(final GenericExtendedRequest genericExtendedRequest) {
super(genericExtendedRequest);
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
index 2923358..1cebae2 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
@@ -38,10 +38,10 @@
*/
final class ModifyDNRequestImpl extends AbstractRequestImpl<ModifyDNRequest> implements
ModifyDNRequest {
- private boolean deleteOldRDN = false;
+ private boolean deleteOldRDN;
private DN name;
private RDN newRDN;
- private DN newSuperior = null;
+ private DN newSuperior;
ModifyDNRequestImpl(final DN name, final RDN newRDN) {
this.name = name;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
index dfde77b..cf58c37 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
@@ -171,10 +171,10 @@
* component in a password modify extended request.
*/
private static final byte TYPE_PASSWORD_MODIFY_USER_ID = (byte) 0x80;
- private byte[] newPassword = null;
- private byte[] oldPassword = null;
+ private byte[] newPassword;
+ private byte[] oldPassword;
- private ByteString userIdentity = null;
+ private ByteString userIdentity;
/** Instantiation via factory. */
PasswordModifyExtendedRequestImpl() {
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
index 01765b4..986d48b 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
@@ -45,9 +45,9 @@
private Filter filter;
private DN name;
private SearchScope scope;
- private int sizeLimit = 0;
- private int timeLimit = 0;
- private boolean typesOnly = false;
+ private int sizeLimit;
+ private int timeLimit;
+ private boolean typesOnly;
SearchRequestImpl(final DN name, final SearchScope scope, final Filter filter) {
this.name = name;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
index a1054f5..98c3e44 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
@@ -43,7 +43,7 @@
abstract class AbstractResultImpl<S extends Result> extends AbstractResponseImpl<S> implements
Result {
/** For local errors caused by internal exceptions. */
- private Throwable cause = null;
+ private Throwable cause;
private String diagnosticMessage = "";
private String matchedDN = "";
private final List<String> referralURIs = new LinkedList<String>();
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
index 8140db9..477ddac 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
@@ -34,7 +34,7 @@
* Bind result implementation.
*/
final class BindResultImpl extends AbstractResultImpl<BindResult> implements BindResult {
- private ByteString credentials = null;
+ private ByteString credentials;
BindResultImpl(final BindResult bindResult) {
super(bindResult);
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
index 775cefd..b4acfcc 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
@@ -36,8 +36,8 @@
final class GenericExtendedResultImpl extends AbstractExtendedResult<GenericExtendedResult>
implements ExtendedResult, GenericExtendedResult {
- private String responseName = null;
- private ByteString responseValue = null;
+ private String responseName;
+ private ByteString responseValue;
GenericExtendedResultImpl(final GenericExtendedResult genericExtendedResult) {
super(genericExtendedResult);
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
index 4697c95..999d31d 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
@@ -36,8 +36,8 @@
AbstractIntermediateResponse<GenericIntermediateResponse> implements
GenericIntermediateResponse {
- private String responseName = null;
- private ByteString responseValue = null;
+ private String responseName;
+ private ByteString responseValue;
GenericIntermediateResponseImpl() {
// Nothing to do.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
index 56bfbec..6cacab7 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
@@ -41,7 +41,7 @@
WhoAmIExtendedResult {
/** The authorization ID. */
- private String authorizationID = null;
+ private String authorizationID;
/** Instantiation via factory. */
WhoAmIExtendedResultImpl(final ResultCode resultCode) {
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
index c72de09..a3422eb 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
@@ -124,7 +124,7 @@
private boolean needsValidating = true;
/** The indicates whether or not validation failed. */
- private boolean isValid = false;
+ private boolean isValid;
AttributeType(final String oid, final List<String> names, final String description,
final boolean obsolete, final String superiorType, final String equalityMatchingRule,
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
index 743bff3..d1dd619 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
@@ -67,7 +67,7 @@
private boolean needsValidating = true;
/** The indicates whether or not validation failed. */
- private boolean isValid = false;
+ private boolean isValid;
DITStructureRule(final Integer ruleID, final List<String> names, final String description,
final boolean obsolete, final String nameFormOID, final Set<Integer> superiorRuleIDs,
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index 994d5e1..d7b56a4 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -65,7 +65,7 @@
public static final class Builder extends SchemaElementBuilder<Builder> {
private String oid;
private final List<String> names = new LinkedList<String>();
- private boolean isObsolete = false;
+ private boolean isObsolete;
private String syntaxOID;
private MatchingRuleImpl impl;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index 011d50b..8081c53 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -55,7 +55,7 @@
* A fluent API for incrementally constructing name forms.
*/
public static final class Builder extends SchemaElementBuilder<Builder> {
- private boolean isObsolete = false;
+ private boolean isObsolete;
private final List<String> names = new LinkedList<String>();
private String oid;
private final Set<String> optionalAttributes = new LinkedHashSet<String>();
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
index 0e690f6..872e495 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
@@ -82,7 +82,7 @@
private boolean needsValidating = true;
/** The indicates whether or not validation failed. */
- private boolean isValid = false;
+ private boolean isValid;
ObjectClass(final String oid, final List<String> names, final String description,
final boolean obsolete, final Set<String> superiorClassOIDs,
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
index 734a2a2..a7ea1f3 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
@@ -163,7 +163,7 @@
private Action requireSingleStructuralObjectClass = Action.REJECT;
private Action checkAttributesAndObjectClasses = Action.REJECT;
private Action checkAttributeValues = Action.REJECT;
- private EntryResolver checkDITStructureRulesEntryResolver = null;
+ private EntryResolver checkDITStructureRulesEntryResolver;
/** Prevent direct instantiation. */
private SchemaValidationPolicy() {
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
index 8663c59..4b1baf1 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
@@ -256,7 +256,7 @@
* {@code true} if the connection has failed due to a disconnect
* notification.
*/
- private boolean failedDueToDisconnect = false;
+ private boolean failedDueToDisconnect;
/**
* Registered event listeners.
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
index 22bed06..399d557 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
@@ -179,7 +179,7 @@
Schema schema = Schema.getDefaultSchema().asNonStrictSchema();
SchemaValidationPolicy schemaValidationPolicy = SchemaValidationPolicy.ignoreAll();
private final LDIFReaderImpl impl;
- private long lineNumber = 0;
+ private long lineNumber;
AbstractLDIFReader(final InputStream in) {
this(new InputStreamReader(in));
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
index 44a063b..1a20da0 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
@@ -45,8 +45,8 @@
final Set<AttributeDescription> excludeAttributes = new HashSet<AttributeDescription>();
final Set<DN> excludeBranches = new HashSet<DN>();
final List<Matcher> excludeFilters = new LinkedList<Matcher>();
- boolean excludeOperationalAttributes = false;
- boolean excludeUserAttributes = false;
+ boolean excludeOperationalAttributes;
+ boolean excludeUserAttributes;
final Set<AttributeDescription> includeAttributes = new HashSet<AttributeDescription>();
final Set<DN> includeBranches = new HashSet<DN>();
final List<Matcher> includeFilters = new LinkedList<Matcher>();
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
index b4dca81..f827783 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
@@ -165,9 +165,9 @@
/** Regular expression used for splitting comments on line-breaks. */
private static final Pattern SPLIT_NEWLINE = Pattern.compile("\\r?\\n");
- boolean addUserFriendlyComments = false;
+ boolean addUserFriendlyComments;
final LDIFWriterImpl impl;
- int wrapColumn = 0;
+ int wrapColumn;
private final StringBuilder builder = new StringBuilder(80);
AbstractLDIFWriter(final List<String> ldifLines) {
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
index 1d31b45..fe589c9 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
@@ -115,7 +115,7 @@
*/
private static final class BufferHandler implements SearchResultHandler, ResultHandler<Result> {
private final BlockingQueue<Response> responses;
- private volatile boolean isInterrupted = false;
+ private volatile boolean isInterrupted;
private BufferHandler(final BlockingQueue<Response> responses) {
this.responses = responses;
@@ -176,7 +176,7 @@
private final BufferHandler buffer;
private final LdapPromise<Result> promise;
- private Response nextResponse = null;
+ private Response nextResponse;
/**
* Creates a new connection entry reader whose destination is the provided
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
index 898712e..6ea50ff 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
@@ -73,10 +73,10 @@
private final List<LocalizableMessage> warnings = new LinkedList<LocalizableMessage>();
/** Indicates if the generator is closed. */
- private boolean isClosed = false;
+ private boolean isClosed;
/** Indicates if the generator is initialized, which means template file has been parsed. */
- private boolean isInitialized = false;
+ private boolean isInitialized;
/** Random seed is used to generate random data. */
private int randomSeed = DEFAULT_RANDOM_SEED;
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
index a5ae02f..107602f 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
@@ -146,7 +146,7 @@
}
}
- private ChangeRecord nextChangeRecord = null;
+ private ChangeRecord nextChangeRecord;
/**
* Creates a new LDIF change record reader whose source is the provided
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
index a93db4f..1176b5b 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
@@ -107,7 +107,7 @@
}
}
- private Entry nextEntry = null;
+ private Entry nextEntry;
/**
* Creates a new LDIF entry reader whose source is the provided input
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
index d8c8bd8..932a858 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
@@ -349,7 +349,7 @@
* Indicates whether the values should be selected sequentially or at
* random.
*/
- private boolean isSequential = false;
+ private boolean isSequential;
/** The index used for sequential access. */
private int nextIndex;
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
index 5a5aeef..46053c4 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
@@ -493,10 +493,8 @@
/** The mapping between entry DNs and the corresponding entries. */
private final ConcurrentHashMap<DN, Entry> entryMap = new ConcurrentHashMap<DN, Entry>();
-
/** The LDAP listener. */
- private LDAPListener listener = null;
-
+ private LDAPListener listener;
/** Whether the server is running. */
private volatile boolean isRunning;
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
index 1d562e9..86c6bb4 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
@@ -42,9 +42,9 @@
private final CountDownLatch closedLatch = new CountDownLatch(1);
private final CountDownLatch errorLatch = new CountDownLatch(1);
private final CountDownLatch notificationLatch = new CountDownLatch(1);
- private Boolean isDisconnectNotification = null;
+ private Boolean isDisconnectNotification;
private LdapException error;
- private ExtendedResult notification = null;
+ private ExtendedResult notification;
private final AtomicInteger invocationCount = new AtomicInteger();
/** {@inheritDoc} */
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
index 18d47a0..7f7cbea 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
@@ -51,7 +51,7 @@
private final Callable<T> callable;
private final CountDownLatch isDone = new CountDownLatch(1);
private final boolean removeAfterCall;
- private T result = null;
+ private T result;
private ScheduledCallableFuture(final Callable<T> callable, final boolean removeAfterCall) {
this.callable = callable;
diff --git a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
index ed37b09..188a37c 100644
--- a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
+++ b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -133,9 +133,9 @@
private static final int MAX_STRING_BUFFER_SIZE = 1024;
private int state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
- private byte peekType = 0;
+ private byte peekType;
private int peekLength = -1;
- private int lengthBytesNeeded = 0;
+ private int lengthBytesNeeded;
private final int maxElementSize;
private final CompositeBuffer buffer;
private SequenceLimiter readLimiter;
diff --git a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
index 46061da..13c9b7f 100644
--- a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
+++ b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
@@ -247,7 +247,7 @@
private static final class ClientContextImpl implements LDAPClientContext {
private final Connection<?> connection;
private final AtomicBoolean isClosed = new AtomicBoolean();
- private ServerConnection<Integer> serverConnection = null;
+ private ServerConnection<Integer> serverConnection;
private ClientContextImpl(final Connection<?> connection) {
this.connection = connection;
diff --git a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java
index e32a833..6458f61 100644
--- a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java
+++ b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SimpleAuth.java
@@ -260,8 +260,8 @@
private static int port;
private static String bindDN;
private static String bindPassword;
- private static boolean useStartTLS = false;
- private static boolean useSSL = false;
+ private static boolean useStartTLS;
+ private static boolean useSSL;
private static String keystore;
private static String storepass;
diff --git a/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java
index ef3e239..0ed25c8 100644
--- a/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java
+++ b/opendj-sdk/opendj-rest2ldap-servlet/src/main/java/org/forgerock/opendj/rest2ldap/servlet/Rest2LDAPAuthnFilter.java
@@ -91,7 +91,7 @@
private AuthenticationMethod authenticationMethod = AuthenticationMethod.SEARCH_SIMPLE;
private ConnectionFactory bindLDAPConnectionFactory;
/** Indicates whether or not authentication should be performed. */
- private boolean isEnabled = false;
+ private boolean isEnabled;
private boolean reuseAuthenticatedConnection = true;
private String saslAuthzIdTemplate;
private final Schema schema = Schema.getDefaultSchema();
diff --git a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
index 917796f..43006d5 100644
--- a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
+++ b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
@@ -52,8 +52,8 @@
AttributeMapper {
List<Object> defaultJSONValues = emptyList();
final AttributeDescription ldapAttributeName;
- private boolean isRequired = false;
- private boolean isSingleValued = false;
+ private boolean isRequired;
+ private boolean isSingleValued;
private WritabilityPolicy writabilityPolicy = READ_WRITE;
AbstractLDAPAttributeMapper(final AttributeDescription ldapAttributeName) {
diff --git a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
index 36f9d0c..08981d0 100644
--- a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
+++ b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
@@ -188,7 +188,7 @@
private final Config config;
private final ServerContext context;
private Connection connection;
- private Control proxiedAuthzControl = null;
+ private Control proxiedAuthzControl;
Context(final Config config, final ServerContext context) {
this.config = config;
diff --git a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
index 4ee83ae..6f29d77 100644
--- a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
+++ b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
@@ -66,7 +66,7 @@
private static final int SEARCH_MAX_CANDIDATES = 1000;
private final DN baseDN;
- private Filter filter = null;
+ private Filter filter;
private final AttributeMapper mapper;
private final AttributeDescription primaryKey;
private SearchScope scope = SearchScope.WHOLE_SUBTREE;
diff --git a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
index 4bf0d60..502b68e 100644
--- a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
+++ b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java
@@ -47,8 +47,8 @@
*/
final class SetupLog {
- private static File logFile = null;
- private static FileHandler fileHandler = null;
+ private static File logFile;
+ private static FileHandler fileHandler;
static final String LOGNAME = "setup.log";
private SetupLog() {
diff --git a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
index fb86097..58416f5 100644
--- a/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
+++ b/opendj-sdk/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/Model.java
@@ -64,7 +64,7 @@
private RuntimeOptions importLdifRuntimeSettings;
private DataConfiguration dataConfiguration;
- private ReplicationConfiguration replicationConfiguration = null;
+ private ReplicationConfiguration replicationConfiguration;
/**
* Returns the listener settings.
--
Gitblit v1.10.0