From 88f16d892d54fd8c3e190cc1f6363638b11ae1a3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 10:26:23 +0000
Subject: [PATCH] AutoRefactor: remove fields default values
---
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 10
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java | 4
opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java | 10
opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java | 3
opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java | 4
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 22
opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 10
opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java | 3
opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java | 8
opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 16
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java | 20
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java | 7
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java | 5
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java | 8
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java | 8
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java | 10
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java | 4
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java | 8
opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java | 10
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java | 6
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java | 9
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java | 10
opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 12
opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java | 6
opendj-server-legacy/src/test/java/org/opends/server/TestListener.java | 28
opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java | 12
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java | 32
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java | 3
opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java | 8
opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java | 12
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java | 3
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java | 15
opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java | 6
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java | 5
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java | 3
opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java | 12
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java | 8
opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java | 12
opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java | 6
opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java | 10
opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 8
opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java | 13
opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java | 5
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java | 13
opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java | 10
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java | 4
opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java | 8
opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java | 22
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java | 3
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java | 12
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java | 8
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java | 4
opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java | 8
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java | 17
opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 8
opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java | 3
opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java | 3
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java | 4
opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 8
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java | 21
opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java | 2
opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java | 11
opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java | 6
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java | 6
opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java | 6
opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java | 3
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java | 36
opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 44 +-
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java | 6
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 2
200 files changed, 616 insertions(+), 639 deletions(-)
diff --git a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 3e8db08..40b67bc 100644
--- a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.dsml.protocol;
@@ -155,7 +155,7 @@
private Boolean trustAll;
private Boolean useHTTPAuthzID;
private HashSet<String> exopStrings = new HashSet<String>();
- private org.opends.server.types.Control proxyAuthzControl = null;
+ private org.opends.server.types.Control proxyAuthzControl;
/**
* This method will be called by the Servlet Container when
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index c5d116e..6c26886 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -232,7 +232,7 @@
/** Default global admin UID. */
public static final String GLOBAL_ADMIN_UID = "admin";
- private static HashMap<String, ServerProperty> nameToServerProperty = null;
+ private static HashMap<String, ServerProperty> nameToServerProperty;
/**
* Get a ServerProperty associated to a name.
@@ -379,8 +379,7 @@
}
}
- private static HashMap<String, AdministratorProperty>
- nameToAdminUserProperty = null;
+ private static HashMap<String, AdministratorProperty> nameToAdminUserProperty;
/**
* Get a AdministratorProperty associated to a name.
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
index 9072efc..c19f585 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
@@ -23,7 +23,7 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.admin.ads.util;
@@ -68,7 +68,7 @@
/**
* The default keyManager.
*/
- private X509KeyManager keyManager = null ;
+ private X509KeyManager keyManager;
/**
* The default constructor.
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
index bbeaffe..395f241 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -23,7 +23,7 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.admin.ads.util;
@@ -83,8 +83,8 @@
private X509TrustManager trustManager;
private String lastRefusedAuthType;
private X509Certificate[] lastRefusedChain;
- private Cause lastRefusedCause = null;
- private KeyStore keystore = null;
+ private Cause lastRefusedCause;
+ private KeyStore keystore;
/**
* The following ArrayList contain information about the certificates
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index 5a12431..3efe772 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.browser;
@@ -131,7 +131,7 @@
private String[] containerClasses;
private NumSubordinateHacker numSubordinateHacker;
private int queueTotalSize;
- private int maxChildren = 0;
+ private int maxChildren;
private final Collection<BrowserEventListener> listeners =
new ArrayList<BrowserEventListener>();
private final LDAPConnectionPool connectionPool;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
index 5b8ee06..5905d97 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -56,7 +56,7 @@
/**
* The sort column of the table.
*/
- protected int sortColumn = 0;
+ protected int sortColumn;
/**
* Whether the sorting is ascending or descending.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
index 5979c43..c91dc3b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -54,7 +54,7 @@
private ArrayList<String[]> dataArray =
new ArrayList<String[]>();
private String[] COLUMN_NAMES;
- private int sortColumn = 0;
+ private int sortColumn;
private boolean sortAscending = true;
private boolean displayReplicationInformation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
index 38e161a..6a5f289 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -48,7 +49,7 @@
private ArrayList<String[]> dataArray =
new ArrayList<String[]>();
private String[] COLUMN_NAMES;
- private int sortColumn = 0;
+ private int sortColumn;
private boolean sortAscending = true;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
index 352dd2e..335505c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
@@ -80,7 +80,7 @@
/**
* The sort column of the table.
*/
- private int sortColumn = 0;
+ private int sortColumn;
/**
* Whether the sorting is ascending or descending.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
index 717d664..d9e4935 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.event;
@@ -47,7 +48,7 @@
*/
public class ClickTooltipDisplayer extends MouseAdapter
{
- private boolean isTooltipVisible = false;
+ private boolean isTooltipVisible;
private Popup tipWindow;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 5de9116..5ad6bac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -72,13 +72,13 @@
{
private Set<String> backendSet;
private DN lastDn;
- private int nDeleted = 0;
+ private int nDeleted;
private int nToDelete = -1;
private BrowserController controller;
private TreePath[] paths;
private long lastProgressTime;
- private boolean equivalentCommandWithControlPrinted = false;
- private boolean equivalentCommandWithoutControlPrinted = false;
+ private boolean equivalentCommandWithControlPrinted;
+ private boolean equivalentCommandWithoutControlPrinted;
private boolean useAdminCtx;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 6822449..6c2660a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -80,7 +80,7 @@
private Entry newEntry;
private BrowserController controller;
private TreePath treePath;
- private boolean useAdminCtx = false;
+ private boolean useAdminCtx;
/**
* Constructor of the task.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 1916d3a..ff272b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -70,7 +70,7 @@
private BasicNode parentNode;
private BrowserController controller;
private DN dn;
- private boolean useAdminCtx = false;
+ private boolean useAdminCtx;
/**
* Constructor of the task.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
index 366402d..6801597 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -100,7 +100,7 @@
private ChangeListener changeListener;
- private boolean backupIDInitialized = false;
+ private boolean backupIDInitialized;
private ScheduleSummaryPanel schedulePanel;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index bafaf31..4732ff5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -150,7 +150,7 @@
private GenericDialog duplicateEntryDlg;
private DuplicateEntryPanel duplicateEntryPanel;
- private boolean ignoreTreeSelectionEvents = false;
+ private boolean ignoreTreeSelectionEvents;
private LDAPEntryReader entryReader;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index f5d5d7f..826cb1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -103,7 +103,7 @@
private JLabel lNoConnectionHandlers = Utilities.createPrimaryLabel(
INFO_CTRL_PANEL_NO_CONNECTION_HANDLER_FOUND.get());
- private boolean firstRealDataSet = false;
+ private boolean firstRealDataSet;
private JCheckBoxMenuItem showAveragesMenu;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index c75d1a9..e3326c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -157,7 +157,7 @@
private boolean readUseOpenDSJavaHome;
private boolean readUseOpenDSJavaArgs;
- private boolean initialized = false;
+ private boolean initialized;
private boolean previousLocal = true;
@@ -1152,7 +1152,7 @@
private final String[] COLUMN_NAMES = new String[] {
getHeader(INFO_CTRL_PANEL_COMMAND_LINE_NAME_COLUMN.get(), 40),
getHeader(INFO_CTRL_PANEL_JAVA_ARGUMENTS_COLUMN.get(), 40)};
- private int sortColumn = 0;
+ private int sortColumn;
private boolean sortAscending = true;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index 306ca9e..9675c4d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -220,8 +220,8 @@
private int lastCollapsedHeight = -1;
private int lastExpandedHeight = -1;
- private static boolean lastShowDetails = false;
- private static boolean lastCloseWhenOver = false;
+ private static boolean lastShowDetails;
+ private static boolean lastCloseWhenOver;
private boolean taskIsOver;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 2a42e2b..2a77a52 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -447,7 +447,7 @@
private final String[] COLUMN_NAMES = new String[] {
getHeader(LocalizableMessage.raw("Attribute"), 40),
getHeader(LocalizableMessage.raw("Value", 40))};
- private int sortColumn = 0;
+ private int sortColumn;
private boolean sortAscending = true;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
index 432850f..aff9f58 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.components;
@@ -77,7 +78,7 @@
private LinkedHashSet<ActionListener> listeners =
new LinkedHashSet<ActionListener>();
- private boolean constructorBorderSet = false;
+ private boolean constructorBorderSet;
/**
* Default constructor.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
index 97772de..a44e970 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.nodes;
@@ -65,7 +65,7 @@
private Icon icon;
private int fontStyle;
- private boolean sizeLimitReached = false;
+ private boolean sizeLimitReached;
private String[] objectClassValues;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
index b55bbeb..0856d1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.util;
@@ -115,7 +115,7 @@
/**
* Whether the configuration has already been read or not.
*/
- protected boolean configRead = false;
+ protected boolean configRead;
/**
* The set of connection listeners.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
index 1a879c7..96e0cf5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.util;
@@ -43,7 +43,7 @@
private static String[] packages = {
"org.opends"
};
- static private File logFile = null;
+ static private File logFile;
static private FileHandler fileHandler;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java
index 5369656..1de2207 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Configuration.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -41,10 +41,10 @@
*/
public class Configuration {
- private String contents = null;
- private String lowerCaseContents = null;
- private Installation install = null;
- private File file = null;
+ private String contents;
+ private String lowerCaseContents;
+ private Installation install;
+ private File file;
/**
* Create a Configuration from a file.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
index 2000651..ace98b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -95,12 +95,12 @@
/**
* The File object related to the license file.
*/
- static private File licFile = null;
+ static private File licFile;
/**
* The license file approval state.
*/
- static private boolean approved = false;
+ static private boolean approved;
/**
* Returns the license file name.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
index 08718a4..fcdfcbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.quicksetup;
@@ -41,8 +41,8 @@
*/
public class QuickSetupLog {
- static private File logFile = null;
- static private FileHandler fileHandler = null;
+ static private File logFile;
+ static private FileHandler fileHandler;
/**
* Creates a new file handler for writing log messages to the file indicated
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
index 4dbfea9..33839a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.quicksetup.installer.ui;
@@ -79,7 +79,7 @@
new TreeSet<ServerDescriptor>(this);
//The display of the server the user provided in the replication options
// panel
- private String serverToConnectDisplay = null;
+ private String serverToConnectDisplay;
/**
* Constructor of the panel.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index 63292eb..775130c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup.installer.ui;
@@ -76,7 +76,7 @@
new HashMap<String, JCheckBox>();
// The display of the server the user provided in the replication options
// panel
- private String serverToConnectDisplay = null;
+ private String serverToConnectDisplay;
private JLabel noSuffixLabel;
private Component labelGlue;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
index b696318..7a88632 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.quicksetup.ui;
@@ -142,6 +143,6 @@
}
}
- private static long lastActionWhen = 0;
+ private static long lastActionWhen;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
index 2c5f97a..24f8067 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup.ui;
@@ -54,7 +54,7 @@
*/
public class UIFactory
{
- private static boolean initialized = false;
+ private static boolean initialized;
private static String parentPackagePath;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
index 0c5e835..d970e94 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.quicksetup.util;
@@ -69,7 +69,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private Application application = null;
+ private Application application;
/**
* Creates a new file manager.
@@ -394,7 +394,7 @@
*/
private abstract class FileOperation {
- private File objectFile = null;
+ private File objectFile;
/**
* Creates a new file operation.
@@ -657,7 +657,7 @@
*/
private class MoveOperation extends FileOperation {
- File destination = null;
+ File destination;
/**
* Creates a delete operation.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
index 8604645..8d1ae84 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -36,21 +37,15 @@
*/
public class StandardOutputSuppressor {
- static private Token token = null;
+ static private Token token;
- /**
- * Object to return to this class for
- * unsupressing output.
- */
+ /** Object to return to this class for unsuppressing output. */
static private class Token {
PrintStream out;
PrintStream err;
}
- /**
- * Suppresses output to the standard output
- * streams.
- */
+ /** Suppresses output to the standard output streams. */
static synchronized public void suppress() {
if (token == null) {
token = new Token();
@@ -66,7 +61,7 @@
}
/**
- * Unsupresses the standard output streams. Following a call to this
+ * Unsuppresses the standard output streams. Following a call to this
* method System.out and System.err will point to the descriptor prior
* to calling <code>suppress()</code>.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
index fa7c91f..f6b1e22 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -48,9 +48,8 @@
*/
public class UIKeyStore extends KeyStore
{
- private static KeyStore keyStore = null;
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+ private static KeyStore keyStore;
/**
* This should never be called.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
index bc2a2c7..9cac1b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup.webstart;
@@ -62,22 +62,14 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private ApplicationException ex;
-
private boolean isFinished;
-
- private int downloadPercentage = 0;
-
- private int currentPercMin = 0;
-
- private int currentPercMax = 0;
-
- private int currentValidatingPercent = 0;
-
- private int currentUpgradingPercent = 0;
-
+ private int downloadPercentage;
+ private int currentPercMin;
+ private int currentPercMax;
+ private int currentValidatingPercent;
+ private int currentUpgradingPercent;
private Status status = Status.DOWNLOADING;
-
- private LocalizableMessage summary = null;
+ private LocalizableMessage summary;
/**
* This enumeration contains the different Status on which
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
index 1274964..52ae50e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -40,7 +41,7 @@
DefaultBehaviorProvider<T> {
// The absolute path to the managed object containing the property.
- private ManagedObjectPath<?, ?> path = null;
+ private ManagedObjectPath<?, ?> path;
// The string representation of the managed object path specifying
// the absolute location of the managed object.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 78af6f4..45ab47e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -123,11 +123,11 @@
// The string representation of the managed object path specifying
// the parent of the aggregated managed objects.
- private String parentPathString = null;
+ private String parentPathString;
// The name of a relation in the parent managed object which
// contains the aggregated managed objects.
- private String rdName = null;
+ private String rdName;
// The condition which is used to determine if a referenced
// managed object is enabled.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
index c5c69c0..b874292 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.admin;
@@ -178,7 +178,7 @@
// run-time. For example, when removing or replacing extension Jar
// files (the URLClassLoader only supports adding new
// URLs, not removal).
- private MyURLClassLoader loader = null;
+ private MyURLClassLoader loader;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
index 1a0742b..d288775 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -58,7 +58,7 @@
// Optional base DN which all valid values must be immediately
// subordinate to.
- private DN baseDN = null;
+ private DN baseDN;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
index 0da0a12..53b4cf6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -95,19 +95,19 @@
private DurationUnit baseUnit = DurationUnit.SECONDS;
// The optional maximum unit for this property definition.
- private DurationUnit maximumUnit = null;
+ private DurationUnit maximumUnit;
// The lower limit of the property value in milli-seconds.
- private long lowerLimit = 0L;
+ private long lowerLimit;
// The optional upper limit of the property value in
// milli-seconds.
- private Long upperLimit = null;
+ private Long upperLimit;
// Indicates whether this property allows the use of the
// "unlimited" duration value (represented using a -1L or the
// string "unlimited").
- private boolean allowUnlimited = false;
+ private boolean allowUnlimited;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
index eab2bb7..35523c7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -71,7 +71,7 @@
extends AbstractBuilder<C, S, InstantiableRelationDefinition<C, S>> {
// The optional naming property definition.
- private PropertyDefinition<?> namingPropertyDefinition = null;
+ private PropertyDefinition<?> namingPropertyDefinition;
// The plural name of the relation.
private final String pluralName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
index 3b89a9d..fb94adc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -70,14 +70,14 @@
AbstractBuilder<Integer, IntegerPropertyDefinition> {
// The lower limit of the property value.
- private int lowerLimit = 0;
+ private int lowerLimit;
// The optional upper limit of the property value.
- private Integer upperLimit = null;
+ private Integer upperLimit;
// Indicates whether this property allows the use of the "unlimited" value
// (represented using a -1 or the string "unlimited").
- private boolean allowUnlimited = false;
+ private boolean allowUnlimited;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
index 5ed838c..ab3a9dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -61,8 +62,7 @@
// The optional default managed object associated with this
// optional relation.
- private DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject = null;
+ private DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
index c1b525c..c7004c5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -61,8 +62,7 @@
// The optional default managed object associated with this
// singleton relation.
- private DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject = null;
+ private DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
index dc2cc2a..5907bca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -67,14 +67,14 @@
AbstractBuilder<Long, SizePropertyDefinition> {
// The lower limit of the property value in bytes.
- private long lowerLimit = 0L;
+ private long lowerLimit;
// The optional upper limit of the property value in bytes.
- private Long upperLimit = null;
+ private Long upperLimit;
// Indicates whether this property allows the use of the "unlimited" memory
// size value (represented using a -1L or the string "unlimited").
- private boolean allowUnlimited = false;
+ private boolean allowUnlimited;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
index 203dadd..d29bf53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -58,11 +58,11 @@
private boolean isCaseInsensitive = true;
// Optional pattern which values of this property must match.
- private Pattern pattern = null;
+ private Pattern pattern;
// Pattern usage which provides a user-friendly summary of the
// pattern if present.
- private String patternUsage = null;
+ private String patternUsage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index f618f06..a16b0e9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -77,106 +77,106 @@
/**
* The 'hostName' global argument.
*/
- public StringArgument hostNameArg = null;
+ public StringArgument hostNameArg;
/**
* The 'port' global argument.
*/
- public IntegerArgument portArg = null;
+ public IntegerArgument portArg;
/**
* The 'bindDN' global argument.
*/
- public StringArgument bindDnArg = null;
+ public StringArgument bindDnArg;
/**
* The 'adminUID' global argument.
*/
- public StringArgument adminUidArg = null;
+ public StringArgument adminUidArg;
/**
* The 'bindPasswordFile' global argument.
*/
- public FileBasedArgument bindPasswordFileArg = null;
+ public FileBasedArgument bindPasswordFileArg;
/**
* The 'bindPassword' global argument.
*/
- public StringArgument bindPasswordArg = null;
+ public StringArgument bindPasswordArg;
/**
* The 'trustAllArg' global argument.
*/
- public BooleanArgument trustAllArg = null;
+ public BooleanArgument trustAllArg;
/**
* The 'trustStore' global argument.
*/
- public StringArgument trustStorePathArg = null;
+ public StringArgument trustStorePathArg;
/**
* The 'trustStorePassword' global argument.
*/
- public StringArgument trustStorePasswordArg = null;
+ public StringArgument trustStorePasswordArg;
/**
* The 'trustStorePasswordFile' global argument.
*/
- public FileBasedArgument trustStorePasswordFileArg = null;
+ public FileBasedArgument trustStorePasswordFileArg;
/**
* The 'keyStore' global argument.
*/
- public StringArgument keyStorePathArg = null;
+ public StringArgument keyStorePathArg;
/**
* The 'keyStorePassword' global argument.
*/
- public StringArgument keyStorePasswordArg = null;
+ public StringArgument keyStorePasswordArg;
/**
* The 'keyStorePasswordFile' global argument.
*/
- public FileBasedArgument keyStorePasswordFileArg = null;
+ public FileBasedArgument keyStorePasswordFileArg;
/**
* The 'certNicknameArg' global argument.
*/
- public StringArgument certNicknameArg = null;
+ public StringArgument certNicknameArg;
/**
* The 'useSSLArg' global argument.
*/
- public BooleanArgument useSSLArg = null;
+ public BooleanArgument useSSLArg;
/**
* The 'useStartTLSArg' global argument.
*/
- public BooleanArgument useStartTLSArg = null;
+ public BooleanArgument useStartTLSArg;
/**
* Argument indicating a SASL option.
*/
- public StringArgument saslOptionArg = null;
+ public StringArgument saslOptionArg;
/**
* Argument to specify the connection timeout.
*/
- public IntegerArgument connectTimeoutArg = null;
+ public IntegerArgument connectTimeoutArg;
/**
* Private container for global arguments.
*/
- private LinkedHashSet<Argument> argList = null;
+ private LinkedHashSet<Argument> argList;
/** The trust manager. */
private ApplicationTrustManager trustManager;
- private boolean configurationInitialized = false;
+ private boolean configurationInitialized;
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** Defines if the CLI always use the SSL connection type. */
- private boolean alwaysSSL = false;
+ private boolean alwaysSSL;
/**
* Creates a new instance of secure arguments.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index a1ae88e..f352c5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -71,12 +71,12 @@
/**
* The 'showUsage' global argument.
*/
- protected BooleanArgument showUsageArg = null;
+ protected BooleanArgument showUsageArg;
/**
* The 'verbose' global argument.
*/
- protected BooleanArgument verboseArg = null;
+ protected BooleanArgument verboseArg;
/**
* The secure args list object.
@@ -86,7 +86,7 @@
/**
* Argument indicating a properties file argument.
*/
- protected StringArgument propertiesFileArg = null;
+ protected StringArgument propertiesFileArg;
/**
* The argument which should be used to indicate that we will not
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
index 4ec9b48..64068f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.spi;
@@ -89,19 +89,12 @@
RelationDefinitionVisitor<Void, Void> {
// Possible exceptions.
- private AuthorizationException ae = null;
-
- private ManagedObjectAlreadyExistsException moaee = null;
-
- private MissingMandatoryPropertiesException mmpe = null;
-
- private ConcurrentModificationException cme = null;
-
- private OperationRejectedException ore = null;
-
- private CommunicationException ce = null;
-
-
+ private AuthorizationException ae;
+ private ManagedObjectAlreadyExistsException moaee;
+ private MissingMandatoryPropertiesException mmpe;
+ private ConcurrentModificationException cme;
+ private OperationRejectedException ore;
+ private CommunicationException ce;
/**
* {@inheritDoc}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java
index 4a78d09..c5b76a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/Driver.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.spi;
@@ -91,7 +91,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;
@@ -100,10 +100,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;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
index 542b8e7..00bc377 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.condition;
@@ -115,7 +115,7 @@
}
// The strongly typed private implementation.
- private Impl<?> impl = null;
+ private Impl<?> impl;
// The property name.
private final String propertyName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 5603848..aa4e761 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.admin.doc;
@@ -1616,11 +1616,11 @@
private final int ind = 0;
private StringBuffer htmlBuff = new StringBuffer();
private static String generationDir;
- private static boolean ldapMapping = false;
+ private static boolean ldapMapping;
private static String OpenDJWiki;
private static String OpenDJHome;
private static String aciSyntaxPage;
private static String durationSyntaxPage;
- private boolean inList = false;
- private int listLevel = 0;
+ private boolean inList;
+ private int listLevel;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
index a789342..83e921e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -95,17 +95,17 @@
// 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
// the configuration back-end.
private final ConfigEntry 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;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
index 2e8b6bb..ad3ce9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ConnectionHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.api;
@@ -64,7 +64,7 @@
private ConnectionHandlerMonitor monitor;
/** Is this handler the admin connection handler. */
- private boolean isAdminConnectionHandler = false;
+ private boolean isAdminConnectionHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
index fa6e606..e481d89 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
@@ -104,7 +104,7 @@
protected AtomicLong cacheMisses = new AtomicLong(0);
// The monitor associated with this entry cache.
- private EntryCacheMonitorProvider entryCacheMonitor = null;
+ private EntryCacheMonitorProvider entryCacheMonitor;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
index 0d5607c..01b7ee9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS
+ * Portions Copyright 2010-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -52,7 +52,7 @@
/**
* The ACI targets.
*/
- private AciTargets targets=null;
+ private AciTargets targets;
/**
* Version that we support.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
index b33590c..f434f4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.authorization.dseecompat;
@@ -70,17 +70,17 @@
/**
* Index into the ACI string where the ACI body starts.
*/
- private int startPos=0;
+ private int startPos;
/**
* The name of the ACI, currently not used but parsed.
*/
- private String name = null;
+ private String name;
/**
* The version of the ACi, current not used but parsed and checked for 3.0.
*/
- private String version = null;
+ private String version;
/**
* This structure represents a permission-bind rule pairs. There can be
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
index b9492d9..f7e70f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -74,13 +74,13 @@
* True if this is the first attribute type in the resource entry being
* evaluated.
*/
- private boolean isFirst = false;
+ private boolean isFirst;
/**
* True if an entry test rule was seen during target matching of an ACI
* entry. A entry test rule is an ACI with targetattrs target keyword.
*/
- private boolean isEntryTestRule = false;
+ private boolean isEntryTestRule;
/**
* The right mask to use in the evaluation of the LDAP operation.
@@ -105,7 +105,7 @@
/**
* True if a targattrfilters match was found.
*/
- private boolean targAttrFiltersMatch=false;
+ private boolean targAttrFiltersMatch;
/**
* The authorization entry currently being evaluated. If proxied
@@ -127,12 +127,12 @@
* This entry is only used if proxied authorization is being used. It is
* the original authorization entry before the proxied authorization change.
*/
- private Entry origAuthorizationEntry=null;
+ private Entry origAuthorizationEntry;
/**
* True if proxied authorization is being used.
*/
- private boolean proxiedAuthorization=false;
+ private boolean proxiedAuthorization;
/**
* Used by proxied authorization processing. True if the entry has already
@@ -140,34 +140,34 @@
* several access checks on the same entry (modify DN), this
* flag is used to bypass the proxy check after the initial evaluation.
*/
- private boolean seenEntry=false;
+ private boolean seenEntry;
/**
* True if geteffectiverights evaluation is in progress.
*/
- private boolean isGetEffectiveRightsEval=false;
+ private boolean isGetEffectiveRightsEval;
/**
* True if the operation has a geteffectiverights control.
*/
- private boolean hasGetEffectiveRightsControl=false;
+ private boolean hasGetEffectiveRightsControl;
/**
* The geteffectiverights authzID in DN format.
*/
- private DN authzid=null;
+ private DN authzid;
/**
* True if the authZid should be used as the client DN, only used in
* geteffectiverights evaluation.
*/
- private boolean useAuthzid=false;
+ private boolean useAuthzid;
/**
* The list of specific attributes to get rights for, in addition to
* any attributes requested in the search.
*/
- private List<AttributeType> specificAttrs=null;
+ private List<AttributeType> specificAttrs;
/**
* Table of ACIs that have targattrfilter keywords that matched. Used
@@ -180,38 +180,38 @@
* targattrfilter keyword. Used in geteffectiverights attributeLevel
* write evaluation.
*/
- private String targAttrFiltersAciName=null;
+ private String targAttrFiltersAciName;
/**
* Value that is used to store the allow/deny result of a deciding ACI
* containing a targattrfilter keyword. Used in geteffectiverights
* attributeLevel write evaluation.
*/
- private int targAttrMatch=0;
+ private int targAttrMatch;
/**
* The ACI that decided the last evaluation. Used in geteffectiverights
* loginfo processing.
*/
- private Aci decidingAci=null;
+ private Aci decidingAci;
/**
* The reason the last evaluation decision was made. Used both
* in geteffectiverights loginfo processing and attributeLevel write
* evaluation.
*/
- private EnumEvalReason evalReason=null;
+ private EnumEvalReason evalReason;
/**
* A summary string holding the last evaluation information in textual
* format. Used in geteffectiverights loginfo processing.
*/
- private String summaryString=null;
+ private String summaryString;
/**
* Flag used to determine if ACI all attributes target matched.
*/
- private int evalAllAttributes=0;
+ private int evalAllAttributes;
/**
* String used to hold a control OID string.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index b5215f6..2ae28ee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -124,16 +124,16 @@
* Attribute type used in access evaluation to see if the geteffectiverights
* related to the "aclRights" attribute can be performed.
*/
- private static AttributeType aclRights = null;
+ private static AttributeType aclRights;
/**
* Attribute type used in access evaluation to see if the geteffectiverights
* related to the "aclRightsInfo" attribute can be performed.
*/
- private static AttributeType aclRightsInfo = null;
+ private static AttributeType aclRightsInfo;
/** Attribute type used in the geteffectiverights selfwrite evaluation. */
- private static AttributeType dnAttributeType=null;
+ private static AttributeType dnAttributeType;
/**The distinguishedName string. */
private static final String dnAttrStr = "distinguishedname";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 60431fd..54df734 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -322,7 +322,7 @@
/*
* True if the server is in lockdown mode.
*/
- private boolean inLockDownMode = false;
+ private boolean inLockDownMode;
/*
* The AciList caches the ACIs.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index 333cd98..f20f855 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -50,7 +50,7 @@
/**
* ACI syntax has a target keyword.
*/
- private Target target = null ;
+ private Target target;
/**
* ACI syntax has a targetscope keyword.
@@ -60,27 +60,27 @@
/**
* ACI syntax has a targetattr keyword.
*/
- private TargetAttr targetAttr = null ;
+ private TargetAttr targetAttr;
/**
* ACI syntax has a targetfilter keyword.
*/
- private TargetFilter targetFilter=null;
+ private TargetFilter targetFilter;
/**
* ACI syntax has a targattrtfilters keyword.
*/
- private TargAttrFilters targAttrFilters=null;
+ private TargAttrFilters targAttrFilters;
/**
* The ACI syntax has a targetcontrol keyword.
*/
- private TargetControl targetControl=null;
+ private TargetControl targetControl;
/**
* The ACI syntax has a extop keyword.
*/
- private ExtOp extOp=null;
+ private ExtOp extOp;
/**
* The number of regular expression group positions in a valid ACI target
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java
index 1f29427..f5c3b23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AuthMethod.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
import static org.opends.messages.AccessControlMessages.*;
@@ -41,17 +41,17 @@
/**
* Enumeration representing the authentication method.
*/
- private EnumAuthMethod authMethod=null;
+ private EnumAuthMethod authMethod;
/**
* The SASL mechanism if the authentication method is SASL.
*/
- private String saslMech = null;
+ private String saslMech;
/**
* Enumeration representing the bind rule operation type.
*/
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/**
* Create a class representing an authmethod bind rule keyword from the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
index 64e1ec8..8d65fe8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
@@ -46,10 +46,10 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** List of patterns to match against. */
- private List<String> patterns = null;
+ private List<String> patterns;
/** The enumeration representing the bind rule type of the DNS rule. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/** Regular expression group used to match a dns rule. */
private static final String valueRegex = "([a-zA-Z0-9\\.\\-\\*]+)";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
index b404236..6d6b143 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -41,10 +41,10 @@
public class DayOfWeek implements KeywordBindRule {
/** List containing the enumeration of the day of the week. */
- private List<EnumDayOfWeek> days = null;
+ private List<EnumDayOfWeek> days;
/** Enumeration representing the bind rule operation type. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/**
* Create a class representing a dayofweek bind rule keyword.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
index 53db291..6a5d3cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -47,10 +47,10 @@
public class GroupDN implements KeywordBindRule {
/** List of group DNs. */
- private List<DN> groupDNs = null;
+ private List<DN> groupDNs;
/** Enumeration representing the groupdn operator type. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/**
* Regular expression matching one or more LDAP URLs separated by
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
index 4832763..3a63b70 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
import org.forgerock.i18n.LocalizableMessage;
@@ -52,10 +52,10 @@
* List of the pattern classes, one for each address decoded from the bind
* rule.
*/
- private List<PatternIP> patternIPList=null;
+ private List<PatternIP> patternIPList;
/** The type of the bind rule (!= or =). */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/**
* Create a class representing the IP bind rule expressions for this ACI.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
index b49a0f2..d66f863 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -79,7 +79,7 @@
* are under this suffix. Originally a way to search all nested groups
* under this suffix, so the behavior is slightly different.
*/
- private DN baseDN=null;
+ private DN baseDN;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
index ab11541..9d47a93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -74,16 +74,16 @@
* this is the sequence of RDN patterns in the DN pattern. Otherwise it
* is null.
*/
- PatternRDN[] equality = null;
+ PatternRDN[] equality;
/**
* If the pattern included any Multiple-Whole-RDN wildcards, then these
* are the RDN pattern sequences that appear between those wildcards.
*/
- PatternRDN[] subInitial = null;
- List<PatternRDN[]> subAnyElements = null;
- PatternRDN[] subFinal = null;
+ PatternRDN[] subInitial;
+ List<PatternRDN[]> subAnyElements;
+ PatternRDN[] subFinal;
/**
@@ -93,7 +93,7 @@
* suffix pattern but the pattern started with a Multiple-Whole-RDN wildcard
* (one or more RDN components allowed before matching elements).
*/
- boolean isSuffix = false;
+ boolean isSuffix;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
index 1e81a43..731cdfd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -57,7 +57,7 @@
* Indicate whether the RDN contains a wildcard in any of its attribute
* types.
*/
- private boolean hasTypeWildcard = false;
+ private boolean hasTypeWildcard;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java
index facb9d9..2cb7e1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PermBindRulePair.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -36,7 +36,7 @@
private BindRule bindRule;
/** The permission part. */
- private Permission perm=null;
+ private Permission perm;
/**
* This constructor calls the permission and bind rule decodes
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
index a23b4e5..cd4345b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
@@ -44,7 +44,7 @@
/**
* The access type (allow,deny) corresponding to the ACI permission value.
*/
- private EnumAccessType accessType = null;
+ private EnumAccessType accessType;
/**
* The rights (search, add, delete, ...) corresponding to the ACI rights
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
index 0f94d4c..ed65f35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -36,7 +36,7 @@
public class SSF implements KeywordBindRule {
/** Enumeration representing the bind rule operation type. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
private static final int MAX_KEY_BITS=1024;
private int ssf;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
index fafc78c..4b0283e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
@@ -50,7 +50,7 @@
/**
* The mask corresponding to the operation of this list (add or del).
*/
- private int mask=0;
+ private int mask;
/**
* ListHashMap keyed by the attribute type and mapping to the corresponding
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java
index 19a953c..07c065f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilters.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -47,8 +47,8 @@
* A valid targattrfilters rule may have two TargFilterlist parts -- the
* first one is required.
*/
- private TargAttrFilterList firstFilterList = null;
- private TargAttrFilterList secondFilterList = null;
+ private TargAttrFilterList firstFilterList;
+ private TargAttrFilterList secondFilterList;
/**
* Regular expression group position for the first operation value.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
index 30dd080..d00b9a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -47,12 +47,12 @@
/*
* Flags that is set if all user attributes pattern seen "*".
*/
- private boolean allUserAttributes = false ;
+ private boolean allUserAttributes;
/*
* Flags that is set if all operational attributes pattern seen "+".
*/
- private boolean allOpAttributes = false ;
+ private boolean allOpAttributes;
/*
* HashSet of the attribute types parsed by the constructor.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java
index 60f9e98..33adff6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
import org.forgerock.i18n.LocalizableMessage;
@@ -42,7 +42,7 @@
private static final String timeofdayRegex = "[0-2]\\d[0-5]\\d";
/** Enumeration representing the bind rule operation type. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/** Holds the time value parsed from the ACI. */
private int timeRef;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
index a3d78b1..7bc68fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -52,10 +52,10 @@
* This list holds a list of objects representing a EnumUserDNType
* URL mapping.
*/
- private List<UserDNTypeURL> urlList=null;
+ private List<UserDNTypeURL> urlList;
/** Enumeration of the userdn operation type. */
- private EnumBindRuleType type=null;
+ private EnumBindRuleType type;
/**
* Constructor that creates the userdn class. It also sets up an attribute
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
index dd10249..f8b804a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
import com.sleepycat.je.Cursor;
@@ -64,12 +64,12 @@
/**
* The current number of entries exported.
*/
- private long exportedCount = 0;
+ private long exportedCount;
/**
* The current number of entries skipped.
*/
- private long skippedCount = 0;
+ private long skippedCount;
/**
* Create a new export job.
@@ -270,7 +270,7 @@
* The number of entries that had been exported at the time of the
* previous progress report.
*/
- private long previousCount = 0;
+ private long previousCount;
/**
* The time in milliseconds of the previous progress report.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java
index 93a2ba6..95efe19 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexInputBuffer.java
@@ -53,7 +53,7 @@
private long offset;
private final ByteBuffer cache;
- private Integer indexID = null;
+ private Integer indexID;
private ByteBuffer keyBuf = ByteBuffer.allocate(128);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
index 1d8b46d..06e2cfd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseEnvironmentMonitor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.backends.pluggable;
@@ -89,7 +89,7 @@
private RootContainer rootContainer;
private int maxEntries = 1024;
- private boolean filterUseEnabled = false;
+ private boolean filterUseEnabled;
private String startTimeStamp;
private final HashMap<SearchFilter, FilterStats> filterToStats =
new HashMap<SearchFilter, FilterStats>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
index 8a60cc4..582a615 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.backends.pluggable;
@@ -67,12 +67,12 @@
/**
* The current number of entries exported.
*/
- private long exportedCount = 0;
+ private long exportedCount;
/**
* The current number of entries skipped.
*/
- private long skippedCount = 0;
+ private long skippedCount;
/**
* Create a new export job.
@@ -273,7 +273,7 @@
* The number of entries that had been exported at the time of the
* previous progress report.
*/
- private long previousCount = 0;
+ private long previousCount;
/**
* The time in milliseconds of the previous progress report.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index 89b15d1..bbfafaa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -154,16 +154,16 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
//The DN representing the authzId. May be null.
- private DN authzDN=null;
+ private DN authzDN;
//The raw DN representing the authzId. May be null.
- private String rawAuthzDN=null;
+ private String rawAuthzDN;
//The list of additional attribute types to return rights for. May be null.
- private List<AttributeType> attrs=null;
+ private List<AttributeType> attrs;
//The raw DN representing the authzId. May be null.
- private List<String> rawAttrs=null;
+ private List<String> rawAttrs;
/**
* Create a new geteffectiverights control with the specified authzDN and
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
index 07ce0db..7f223bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -97,7 +97,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
// The visibility from the control value.
- private boolean visibility = false;
+ private boolean visibility;
/**
* Creates a new instance of the Subentries Control with the provided
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
index 563fc09..a07059a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
@@ -69,7 +69,7 @@
"org.opends.server.core.AccessControlConfigManager";
// The single application-wide instance.
- private static AccessControlConfigManager instance = null;
+ private static AccessControlConfigManager instance;
// The active access control implementation.
private AtomicReference<AccessControlHandler> accessControlHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index f8b0bcf..83c6fb6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -247,7 +247,7 @@
* Indicates whether the server currently holds an exclusive lock on the
* server lock file.
*/
- private static boolean serverLocked = false;
+ private static boolean serverLocked;
/**
* The message to be displayed on the command-line when the user asks for the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
index e61a1c7..579202d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java
@@ -92,7 +92,7 @@
* Used by group instances to determine if new groups have been registered or
* groups deleted.
*/
- private volatile long refreshToken = 0;
+ private volatile long refreshToken;
/**
* A mapping between the DNs of the config entries and the associated group
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index 540a9f6..fd8dc34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -127,10 +127,10 @@
private int secondsUntilUnlock = Integer.MIN_VALUE;
// The set of authentication failure times for this user.
- private List<Long> authFailureTimes = null;
+ private List<Long> authFailureTimes;
// The set of grace login times for this user.
- private List<Long> graceLoginTimes = null;
+ private List<Long> graceLoginTimes;
// The time that the user's account should expire (or did expire).
private long accountExpirationTime = Long.MIN_VALUE;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index 9fe47f9..f3cc672 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -152,7 +152,7 @@
private static DN serversDN;
/** Indicates whether the schema references have been initialized. */
- private static boolean schemaInitDone = false;
+ private static boolean schemaInitDone;
/**
* The secure random number generator used for key generation, initialization
@@ -1536,7 +1536,7 @@
private final KeyEntryID fKeyID;
private final SecretKey fSecretKey;
private final int fKeyLengthBits;
- private boolean fIsCompromised = false;
+ private boolean fIsCompromised;
}
private static void putSingleValueAttribute(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
index 9ca351a..39788a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -63,7 +63,7 @@
private final int interval;
private final TimeUnit unit;
private final String instanceName;
- private int lastState = 0;
+ private int lastState;
/**
* Constructs a new DiskSpaceMonitor that will notify the specified
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 84d16ed..66079cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -276,7 +276,7 @@
// isAvailable acts as memory barrier for lastException.
private volatile boolean isAvailable = true;
- private DirectoryException lastException = null;
+ private DirectoryException lastException;
@@ -593,7 +593,7 @@
private final class PooledConnection implements Connection
{
private Connection connection;
- private boolean connectionIsClosed = false;
+ private boolean connectionIsClosed;
@@ -744,7 +744,7 @@
// Guarded by PolicyImpl.lock.
- private boolean poolIsClosed = false;
+ private boolean poolIsClosed;
private final ConnectionFactory factory;
private final int poolSize = Runtime.getRuntime().availableProcessors() * 2;
@@ -893,7 +893,7 @@
private final LDAPWriter writer;
private final LDAPReader reader;
private int nextMessageID = 1;
- private boolean isClosed = false;
+ private boolean isClosed;
@@ -1548,7 +1548,7 @@
private final AttributeType cachedPasswordAttribute;
private final AttributeType cachedPasswordTimeAttribute;
- private ByteString newCachedPassword = null;
+ private ByteString newCachedPassword;
@@ -1944,10 +1944,10 @@
// Current configuration.
private LDAPPassThroughAuthenticationPolicyCfg cfg;
- private ConnectionFactory searchFactory = null;
- private ConnectionFactory bindFactory = null;
+ private ConnectionFactory searchFactory;
+ private ConnectionFactory bindFactory;
- private PasswordStorageScheme<?> pwdStorageScheme = null;
+ private PasswordStorageScheme<?> pwdStorageScheme;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
index a6b5ad3..ebd93f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -58,7 +58,7 @@
private final ByteChannel child;
- private volatile ByteChannel redirect = null;
+ private volatile ByteChannel redirect;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
index 1dc7186..1888af0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
@@ -97,7 +97,7 @@
// The SASL server to use in the authentication.
- private SaslServer saslServer = null;
+ private SaslServer saslServer;
// The identity mapper to use when mapping identities.
private final IdentityMapper<?> identityMapper;
@@ -112,10 +112,10 @@
private final String mechanism;
// The authorization entry used in the authentication.
- private Entry authEntry = null;
+ private Entry authEntry;
// The authorization entry used in the authentication.
- private Entry authzEntry = null;
+ private Entry authzEntry;
// The user name used in the authentication taken from the name callback.
private String userName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
index 3ffa219..3f09a9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -450,7 +450,7 @@
private final ByteChannel channel;
private final SSLEngine sslEngine;
- private volatile SSLException sslException = null;
+ private volatile SSLException sslException;
private ByteBuffer recvWrappedBuffer;
private ByteBuffer recvUnwrappedBuffer;
private ByteBuffer sendWrappedBuffer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 0993714..391a84f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -1127,8 +1127,8 @@
* The tracer object for the debug logger.
*/
protected static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private AccessLogPublisherCfg cfg = null;
- private Filter filter = null;
+ private AccessLogPublisherCfg cfg;
+ private Filter filter;
private final ChangeListener changeListener = new ChangeListener();
private final FilterListener filterListener = new FilterListener();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
index 78311a6..6f1c760 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -63,7 +63,7 @@
* Trace methods will use this static boolean to determine if debug is enabled
* so to not incur the cost of calling debugPublishers.isEmpty().
*/
- static boolean enabled = false;
+ static boolean enabled;
private static final LoggerStorage
<DebugLogPublisher<DebugLogPublisherCfg>, DebugLogPublisherCfg>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java
index bf70182..3ecd3d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -37,9 +37,9 @@
private File originalFile;
private String newFile;
- private boolean deleteOriginal = false;
+ private boolean deleteOriginal;
private String encryptAlgorithm = "RSA";
- private String alias = null;
+ private String alias;
/**
* Create the action based on the original file, the new file after
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
index e3b1816..659b422 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -49,7 +49,7 @@
ConfigurationChangeListener<FileCountLogRetentionPolicyCfg>
{
- private int numFiles = 0;
+ private int numFiles;
private FileCountLogRetentionPolicyCfg config;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index e638b7d..3cf338a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -52,7 +52,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private long freeDiskSpace = 0;
+ private long freeDiskSpace;
private FreeDiskSpaceLogRetentionPolicyCfg config;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java
index 315d8e3..85db474 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogPublisherErrorHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,7 +44,7 @@
class LogPublisherErrorHandler
{
private DN publisherConfigDN;
- private boolean writeErroroccurred = false;
+ private boolean writeErroroccurred;
/**
* Construct a new log publisher error handler for a log publisher
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
index 6c8ca81..91bcb09 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
@@ -88,19 +88,19 @@
private boolean append;
private long interval;
private boolean stopRequested;
- private long sizeLimit = 0;
+ private long sizeLimit;
private Thread rotaterThread;
private Calendar lastRotationTime = TimeThread.getCalendar();
private Calendar lastCleanTime = TimeThread.getCalendar();
- private long lastCleanCount = 0;
- private long totalFilesRotated = 0;
- private long totalFilesCleaned = 0;
+ private long lastCleanCount;
+ private long totalFilesRotated;
+ private long totalFilesCleaned;
/** The underlying output stream. */
private MeteredStream outputStream;
- /** The underlaying buffered writer using the output steram. */
+ /** The underlying buffered writer using the output stream. */
private BufferedWriter writer;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java
index e3a01df..42a6bf2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SignatureAction.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -51,7 +51,7 @@
private File originalFile;
private String signatureAlgorithm = "SHA1withRSA";
private String digestAlgorithm = "SHA";
- private String alias = null;
+ private String alias;
/**
* Create the signature action based on the log file name,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index 852c6d0..f38788f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -51,7 +51,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final File[] EMPTY_FILE_LIST = new File[0];
- private long size = 0;
+ private long size;
private FileComparator comparator;
private SizeLimitLogRetentionPolicyCfg config;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
index ea75d10..c16539c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -96,10 +96,10 @@
- private TextWriter writer = null;
- private FileBasedAccessLogPublisherCfg cfg = null;
- private boolean isCombinedMode = false;
- private boolean includeControlOIDs = false;
+ private TextWriter writer;
+ private FileBasedAccessLogPublisherCfg cfg;
+ private boolean isCombinedMode;
+ private boolean includeControlOIDs;
private String timeStampFormat = "dd/MMM/yyyy:HH:mm:ss Z";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index cc52227..0fa9636 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -108,8 +108,8 @@
- private TextWriter writer = null;
- private FileBasedHTTPAccessLogPublisherCfg cfg = null;
+ private TextWriter writer;
+ private FileBasedHTTPAccessLogPublisherCfg cfg;
private List<String> logFormatFields;
private String timeStampFormat = "dd/MMM/yyyy:HH:mm:ss Z";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
index 5ceb78b..3b3abc6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -41,7 +41,7 @@
RotationPolicy<TimeLimitLogRotationPolicyCfg>,
ConfigurationChangeListener<TimeLimitLogRotationPolicyCfg>
{
- private long timeInterval = 0;
+ private long timeInterval;
/**
* {@inheritDoc}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index a7fa8ac..b7d3c4c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.monitors;
@@ -106,7 +106,7 @@
private RootContainer rootContainer;
private int maxEntries = 1024;
- private boolean filterUseEnabled = false;
+ private boolean filterUseEnabled;
private String startTimeStamp;
private final HashMap<SearchFilter, FilterStats> filterToStats =
new HashMap<SearchFilter, FilterStats>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index ff8943c..f7b5f97 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -118,7 +118,7 @@
private long interval;
//The flag used by the background thread to check if it should exit.
- private boolean stopRequested=false;
+ private boolean stopRequested;
//The thread name.
private static final String name =
@@ -133,7 +133,7 @@
private File logFile;
//The Thread class that the background thread corresponds to.
- private Thread backGroundThread=null;
+ private Thread backGroundThread;
/**
* Used to save a map in the modifyDN operation attachment map that holds
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
index 588aa61..0ef6051 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -102,7 +102,7 @@
// Help to not warn permanently and fullfill the log file
// in debug mode.
- private boolean alreadyWarn = false;
+ private boolean alreadyWarn;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
index 16dceb3..52308e6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.http;
@@ -190,7 +190,7 @@
/** The statistics tracker associated with this client connection. */
private final HTTPStatistics statTracker;
- private boolean useNanoTime = false;
+ private boolean useNanoTime;
/** Total execution time for this request. */
private final AtomicLong totalProcessingTime = new AtomicLong();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
index d1123b0..c03b1a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
@@ -91,12 +91,12 @@
/**
* the ssl socket factory (do not serialize).
*/
- private transient SSLSocketFactory sslSocketFactory = null;
+ private transient SSLSocketFactory sslSocketFactory;
/**
* the host to connect to (do not serialize).
*/
- private transient String serverHostname = null;
+ private transient String serverHostname;
/**
* Constructs a new <code>DirectoryRMIClientSocketFactory</code>.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index 843b0c4..4f3a21e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -54,7 +54,7 @@
/**
* The SSL socket factory associated with the connector.
*/
- private SSLSocketFactory sslSocketFactory = null;
+ private SSLSocketFactory sslSocketFactory;
/**
* Indicate if we required the client authentication via SSL.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
index d3c6bc1..a19a609 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
@@ -52,22 +53,22 @@
/**
* the wrapped JMX RMI connector.
*/
- private JMXConnector jmxc = null;
+ private JMXConnector jmxc;
/**
* the connection environment set at creation.
*/
- private Map<String,Object> environment = null;
+ private Map<String,Object> environment;
/**
* the JMX Service URL.
*/
- private JMXServiceURL serviceURL = null;
+ private JMXServiceURL serviceURL;
/**
* the host to connect to.
*/
- private String serverHostname = null;
+ private String serverHostname;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
index 7a5a6d5..fbe9d97 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
import org.forgerock.i18n.LocalizableMessage;
@@ -56,21 +56,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /**
- * The client authentication mode. <code>true</code> indicates that the
- * client will be authenticated by its certificate (SSL protocol).
- * <code>true</code> indicate , that we have to perform an lDAP
- * authentication
- */
- private boolean needClientCertificate = false;
-
/**
* Indicate if the we are in the finalized phase.
*
* @see JmxConnectionHandler
*/
- private boolean finalizedPhase = false;
+ private boolean finalizedPhase;
/**
* The JMX Client connection to be used to perform the bind (auth)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
index cb435ac..b14d48a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.protocols.jmx;
@@ -74,7 +74,7 @@
/**
* The MBean server used to handle JMX interaction.
*/
- private MBeanServer mbs = null;
+ private MBeanServer mbs;
/**
@@ -114,7 +114,7 @@
/**
* The reference to the created RMI registry.
*/
- private Registry registry = null;
+ private Registry registry;
/**
* The Underlying Socket factory.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 7bed6ab..cd5b001 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -408,7 +408,7 @@
/** The statistics tracker associated with this client connection. */
private final LDAPStatistics statTracker;
- private boolean useNanoTime=false;
+ private boolean useNanoTime;
/** The connection ID assigned to this connection. */
@@ -447,10 +447,10 @@
private final int bufferSize;
private final RedirectingByteChannel saslChannel;
private final RedirectingByteChannel tlsChannel;
- private volatile ConnectionSecurityProvider saslActiveProvider = null;
- private volatile ConnectionSecurityProvider tlsActiveProvider = null;
- private volatile ConnectionSecurityProvider saslPendingProvider = null;
- private volatile ConnectionSecurityProvider tlsPendingProvider = null;
+ private volatile ConnectionSecurityProvider saslActiveProvider;
+ private volatile ConnectionSecurityProvider tlsActiveProvider;
+ private volatile ConnectionSecurityProvider saslPendingProvider;
+ private volatile ConnectionSecurityProvider tlsPendingProvider;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index b94be4b..3f6aedb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -66,7 +66,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
// Indicates whether the Directory Server is in the process of shutting down.
- private volatile boolean shutdownRequested = false;
+ private volatile boolean shutdownRequested;
// The current set of selection keys.
private volatile SelectionKey[] keys = new SelectionKey[0];
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
index 4aa4a43..ca50e78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -39,7 +40,7 @@
public class GenerationIdChecksum implements Checksum
{
// Checksum to be returned.
- private long checksum = 0L;
+ private long checksum;
/**
* This is the generation id for an empty backend.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
index 109c306..090b3fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalAttributeValue.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -81,7 +81,7 @@
* This flag indicates that this value was generated to store the last date
* when the entry was renamed.
*/
- private boolean ismodDN = false;
+ private boolean ismodDN;
/**
* Create a new object from the String encoded form.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 71f86ad..8ca5231 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -200,7 +200,7 @@
private final AtomicInteger numReplayedPostOpCalled = new AtomicInteger();
private final PersistentServerState state;
- private volatile boolean generationIdSavedStatus = false;
+ private volatile boolean generationIdSavedStatus;
/**
* This object is used to store the list of update currently being
@@ -226,8 +226,8 @@
private final InternalClientConnection conn = getRootConnection();
private final AtomicBoolean shutdown = new AtomicBoolean();
- private volatile boolean disabled = false;
- private volatile boolean stateSavingDisabled = false;
+ private volatile boolean disabled;
+ private volatile boolean stateSavingDisabled;
/**
* This list is used to temporary store operations that needs to be replayed
@@ -293,7 +293,7 @@
* fractional configuration (i.e with compliant fractional configuration in
* domain root entry).
*/
- private boolean forceBadDataSet = false;
+ private boolean forceBadDataSet;
/**
* The message id to be used when an import is stopped with error by
@@ -4535,7 +4535,7 @@
* fractionalSpecificClassesAttributes or fractionalAllClassesAttributes or
* both should be filled with something.
*/
- private boolean fractional = false;
+ private boolean fractional;
/**
* - If true, tells that the configured fractional replication is exclusive:
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java
index 9040e14..f0587c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/PendingChanges.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -63,7 +63,7 @@
/** The ReplicationDomain that will be used to send UpdateMsg. */
private final ReplicationDomain domain;
- private boolean recoveringOldChanges = false;
+ private boolean recoveringOldChanges;
/**
* Creates a new PendingChanges using the provided CSNGenerator.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java
index 4b36d9c..8c19fef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplayThread.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -50,7 +50,7 @@
private final BlockingQueue<UpdateToReplay> updateToReplayQueue;
private AtomicBoolean shutdown = new AtomicBoolean(false);
- private static int count = 0;
+ private static int count;
/**
* Constructor for the ReplayThread.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java
index f5f6655..115eff1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/UpdateToReplay.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -35,8 +36,8 @@
*/
public class UpdateToReplay
{
- private LDAPUpdateMsg updateMessage = null;
- private LDAPReplicationDomain replicationDomain = null;
+ private LDAPUpdateMsg updateMessage;
+ private LDAPReplicationDomain replicationDomain;
/**
* Construct the object associating the update message with the replication
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java
index 128386f..b18b3b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AckMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -63,19 +63,19 @@
* Did some servers go in timeout when the matching update (corresponding to
* CSN) was sent?.
*/
- private boolean hasTimeout = false;
+ private boolean hasTimeout;
/**
* Were some servers in wrong status when the matching update (corresponding
* to CSN) was sent?.
*/
- private boolean hasWrongStatus = false;
+ private boolean hasWrongStatus;
/**
* Did some servers make an error replaying the sent matching update
* (corresponding to CSN)?.
*/
- private boolean hasReplayError = false;
+ private boolean hasReplayError;
/**
* The list of server ids that had errors for the sent matching update
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
index 3beaf6d..0918399 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -46,7 +46,7 @@
private String initiatorsName;
/** whether the DEL operation is a subtree DEL. */
- private boolean isSubtreeDelete = false;
+ private boolean isSubtreeDelete;
/**
* Creates a new delete message.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
index 7a7e4ab..351a15e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -47,7 +47,7 @@
/**
* For test purposes only to simulate loss of heartbeats.
*/
- private static volatile boolean heartbeatsDisabled = false;
+ private static volatile boolean heartbeatsDisabled;
/**
* The session on which heartbeats are to be sent.
@@ -64,7 +64,7 @@
/**
* Set this to stop the thread.
*/
- private volatile boolean shutdown = false;
+ private volatile boolean shutdown;
private final Object shutdownLock = new Object();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java
index b7d6c83..41bac2c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/InitializeRequestMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -39,7 +39,7 @@
public class InitializeRequestMsg extends RoutableMsg
{
private final DN baseDN;
- private int initWindow = 0;
+ private int initWindow;
/**
* Creates a InitializeRequestMsg message.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
index cb21998..408df8b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -40,7 +41,7 @@
{
// Suppress compile warning
static final long serialVersionUID = 1739875L;
- private String msg = null; // Explicit message
+ private String msg; // Explicit message
private short protocolVersion = -1; // protocol version of the pdu
private byte pduType = -1; // type of the pdu
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
index 9c1a01c..d708490 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -64,12 +64,12 @@
/**
* The time the last message published to this session.
*/
- private volatile long lastPublishTime = 0;
+ private volatile long lastPublishTime;
/**
* The time the last message was received on this session.
*/
- private volatile long lastReceiveTime = 0;
+ private volatile long lastReceiveTime;
/**
* Close and error guarded by stateLock: use a different lock to publish since
@@ -77,7 +77,7 @@
* connections.
*/
private final Object stateLock = new Object();
- private volatile boolean closeInitiated = false;
+ private volatile boolean closeInitiated;
private Throwable sessionError;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
index f27e597..fea734e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -47,7 +47,7 @@
protected CSN csn;
/** True when the update must use assured replication. */
- protected boolean assuredFlag = false;
+ protected boolean assuredFlag;
/** When assuredFlag is true, defines the requested assured mode. */
protected AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
index 8640abf..35e2693 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
@@ -62,7 +62,7 @@
/** Referrals URLs this DS is exporting. */
private List<String> refUrls = new ArrayList<String>();
/** Assured replication enabled on DS or not. */
- private boolean assuredFlag = false;
+ private boolean assuredFlag;
/** DS assured mode (relevant if assured replication enabled). */
private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
/** DS safe data level (relevant if assured mode is safe data). */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java
index f6998c1..8506ddd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ExpectedAcksInfo.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -51,13 +51,13 @@
* The server handler of the server that sent the assured update message and
* to who we want to return the final ack.
*/
- private ServerHandler requesterServerHandler = null;
+ private ServerHandler requesterServerHandler;
/** The requested assured mode of matching update message. */
- private AssuredMode assuredMode = null;
+ private AssuredMode assuredMode;
/** The CSN of the assured update message we want acks for. */
- protected CSN csn = null;
+ protected CSN csn;
/**
* Is the treatment of the acks for the update message completed or not ?
@@ -67,7 +67,7 @@
* acks is completed or an ack timeout has occurred and we are going to
* remove this object from the map where it is stored.
*/
- private boolean completed = false;
+ private boolean completed;
/**
* This gives the list of servers we are willing to wait acks from and the
@@ -88,7 +88,7 @@
* code can then call getTimeoutServers() method to now which servers did not
* respond in time.
*/
- protected List<Integer> serversInTimeout = null;
+ protected List<Integer> serversInTimeout;
/**
* Creates a new ExpectedAcksInfo.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
index 0e92298..f79a557 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
@@ -93,11 +93,11 @@
/**
* Number of update sent to the server.
*/
- private int outCount = 0;
+ private int outCount;
/**
* Number of updates received from the server.
*/
- private int inCount = 0;
+ private int inCount;
/**
* Specifies the max queue size for this handler.
*/
@@ -109,7 +109,7 @@
/**
* Specifies whether the consumer is following the producer (is not late).
*/
- private boolean following = false;
+ private boolean following;
/**
* Specifies the current serverState of this handler.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
index 8d468c5..d8dced4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -55,7 +55,7 @@
private final Object lock = new Object();
/** The total number of bytes for all the message in the queue. */
- private int bytesCount = 0;
+ private int bytesCount;
/**
* Return the first UpdateMsg in the MsgQueue.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
index 78ee54d..93c9e7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
@@ -63,7 +63,7 @@
private final Object pendingMonitorLock = new Object();
/** Guarded by pendingMonitorLock. */
- private long monitorDataLastBuildDate = 0;
+ private long monitorDataLastBuildDate;
/**
* The set of replication servers which are already known to be slow to send
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index 5778463..a66e08d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -99,7 +99,7 @@
private ChangelogBackend changelogBackend;
private final AtomicBoolean shutdown = new AtomicBoolean();
- private boolean stopListen = false;
+ private boolean stopListen;
private final ReplSessionSecurity replSessionSecurity;
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -117,7 +117,7 @@
// Monitors for synchronizing domain creation with the connect thread.
private final Object domainTicketLock = new Object();
private final Object connectThreadLock = new Object();
- private long domainTicket = 0L;
+ private long domainTicket;
/**
* Holds the list of all replication servers instantiated in this VM.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
index d2090ba..9248763 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -157,7 +157,7 @@
* {@link #generationId} from being reset by
* {@link #resetGenerationIdIfPossible()}.
*/
- private volatile boolean generationIdSavedStatus = false;
+ private volatile boolean generationIdSavedStatus;
/** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -187,7 +187,7 @@
* Counter used to purge the timer tasks references in assuredTimeoutTimer,
* every n number of treated assured messages.
*/
- private int assuredTimeoutTimerPurgeCounter = 0;
+ private int assuredTimeoutTimerPurgeCounter;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
index 86983fa..548c26d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -46,13 +46,13 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** Did some servers go in timeout when the matching update was sent ?. */
- private boolean hasTimeout = false;
+ private boolean hasTimeout;
/** Were some servers in wrong status when the matching update was sent ?. */
- private boolean hasWrongStatus = false;
+ private boolean hasWrongStatus;
/** Did some servers make an error replaying the sent matching update ?. */
- private boolean hasReplayError = false;
+ private boolean hasReplayError;
/**
* The list of server ids that had errors for the sent matching update Each
@@ -68,7 +68,7 @@
* we can compute an ack message (based on info in this object), to be
* returned to the (requester) server that sent us an assured update message.
*/
- private int numKnownAckStatus = 0;
+ private int numKnownAckStatus;
/**
* Creates a new SafeReadExpectedAcksInfo.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
index bff6ce1..fd4f0d7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
@@ -84,7 +84,7 @@
/**
* Number of updates received from the server in assured safe read mode.
*/
- private int assuredSrReceivedUpdates = 0;
+ private int assuredSrReceivedUpdates;
/**
* Number of updates received from the server in assured safe read mode that
* timed out.
@@ -93,7 +93,7 @@
/**
* Number of updates sent to the server in assured safe read mode.
*/
- private int assuredSrSentUpdates = 0;
+ private int assuredSrSentUpdates;
/**
* Number of updates sent to the server in assured safe read mode that timed
* out.
@@ -102,7 +102,7 @@
/**
* Number of updates received from the server in assured safe data mode.
*/
- private int assuredSdReceivedUpdates = 0;
+ private int assuredSdReceivedUpdates;
/**
* Number of updates received from the server in assured safe data mode that
* timed out.
@@ -111,7 +111,7 @@
/**
* Number of updates sent to the server in assured safe data mode.
*/
- private int assuredSdSentUpdates = 0;
+ private int assuredSdSentUpdates;
/**
* Number of updates sent to the server in assured safe data mode that timed out.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java
index 2bcf574..8b574ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/StatusAnalyzer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -56,7 +56,7 @@
private final ReplicationServerDomain replicationServerDomain;
private final Object eventMonitor = new Object();
- private boolean pendingStatusMessage = false;
+ private boolean pendingStatusMessage;
private long nextCheckDSDegradedStatusTime;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java
index 2c6e72b..0b2ae1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -319,7 +319,7 @@
private final ReplicationDraftCNKey key;
private final DatabaseEntry entry = new DatabaseEntry();
private ChangeNumberIndexRecord record;
- private boolean isClosed = false;
+ private boolean isClosed;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 9b07a74..d41c702 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
@@ -54,7 +54,7 @@
public class JEChangeNumberIndexDB implements ChangeNumberIndexDB
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private static int NO_KEY = 0;
+ private static final int NO_KEY = 0;
private DraftCNDB db;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
index b33d6d8..174d0f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBCursor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
@@ -45,7 +45,7 @@
* As underlying cursor is already pointing to a record at start, this
* indicator allow to shift the pointed record at initialization time.
*/
- private boolean isInitialized = false;
+ private boolean isInitialized;
/**
* Creates a new DB Cursor. All created iterator must be released by
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 66e8a27..8e0298f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
@@ -109,7 +109,7 @@
* When not null, the next change with a ts different from
* tsForNewCounterRecord will lead to store a new counterRecord.
*/
- private long counterTsLimit = 0;
+ private long counterTsLimit;
/**
* The counter record will never be written to the db more often than each
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
index fca0b89..a000d75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.service;
@@ -60,7 +60,7 @@
/**
* Set this to stop the thread.
*/
- private volatile boolean shutdown = false;
+ private volatile boolean shutdown;
private final Object shutdownLock = new Object();
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
index c4e9ee5..1387ce8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.service;
@@ -64,7 +64,7 @@
/**
* Thread life-cycle state.
*/
- private volatile boolean shutdown = false;
+ private volatile boolean shutdown;
private final Object shutdownLock = new Object();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
index 1cf0d71..5d3c77d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
@@ -146,7 +146,7 @@
}
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private volatile boolean shutdown = false;
+ private volatile boolean shutdown;
private final Object startStopLock = new Object();
private volatile ReplicationDomainCfg config;
/**
@@ -158,7 +158,7 @@
private int maxSendWindow;
private int rcvWindow = 100;
private int halfRcvWindow = rcvWindow / 2;
- private int timeout = 0;
+ private int timeout;
private final ReplSessionSecurity replSessionSecurity;
/**
* The RS this DS is currently connected to.
@@ -190,7 +190,7 @@
/**
* The number of times the connection was lost.
*/
- private int numLostConnections = 0;
+ private int numLostConnections;
/**
* When the broker cannot connect to any replication server
* it log an error and keeps continuing every second.
@@ -199,7 +199,7 @@
* and to know that it is necessary to print a new message when the broker
* finally succeed to connect.
*/
- private volatile boolean connectionError = false;
+ private volatile boolean connectionError;
private final Object connectPhaseLock = new Object();
/**
* The thread that publishes messages to the RS containing the current
@@ -213,8 +213,8 @@
private final AtomicReference<Topology> topology =
new AtomicReference<Topology>(new Topology());
/** <pre>@GuardedBy("this")</pre>. */
- private volatile int updateDoneCount = 0;
- private volatile boolean connectRequiresRecovery = false;
+ private volatile int updateDoneCount;
+ private volatile boolean connectRequiresRecovery;
/**
* This integer defines when the best replication server checking algorithm
@@ -228,7 +228,7 @@
* least for a monitoring period after the last received topology message
* (topology stabilization).
*/
- private int mustRunBestServerCheckingAlgorithm = 0;
+ private int mustRunBestServerCheckingAlgorithm;
/**
* The monitor provider for this replication domain.
@@ -384,7 +384,7 @@
private final boolean sslEncryption;
private final int degradedStatusThreshold;
/** Keeps the 0 value if created with a ReplServerStartMsg. */
- private int connectedDSNumber = 0;
+ private int connectedDSNumber;
// @NotNull
private Set<Integer> connectedDSs;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index 9fca4ae..8b04fd4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -1097,9 +1097,9 @@
private int importSource = RoutableMsg.UNKNOWN_SERVER;
/** The total entry count expected to be processed. */
- private long entryCount = 0;
+ private long entryCount;
/** The count for the entry not yet processed. */
- private long entryLeftCount = 0;
+ private long entryLeftCount;
/** Exception raised during the initialization. */
private DirectoryException exception;
@@ -1108,13 +1108,13 @@
private final boolean importInProgress;
/** Current counter of messages exchanged during the initialization. */
- private int msgCnt = 0;
+ private int msgCnt;
/**
* Number of connections lost when we start the initialization. Will help
* counting connections lost during initialization,
*/
- private int initNumLostConnections = 0;
+ private int initNumLostConnections;
/**
* Request message sent when this server has the initializeFromRemote task.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
index bfaa102..a0c86c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AttributeTypeSyntax.java
@@ -84,7 +84,7 @@
private MatchingRule defaultSubstringMatchingRule;
/** If true strip the suggested minimum upper bound from the syntax OID. */
- private static boolean stripMinimumUpperBound=false;
+ private static boolean stripMinimumUpperBound;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
index a35a30d..1cc33bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tools;
import java.io.IOException;
@@ -72,12 +72,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
// The hostname to connect to.
- private String hostName = null;
+ private String hostName;
// The port number on which the directory server is accepting requests.
private int portNumber = 389;
- private LDAPConnectionOptions connectionOptions = null;
+ private LDAPConnectionOptions connectionOptions;
private LDAPWriter ldapWriter;
private LDAPReader ldapReader;
private int versionNumber = 3;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java
index 959c370..20f8ed5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnectionOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -41,17 +42,17 @@
public class LDAPConnectionOptions
{
- private boolean reportAuthzID = false;
- private boolean useSSL = false;
- private boolean startTLS = false;
- private boolean saslExternal = false;
- private boolean usePasswordPolicyControl = false;
- private SSLConnectionFactory sslConnectionFactory = null;
- private String saslMechanism = null;
+ private boolean reportAuthzID;
+ private boolean useSSL;
+ private boolean startTLS;
+ private boolean saslExternal;
+ private boolean usePasswordPolicyControl;
+ private SSLConnectionFactory sslConnectionFactory;
+ private String saslMechanism;
private int versionNumber = 3;
private Map<String, List<String>> saslProperties =
new HashMap<String, List<String>> ();
- private boolean verbose = false;
+ private boolean verbose;
/**
* Creates a the connection options instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java
index a46d98d..9a46c1e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDeleteOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -35,7 +36,7 @@
public class LDAPDeleteOptions extends LDAPToolOptions
{
- private boolean deleteSubtree = false;
+ private boolean deleteSubtree;
/**
* Creates the options instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java
index 80f9d07..04ce40c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModifyOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -35,7 +36,7 @@
public class LDAPModifyOptions extends LDAPToolOptions
{
- private boolean defaultAdd = false;
+ private boolean defaultAdd;
/**
* Creates the options instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java
index a88e133..0bd72d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearchOptions.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -46,14 +46,13 @@
private DereferenceAliasesPolicy dereferencePolicy = NEVER;
private SearchScope searchScope = WHOLE_SUBTREE;
- private int sizeLimit = 0;
- private int timeLimit = 0;
- private boolean typesOnly = false;
- private boolean countMatchingEntries = false;
+ private int sizeLimit;
+ private int timeLimit;
+ private boolean typesOnly;
+ private boolean countMatchingEntries;
/**
* Creates the options instance.
- *
*/
public LDAPSearchOptions()
{
@@ -63,9 +62,7 @@
* Set the timeLimit for the operation.
*
* @param timeLimit The time limit for the search.
- *
*/
-
public void setTimeLimit(int timeLimit)
{
this.timeLimit = timeLimit;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java
index 335c020..0ebf4a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPToolOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -36,9 +37,9 @@
public class LDAPToolOptions
{
- private boolean showOperations = false;
- private boolean verbose = false;
- private boolean continueOnError = false;
+ private boolean showOperations;
+ private boolean verbose;
+ private boolean continueOnError;
private String encoding = System.getProperty("file.encoding");
private ArrayList<Control> controls = new ArrayList<Control>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
index 351934b..f209e6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
@@ -147,22 +147,22 @@
/**
* ID of task for which to display details and exit.
*/
- private StringArgument task = null;
+ private StringArgument task;
/**
* Indicates print summary and exit.
*/
- private BooleanArgument summary = null;
+ private BooleanArgument summary;
/**
* ID of task to cancel.
*/
- private StringArgument cancel = null;
+ private StringArgument cancel;
/**
* Argument used to request non-interactive behavior.
*/
- private BooleanArgument noPrompt = null;
+ private BooleanArgument noPrompt;
/**
* Accesses the directory's task backend.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
index 7bfecf4..0f77b84 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -59,7 +59,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- private SSLSocketFactory sslSocketFactory = null;
+ private SSLSocketFactory sslSocketFactory;
/**
* Constructor for the SSL connection factory.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
index e2654bc..f3ed7d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/StartWindowsService.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.tools;
@@ -48,7 +48,7 @@
/**
* The service was successfully started.
*/
- private static int SERVICE_START_SUCCESSFUL = 0;
+ private static int SERVICE_START_SUCCESSFUL;
/**
* The service could not be found.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
index f7df43d..5064639 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.tools.upgrade;
@@ -239,7 +239,7 @@
private static abstract class FileOperation
{
- private File objectFile = null;
+ private File objectFile;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
index 7d2de7e..81d49a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.tools.upgrade;
@@ -95,12 +95,12 @@
/**
* The File object related to the license file.
*/
- static private File licFile = null;
+ static private File licFile;
/**
* The license file approval state.
*/
- static private boolean approved = false;
+ static private boolean approved;
/**
* Returns the license file name.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
index 22d64ad..ded9b6e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tools.upgrade;
@@ -52,8 +52,8 @@
*/
class UpgradeLog
{
- static private File logFile = null;
- static private FileHandler fileHandler = null;
+ static private File logFile;
+ static private FileHandler fileHandler;
final static String UPGRADELOGNAME = "upgrade.log";
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
index 7256ec0..902ae44 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -725,10 +725,10 @@
{
// The set of elements if there are more than one.
- private LinkedHashSet<T> elements = null;
+ private LinkedHashSet<T> elements;
// The first element.
- private T firstElement = null;
+ private T firstElement;
@@ -1022,13 +1022,13 @@
}
// The attribute type for this attribute.
- private AttributeType attributeType = null;
+ private AttributeType attributeType;
// The name of this attribute as provided by the end user.
- private String name = null;
+ private String name;
// The normalized set of options if there are more than one.
- private SortedSet<String> normalizedOptions = null;
+ private SortedSet<String> normalizedOptions;
// The set of options.
private final SmallSet<String> options = new SmallSet<String>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
index 7cb4bcd..db94519 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -114,7 +114,7 @@
private final MatchingRule substringMatchingRule;
// True once this attribute type has been removed from the schema.
- private volatile boolean isDirty = false;
+ private volatile boolean isDirty;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java b/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
index b635820..93c3057 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -94,7 +94,7 @@
// Time-stamp acts as memory barrier for networkInterfaces.
private static final long CACHED_LOCAL_ADDRESSES_TIMEOUT_MS = 30 * 1000;
- private static volatile long localAddressesTimeStamp = 0;
+ private static volatile long localAddressesTimeStamp;
private static Set<InetAddress> localAddresses = new HashSet<InetAddress>();
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
index 9dd25b6..1b76453 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
@@ -97,7 +97,7 @@
private final String definition;
// True once this object class has been removed from the schema.
- private volatile boolean isDirty = false;
+ private volatile boolean isDirty;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
index 59d71f3..3777d4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -147,16 +147,16 @@
private SubtreeSpecification subTreeSpec;
// Collective subentry flag.
- private boolean isCollective = false;
+ private boolean isCollective;
// Inherited collective subentry flag.
- private boolean isInheritedCollective = false;
+ private boolean isInheritedCollective;
// Inherited collective from DN subentry flag.
- private boolean isInheritedFromDNCollective = false;
+ private boolean isInheritedFromDNCollective;
// Inherited collective from RDN subentry flag.
- private boolean isInheritedFromRDNCollective = false;
+ private boolean isInheritedFromRDNCollective;
// Inherited collective DN attribute type.
private AttributeType inheritFromDNType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
index 6046382..65df6bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/RuntimeInformation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -54,7 +54,7 @@
- private static boolean is64Bit=false;
+ private static boolean is64Bit;
static {
String arch = System.getProperty("sun.arch.data.model");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 28c6bbe..748a402 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -88,28 +88,28 @@
private ApplicationTrustManager trustManager;
/** Boolean that tells if we ask for bind DN or admin UID in the same prompt. */
- private boolean useAdminOrBindDn = false;
+ private boolean useAdminOrBindDn;
/**
* Boolean that tells if we must propose LDAP if it is available even if the
* user provided certificate parameters.
*/
- private boolean displayLdapIfSecureParameters = false;
+ private boolean displayLdapIfSecureParameters;
/** The SecureConnectionCliArgsList object. */
private SecureConnectionCliArgs secureArgsList;
/** Indicate if we need to display the heading. */
- private boolean isHeadingDisplayed = false;
+ private boolean isHeadingDisplayed;
/** the Console application. */
private ConsoleApplication app;
/** Indicate if the trust store in in memory. */
- private boolean trustStoreInMemory = false;
+ private boolean trustStoreInMemory;
/** Indicate if the all certificates are accepted. */
- private boolean trustAll = false;
+ private boolean trustAll;
/** Indicate that the trust manager was created with the parameters provided. */
private boolean trustManagerInitialized;
diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
index 9365798..fa34698 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.forgerock.opendj.config.server;
@@ -58,7 +58,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-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
index d194c55..c20b67d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -51,8 +51,8 @@
@Test(groups = {"slow"}, sequential=true)
public class FileManagerTest extends QuickSetupTestCase {
- File fmWorkspace = null;
- FileManager fileManager = null;
+ File fmWorkspace;
+ FileManager fileManager;
@BeforeClass
public void setUp() throws Exception {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java b/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
index 1d8a737..ee73f93 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server;
@@ -78,14 +78,14 @@
private static final SimpleDateFormat TEST_PROGESS_TIME_FORMAT = new SimpleDateFormat(
"dd/MMM/yyyy:HH:mm:ss Z");
- private boolean doProgressNone = false;
+ private boolean doProgressNone;
private boolean doProgressTime = true;
private boolean doProgressTestCount = true;
- private boolean doProgressMemory = false;
- private boolean doProgressMemoryGcs = false;
+ private boolean doProgressMemory;
+ private boolean doProgressMemoryGcs;
private boolean doProgressRestarts = true;
- private boolean doProgressThreadCount = false;
- private boolean doProgressThreadChange = false;
+ private boolean doProgressThreadCount;
+ private boolean doProgressThreadChange;
private void initializeProgressVars() {
String prop = System.getProperty(PROPERTY_TEST_PROGRESS);
@@ -579,7 +579,7 @@
}
private final LinkedHashSet<Class<?>> _classesWithTestsRunInterleaved = new LinkedHashSet<Class<?>>();
- private Object _lastTestObject = null;
+ private Object _lastTestObject;
private final IdentityHashMap<Object,Object> _previousTestObjects = new IdentityHashMap<Object,Object>();
private void checkForInterleavedBetweenClasses(ITestResult tr) {
Object[] testInstances = tr.getMethod().getInstances();
@@ -651,7 +651,7 @@
}
- private boolean statusHeaderPrinted = false;
+ private boolean statusHeaderPrinted;
private synchronized void printStatusHeaderOnce() {
if (statusHeaderPrinted) {
return;
@@ -699,8 +699,8 @@
}
private final long testSuiteStartTime = System.currentTimeMillis();
- private long prevMemInUse = 0;
- private long maxMemInUse = 0;
+ private long prevMemInUse;
+ private long maxMemInUse;
private boolean isFirstTest = true;
private void outputTestProgress(Object finishedTestObject)
@@ -976,8 +976,8 @@
private static class TestClassResults {
private final IClass _cls;
private final LinkedHashMap<ITestNGMethod, TestMethodResults> _methods = new LinkedHashMap<ITestNGMethod, TestMethodResults>();
- private int _totalInvocations = 0;
- private long _totalDurationMs = 0;
+ private int _totalInvocations;
+ private long _totalDurationMs;
/** Indexed by SUCCESS, FAILURE, SKIP, SUCCESS_PERCENTAGE_FAILURE. */
private int[] _resultCounts = new int[STATUSES.length];
@@ -1039,8 +1039,8 @@
private static class TestMethodResults {
private final ITestNGMethod _method;
- int _totalInvocations = 0;
- long _totalDurationMs = 0;
+ int _totalInvocations;
+ long _totalDurationMs;
/** Indexed by SUCCESS, FAILURE, SKIP, SUCCESS_PERCENTAGE_FAILURE. */
private int[] _resultCounts = new int[STATUSES.length];
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
index 223b244..6e7c7e9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -41,7 +41,7 @@
*/
public class BooleanPropertyDefinitionTest extends DirectoryServerTestCase {
- BooleanPropertyDefinition.Builder builder = null;
+ BooleanPropertyDefinition.Builder builder;
/**
* Sets up tests.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
index 85e61e4..5e00a32 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.admin;
@@ -60,7 +60,7 @@
}
}
- ClassPropertyDefinition.Builder builder = null;
+ ClassPropertyDefinition.Builder builder;
/**
* Sets up tests
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
index 4b68aea..de298b2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -42,7 +42,7 @@
private enum TestEnum { ONE, TWO, THREE }
- private EnumPropertyDefinition.Builder<TestEnum> builder = null;
+ private EnumPropertyDefinition.Builder<TestEnum> builder;
@BeforeClass
public void setUp() {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
index d2d9a15..f5eef44 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -37,7 +38,7 @@
* ManagedObjectDefinitionI18NResource Tester.
*/
public class ManagedObjectDefinitionI18NResourceTest extends DirectoryServerTestCase {
- ManagedObjectDefinitionI18NResource modr = null;
+ ManagedObjectDefinitionI18NResource modr;
/**
* Creates the resource
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
index b0a301a..d27e590 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -45,7 +46,7 @@
private static final TestParentCfgDefn d;
- private RelativeInheritedDefaultBehaviorProvider<Boolean> ridbp = null;
+ private RelativeInheritedDefaultBehaviorProvider<Boolean> ridbp;
static
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
index d79c7c3..efef421 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -72,10 +72,10 @@
}
// Test parent object class definition.
- private static ObjectClass TEST_PARENT_OCD = null;
+ private static ObjectClass TEST_PARENT_OCD;
// Test child object class definition.
- private static ObjectClass TEST_CHILD_OCD = null;
+ private static ObjectClass TEST_CHILD_OCD;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
index 773b45a..94bce04 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -52,7 +52,7 @@
public final class CreateEntryMockLDAPConnection extends MockLDAPConnection {
// Detect multiple calls.
- private boolean alreadyAdded = false;
+ private boolean alreadyAdded;
// The expected set of attributes (attribute name -> list of
// values).
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
index 335d98b..c8ed905 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -42,7 +43,7 @@
public final class DeleteSubtreeMockLDAPConnection extends MockLDAPConnection {
// Detect multiple calls.
- private boolean alreadyDeleted = false;
+ private boolean alreadyDeleted;
// The expected DN.
private final LdapName expectedDN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
index f95d003..94c67f2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -52,7 +52,7 @@
public final class ModifyEntryMockLDAPConnection extends MockLDAPConnection {
// Detect multiple calls.
- private boolean alreadyModified = false;
+ private boolean alreadyModified;
// The expected DN.
private final LdapName expectedDN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
index ee27cd8..f7b4245 100755
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.spi;
@@ -67,13 +67,13 @@
private static final String STR_DEFAULT = "str def";
/** Test boolean property def */
- private BooleanPropertyDefinition testBoolPropertyDefinition = null;
+ private BooleanPropertyDefinition testBoolPropertyDefinition;
/** Test single valued string property def */
- private StringPropertyDefinition testSvStringPropertyDefinition = null;
+ private StringPropertyDefinition testSvStringPropertyDefinition;
/** Test multi-valued string property def */
- private StringPropertyDefinition testMvStringPropertyDefinition = null;
+ private StringPropertyDefinition testMvStringPropertyDefinition;
private PropertyProvider emptyPropertyProvider = new PropertyProvider() {
public <T> Collection<T> getPropertyValues(PropertyDefinition<T> d) throws IllegalArgumentException {
@@ -468,8 +468,8 @@
private class TestPropertyProvider<T> implements PropertyProvider {
- PropertyDefinition<T> pd = null;
- Collection<T> values = null;
+ PropertyDefinition<T> pd;
+ Collection<T> values;
public TestPropertyProvider(PropertyDefinition<T> pd, Collection<T> values) {
this.pd = pd;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
index c7a7848..0a49c7e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -54,7 +54,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;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
index 7b927db..9698ced 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
@@ -246,21 +246,21 @@
};
/** JNDI LDAP context. */
- private JNDIDirContextAdaptor adaptor = null;
+ private JNDIDirContextAdaptor adaptor;
/**
* The saved test child configuration "aggregation-property" property
* definition.
*/
- private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionDefault = null;
+ private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionDefault;
/**
* An aggregation where the target must be enabled if the source is enabled.
*/
- private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionTargetAndSourceMustBeEnabled = null;
+ private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionTargetAndSourceMustBeEnabled;
/** An aggregation where the target must be enabled. */
- private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionTargetMustBeEnabled = null;
+ private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> aggregationPropertyDefinitionTargetMustBeEnabled;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
index fb1426b..ef6d7aa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -267,7 +267,7 @@
};
// JNDI LDAP context.
- private JNDIDirContextAdaptor adaptor = null;
+ private JNDIDirContextAdaptor adaptor;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
index b2d2af1..44aef6d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
@@ -60,15 +60,10 @@
private final class MockPolicy extends AuthenticationPolicy
{
private final boolean isDisabled;
-
- private boolean isPolicyFinalized = false;
-
- private boolean isStateFinalized = false;
-
private final boolean matches;
-
- private ByteString matchedPassword = null;
-
+ private boolean isPolicyFinalized;
+ private boolean isStateFinalized;
+ private ByteString matchedPassword;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
index deabe0a..2518a83 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -61,7 +61,7 @@
@Test(groups = {"precommit", "dseecompat"}, sequential = true)
public abstract class AciTestCase extends DirectoryServerTestCase {
- private Attribute globalACIAttribute = null;
+ private Attribute globalACIAttribute;
@BeforeClass
public void aciTestCaseSetup() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index 1bf2707..3d29073 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -59,12 +59,12 @@
extends CommonEntryCacheTestCase<EntryCacheCfg>
{
// Entry cache implementations participating in this test.
- private SoftReferenceEntryCache softRefCache = null;
- private FIFOEntryCache fifoCache = null;
+ private SoftReferenceEntryCache softRefCache;
+ private FIFOEntryCache fifoCache;
// ... and their configuration entries.
- Entry cacheSoftReferenceConfigEntry = null;
- Entry cacheFIFOConfigEntry = null;
+ Entry cacheSoftReferenceConfigEntry;
+ Entry cacheFIFOConfigEntry;
// The entry cache order map sorted by the cache level.
private SortedMap<Integer, EntryCache<? extends EntryCacheCfg>>
@@ -72,8 +72,8 @@
EntryCache<? extends EntryCacheCfg>>();
// Dummy test entries for each participating implementation.
- private ArrayList<Entry> testSoftRefEntriesList = null;
- private ArrayList<Entry> testFIFOEntriesList = null;
+ private ArrayList<Entry> testSoftRefEntriesList;
+ private ArrayList<Entry> testFIFOEntriesList;
/**
* Initialize the entry cache test.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 59d0dea..abbe9c6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -400,13 +400,13 @@
private MappingPolicy mappingPolicy = MappingPolicy.UNMAPPED;
private final SortedSet<String> primaryServers = new TreeSet<String>();
private final SortedSet<String> secondaryServers = new TreeSet<String>();
- private int timeoutMS = 0; // unlimited
+ private int timeoutMS; // unlimited
private DN mappedSearchBindDN = searchBindDN;
private String mappedSearchBindPassword = "searchPassword";
- private String mappedSearchBindPasswordEnvVar = null;
- private String mappedSearchBindPasswordFile = null;
- private String mappedSearchBindPasswordProperty = null;
- private boolean usePasswordCaching = false;
+ private String mappedSearchBindPasswordEnvVar;
+ private String mappedSearchBindPasswordFile;
+ private String mappedSearchBindPasswordProperty;
+ private boolean usePasswordCaching;
@@ -1260,9 +1260,9 @@
private final ServerSocket serverSocket;
private final List<Action> actions = new LinkedList<Action>();
- private Socket socket = null;
- private volatile Exception e = null;
- private Thread serverThread = null;
+ private Socket socket;
+ private volatile Exception e;
+ private Thread serverThread;
private final CountDownLatch stopLatch = new CountDownLatch(1);
private final Queue<BlockAction> blockers = new LinkedList<BlockAction>();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
index de73381..a864b1e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
@@ -49,7 +49,7 @@
/**
* The singleton instance of this test password validator.
*/
- private static TestPasswordValidator instance = null;
+ private static TestPasswordValidator instance;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
index 171d976..9c0bf0b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -88,8 +88,8 @@
private static AtomicInteger postDisconnectCounter = new AtomicInteger(0);
private static AtomicInteger ldifImportCounter = new AtomicInteger(0);
private static AtomicInteger ldifExportCounter = new AtomicInteger(0);
- private static boolean startupCalled = false;
- private static boolean shutdownCalled = false;
+ private static boolean startupCalled;
+ private static boolean shutdownCalled;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
index 0ac1ab8..8346f79 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -59,7 +59,7 @@
/**
* The singleton instance of this test password validator.
*/
- private static UpdatePreOpPlugin instance = null;
+ private static UpdatePreOpPlugin instance;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
index 164e99d..7dc9ea6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication;
@@ -250,7 +250,7 @@
private class BrokerReader extends Thread
{
private ReplicationBroker broker;
- private int count = 0;
+ private int count;
private Boolean finished = false;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 1aa7fa5..1a1ebea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -120,12 +120,12 @@
private final String SAFE_DATA_DN = "ou=safe-data," + TEST_ROOT_DN_STRING;
private final String SAFE_READ_DN = "ou=safe-read," + TEST_ROOT_DN_STRING;
private final String NOT_ASSURED_DN = "ou=not-assured," + TEST_ROOT_DN_STRING;
- private Entry safeDataDomainCfgEntry = null;
- private Entry safeReadDomainCfgEntry = null;
- private Entry notAssuredDomainCfgEntry = null;
+ private Entry safeDataDomainCfgEntry;
+ private Entry safeReadDomainCfgEntry;
+ private Entry notAssuredDomainCfgEntry;
/** The fake replication server */
- private FakeReplicationServer replicationServer = null;
+ private FakeReplicationServer replicationServer;
// Definitions for the scenario the RS supports
private static final int NOT_ASSURED_SCENARIO = 1;
@@ -278,13 +278,13 @@
{
private ServerSocket listenSocket;
- private boolean shutdown = false;
- private Session session = null;
+ private boolean shutdown;
+ private Session session;
// Parameters given at constructor time
private final int port;
private int serverId = -1;
- private boolean isAssured = false;
+ private boolean isAssured;
private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
private byte safeDataLevel = 1;
@@ -297,17 +297,17 @@
private ServerState serverState;
private int windowSize = -1;
private byte groupId = -1;
- private boolean sslEncryption = false;
+ private boolean sslEncryption;
/** The scenario this RS is expecting */
private int scenario = -1;
/** parameters at handshake are ok */
- private boolean handshakeOk = false;
+ private boolean handshakeOk;
/**
* signal that the current scenario the RS must execute reached the point
* where the main code can perform test assertion.
*/
- private boolean scenarioExecuted = false;
+ private boolean scenarioExecuted;
private CSNGenerator gen;
private String testcase;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
index 1ab18f2..b2a169e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -54,7 +54,7 @@
* By default changeTimeHeartbeatInterval is set to 0 in order to disable this
* feature and not kill the tests that expect to receive special messages.
*/
- private long changeTimeHeartbeatInterval = 0;
+ private long changeTimeHeartbeatInterval;
private IsolationPolicy policy = IsolationPolicy.REJECT_ALL_UPDATES;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
index 22d46ba..c31661f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -58,11 +58,11 @@
private int rs1Port = -1;
private int rs2Port = -1;
private int rs3Port = -1;
- private LDAPReplicationDomain rd1 = null;
- private LDAPReplicationDomain rd2 = null;
- private ReplicationServer rs1 = null;
- private ReplicationServer rs2 = null;
- private ReplicationServer rs3 = null;
+ private LDAPReplicationDomain rd1;
+ private LDAPReplicationDomain rd2;
+ private ReplicationServer rs1;
+ private ReplicationServer rs2;
+ private ReplicationServer rs3;
// The tracer object for the debug logger
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 2f19a79..525a90a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -57,10 +57,10 @@
private static final int RS2_ID = 32;
private int rs1Port = -1;
private int rs2Port = -1;
- private LDAPReplicationDomain rd1 = null;
- private LDAPReplicationDomain rd2 = null;
- private ReplicationServer rs1 = null;
- private ReplicationServer rs2 = null;
+ private LDAPReplicationDomain rd1;
+ private LDAPReplicationDomain rd2;
+ private ReplicationServer rs1;
+ private ReplicationServer rs2;
/** The tracer object for the debug logger */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
index 293dae5..321df30 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -126,15 +126,15 @@
private int rs1Port = -1;
private int rs2Port = -1;
private int rs3Port = -1;
- private LDAPReplicationDomain rd1 = null;
- private LDAPReplicationDomain rd2 = null;
- private LDAPReplicationDomain rd3 = null;
- private LDAPReplicationDomain rd4 = null;
- private LDAPReplicationDomain rd5 = null;
- private LDAPReplicationDomain rd6 = null;
- private ReplicationServer rs1 = null;
- private ReplicationServer rs2 = null;
- private ReplicationServer rs3 = null;
+ private LDAPReplicationDomain rd1;
+ private LDAPReplicationDomain rd2;
+ private LDAPReplicationDomain rd3;
+ private LDAPReplicationDomain rd4;
+ private LDAPReplicationDomain rd5;
+ private LDAPReplicationDomain rd6;
+ private ReplicationServer rs1;
+ private ReplicationServer rs2;
+ private ReplicationServer rs3;
/** The tracer object for the debug logger */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
index c752a03..f00e927 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -99,13 +99,13 @@
* <code>fakeRd1 == fakeRDs[1]</code>, etc.
*/
private FakeReplicationDomain[] fakeRDs;
- private FakeReplicationServer fakeRs1 = null;
- private FakeReplicationServer fakeRs2 = null;
- private FakeReplicationServer fakeRs3 = null;
- private ReplicationServer rs1 = null;
- private ReplicationServer rs2 = null;
- private ReplicationServer rs3 = null;
- private ReplicationServer rs4 = null;
+ private FakeReplicationServer fakeRs1;
+ private FakeReplicationServer fakeRs2;
+ private FakeReplicationServer fakeRs3;
+ private ReplicationServer rs1;
+ private ReplicationServer rs2;
+ private ReplicationServer rs3;
+ private ReplicationServer rs4;
/**
* Small assured timeout value (timeout to be used in first RS receiving an
@@ -450,8 +450,8 @@
private final CSNGenerator gen;
/** Number of received updates */
- private int nReceivedUpdates = 0;
- private int nWrongReceivedUpdates = 0;
+ private int nReceivedUpdates;
+ private int nWrongReceivedUpdates;
/**
* Creates a fake replication domain (DS)
@@ -704,24 +704,24 @@
* According to the configured scenario, it will answer to updates with acks
* as the scenario is requesting.
*/
- private static int fakePort = 0;
+ private static int fakePort;
private class FakeReplicationServer extends Thread
{
- private boolean shutdown = false;
+ private boolean shutdown;
private Session session;
/** Parameters given at constructor time */
private int port;
private int serverId = -1;
- private boolean isAssured = false; // Default value for config
+ private boolean isAssured; // Default value for config
private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE; // Default value for config
private byte safeDataLevel = 1; // Default value for config
private DN baseDN;
private long generationId = -1L;
private byte groupId = -1;
- private boolean sslEncryption = false;
+ private boolean sslEncryption;
/** The scenario this RS is expecting */
private int scenario = -1;
@@ -730,13 +730,13 @@
/** False if a received update had assured parameters not as expected */
private boolean everyUpdatesAreOk = true;
/** Number of received updates */
- private int nReceivedUpdates = 0;
+ private int nReceivedUpdates;
/**
* True if an ack has been replied to a received assured update (in assured
* mode of course) used in reply scenario
*/
- private boolean ackReplied = false;
+ private boolean ackReplied;
/**
* Creates a fake replication server
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
index 40fef90..0a3115f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -985,7 +985,7 @@
private class BrokerReader extends Thread
{
private ReplicationBroker broker;
- private int numMsgRcv = 0;
+ private int numMsgRcv;
private final int numMsgExpected;
private Exception exc;
private String errDetails;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java
index a1750d8..79ea889 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
@@ -420,7 +420,7 @@
/** A parser that can be set to fail when reading. */
static class FailingStringRecordParser extends StringRecordParser
{
- private boolean failToRead = false;
+ private boolean failToRead;
@Override
public Record<String, String> decodeRecord(ByteString data) throws DecodingException
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index 5c84a35..036dc98 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -52,7 +52,7 @@
public class MakeLDIFTestCase
extends ToolsTestCase
{
- private String resourcePath = null;
+ private String resourcePath;
@BeforeClass
public void setUp() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
index d1b5ae1..45227c5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -73,7 +73,7 @@
private AttributeType AT_TELN;
// Temporary file containing an attribute value.
- private File TEMP_FILE = null;
+ private File TEMP_FILE;
// Temporary file content.
private static final String TEMP_FILE_STRING = "hello world";
--
Gitblit v1.10.0