From 61b9eb1be03fc03a9f4bb0013a08ff44a1059503 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 14:25:46 +0000
Subject: [PATCH] opendj-server-legacy: added @Override + Autorefactor'ed comments
---
opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java | 87
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java | 15
opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java | 15
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java | 3
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 5
opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java | 17
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java | 11
opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java | 49
opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java | 11
opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java | 9
opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java | 22
opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java | 43
opendj-server-legacy/src/main/java/org/opends/server/loggers/EncryptAction.java | 11
opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java | 15
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java | 21
opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java | 21
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogger.java | 11
opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 22
opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java | 18
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java | 17
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java | 113
opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java | 29
opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java | 43
opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java | 96
opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java | 77
opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java | 19
opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java | 1
opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java | 3
opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java | 7
opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java | 38
opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 22
opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java | 11
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java | 28
opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 64
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java | 25
opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java | 9
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java | 71
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java | 11
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java | 13
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java | 35
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 14
opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java | 14
opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java | 27
opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java | 28
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java | 37
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java | 24
opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java | 30
opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java | 20
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java | 17
opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java | 111
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java | 13
opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java | 51
opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java | 47
opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 53
opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java | 13
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java | 12
opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java | 11
opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java | 52
opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java | 3
opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java | 27
opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java | 3
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java | 29
opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java | 3
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java | 6
opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java | 16
opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java | 35
opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java | 26
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java | 31
opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java | 25
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java | 32
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java | 20
opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java | 12
opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java | 171 -
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java | 29
opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java | 5
opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java | 25
opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java | 71
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java | 46
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java | 94
opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 27
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 30
opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java | 24
opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java | 28
opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java | 51
opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java | 16
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java | 13
opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java | 33
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 9
opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java | 15
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java | 10
opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java | 31
opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 67
opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java | 52
opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java | 4
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 123
opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java | 33
opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java | 29
opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java | 30
opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 50
opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java | 13
opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java | 9
opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 41
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java | 71
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 20
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java | 38
opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java | 49
opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 49
opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java | 38
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java | 84
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java | 18
opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java | 18
opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 29
opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java | 30
opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java | 37
opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java | 8
opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java | 26
opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java | 9
opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java | 26
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java | 19
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java | 85
opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 66
opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java | 30
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 60
opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java | 8
opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java | 52
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 64
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java | 10
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java | 5
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java | 9
opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 36
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java | 17
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 69
opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java | 21
opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java | 30
opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java | 56
opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java | 20
opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java | 12
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java | 45
opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java | 5
opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java | 25
opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java | 28
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 28
opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java | 26
opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java | 24
opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java | 29
opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java | 12
opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 52
opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java | 5
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java | 53
opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java | 31
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java | 20
opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java | 46
opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 13
opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java | 13
opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java | 41
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java | 15
opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java | 66
opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java | 23
opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java | 81
opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java | 139
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java | 3
opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java | 40
opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java | 15
opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java | 15
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java | 31
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java | 52
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java | 52
opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 10
opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java | 38
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java | 15
opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java | 20
opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java | 26
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java | 21
opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java | 8
opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java | 30
opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java | 17
opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java | 17
opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java | 5
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java | 170 -
opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java | 15
opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java | 16
opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java | 38
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java | 17
opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java | 17
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java | 11
opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 263 -
opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 19
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java | 18
opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java | 8
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java | 421 --
opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java | 81
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/SSF.java | 15
opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java | 26
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java | 32
opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 46
opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java | 16
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java | 16
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java | 6
opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java | 19
opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java | 45
opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java | 4
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java | 5
opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java | 12
opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java | 45
opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java | 24
opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java | 2
opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java | 3
opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java | 6
opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 62
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java | 22
opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java | 17
opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java | 15
opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java | 40
opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TimeOfDay.java | 26
opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java | 7
opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java | 45
opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java | 62
opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java | 13
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java | 13
opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java | 11
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 30
opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java | 18
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java | 96
opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java | 44
opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java | 13
opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java | 19
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java | 9
opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java | 21
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java | 8
opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java | 7
opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java | 23
opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 47
opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java | 25
opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 17
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java | 10
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java | 12
opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java | 32
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java | 11
opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java | 10
opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java | 31
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java | 3
opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java | 76
opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java | 61
opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java | 18
opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java | 44
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java | 68
opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java | 25
opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 15
opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java | 37
opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java | 12
opendj-server-legacy/src/main/java/org/opends/server/api/Group.java | 57
opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java | 3
opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java | 17
opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java | 31
opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 5
opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java | 10
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java | 441 --
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java | 20
opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java | 34
opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java | 39
opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java | 1
opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java | 26
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java | 7
opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java | 19
opendj-server-legacy/src/main/java/org/opends/server/core/GroupManager.java | 86
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java | 11
opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java | 26
opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java | 26
305 files changed, 1,334 insertions(+), 7,913 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
index 0db3f30..b58cbf9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
@@ -16,23 +16,22 @@
*/
package org.opends.server.api;
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
import org.opends.server.core.ServerContext;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.MemberList;
import org.opends.server.types.Modification;
import org.opends.server.types.SearchFilter;
-import org.forgerock.opendj.ldap.SearchScope;
/**
* This class defines the set of methods that must be implemented by a
@@ -82,8 +81,6 @@
public abstract void initializeGroupImplementation(T configuration)
throws ConfigException, InitializationException;
-
-
/**
* Indicates whether the provided configuration is acceptable for
* this group implementation. It should be possible to call this
@@ -115,8 +112,6 @@
return true;
}
-
-
/**
* Performs any necessary finalization that may be needed whenever
* this group implementation is taken out of service within the
@@ -128,8 +123,6 @@
// No implementation is required by default.
}
-
-
/**
* Creates a new group of this type based on the definition
* contained in the provided entry. This method must be designed so
@@ -151,8 +144,6 @@
public abstract Group<T> newInstance(ServerContext serverContext, Entry groupEntry)
throws DirectoryException;
-
-
/**
* Retrieves a search filter that may be used to identify entries
* containing definitions for groups of this type in the Directory
@@ -172,8 +163,6 @@
public abstract SearchFilter getGroupDefinitionFilter()
throws DirectoryException;
-
-
/**
* Indicates whether the provided entry contains a valid definition
* for this type of group.
@@ -186,8 +175,6 @@
*/
public abstract boolean isGroupDefinition(Entry entry);
-
-
/**
* Retrieves the DN of the entry that contains the definition for
* this group.
@@ -197,8 +184,6 @@
*/
public abstract DN getGroupDN();
-
-
/**
* Sets the DN of the entry that contains the definition for
* this group.
@@ -208,8 +193,6 @@
*/
public abstract void setGroupDN(DN groupDN);
-
-
/**
* Indicates whether this group supports nesting other groups, such
* that the members of the nested groups will also be considered
@@ -220,8 +203,6 @@
*/
public abstract boolean supportsNestedGroups();
-
-
/**
* Retrieves a list of the DNs of any nested groups whose members
* should be considered members of this group.
@@ -231,8 +212,6 @@
*/
public abstract List<DN> getNestedGroupDNs();
-
-
/**
* Attempts to add the provided group DN as a nested group within
* this group. The change should be committed to persistent storage
@@ -251,8 +230,6 @@
public abstract void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException;
-
-
/**
* Attempts to remove the provided group as a nested group within
* this group. The change should be committed to persistent storage
@@ -271,8 +248,6 @@
public abstract void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException;
-
-
/**
* Indicates whether the user with the specified DN is a member of
* this group. Note that this is a point-in-time determination and
@@ -292,8 +267,6 @@
return userDN != null && isMember(userDN, new HashSet<DN>());
}
-
-
/**
* Indicates whether the user with the specified DN is a member of
* this group. Note that this is a point-in-time determination and
@@ -325,8 +298,6 @@
public abstract boolean isMember(DN userDN, Set<DN> examinedGroups)
throws DirectoryException;
-
-
/**
* Indicates whether the user described by the provided user entry
* is a member of this group. Note that this is a point-in-time
@@ -347,8 +318,6 @@
return isMember(userEntry, new HashSet<DN>());
}
-
-
/**
* Indicates whether the user described by the provided user entry
* is a member of this group. Note that this is a point-in-time
@@ -381,8 +350,6 @@
Set<DN> examinedGroups)
throws DirectoryException;
-
-
/**
* Retrieves an iterator that may be used to cursor through the
* entries of the members contained in this group. Note that this
@@ -402,8 +369,6 @@
return getMembers(null, null, null);
}
-
-
/**
* Retrieves an iterator that may be used to cursor through the
* entries of the members contained in this group. It may
@@ -435,8 +400,6 @@
SearchFilter filter)
throws DirectoryException;
-
-
/**
* Indicates whether it is possible to alter the member list for
* this group (e.g., in order to add members to the group or remove
@@ -447,8 +410,6 @@
*/
public abstract boolean mayAlterMemberList();
-
-
/**
* Attempt to make multiple changes to the group's member list.
*
@@ -462,8 +423,6 @@
public abstract void updateMembers(List<Modification> modifications)
throws UnsupportedOperationException, DirectoryException;
-
-
/**
* Attempts to add the provided user as a member of this group. The
* change should be committed to persistent storage through an
@@ -483,8 +442,6 @@
public abstract void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException;
-
-
/**
* Attempts to remove the specified user as a member of this group.
* The change should be committed to persistent storage through an
@@ -504,13 +461,12 @@
public abstract void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException;
-
-
/**
* Retrieves a string representation of this group.
*
* @return A string representation of this group.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
@@ -518,8 +474,6 @@
return buffer.toString();
}
-
-
/**
* Appends a string representation of this group to the provided
* buffer.
@@ -529,4 +483,3 @@
*/
public abstract void toString(StringBuilder buffer);
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
index 2d37c69..287821b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.api;
-
-
/**
* This interface defines a set of methods that must be implemented by
* any class that forms the basis for a protocol element (e.g., an
@@ -25,31 +23,17 @@
*/
@org.opends.server.types.PublicAPI(
stability=org.opends.server.types.StabilityLevel.VOLATILE,
- mayInstantiate=false,
mayExtend=true,
mayInvoke=true)
public interface ProtocolElement
{
/**
- * Retrieves the name of the protocol associated with this protocol
- * element.
+ * Retrieves the name of the protocol associated with this protocol element.
*
- * @return The name of the protocol associated with this protocol
- * element.
+ * @return The name of the protocol associated with this protocol element.
*/
String getProtocolElementName();
-
-
- /**
- * Retrieves a string representation of this protocol element.
- *
- * @return A string representation of this protocol element.
- */
- String toString();
-
-
-
/**
* Appends a string representation of this protocol element to the
* provided buffer.
@@ -59,8 +43,6 @@
*/
void toString(StringBuilder buffer);
-
-
/**
* Appends a string representation of this protocol element to the
* provided buffer.
@@ -72,4 +54,3 @@
*/
void toString(StringBuilder buffer, int indent);
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
index 84fa766..cfb7775 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java
@@ -20,9 +20,9 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.server.config.server.PluginCfg;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.server.config.server.PluginCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;
@@ -33,7 +33,6 @@
public abstract class InternalDirectoryServerPlugin extends
DirectoryServerPlugin<PluginCfg>
{
-
/**
* Creates a new internal directory server plugin using the provided
* component name and plugin types.
@@ -56,9 +55,7 @@
invokeForInternalOps);
}
-
-
- /** {@inheritDoc} */
+ @Override
public final void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration) throws ConfigException,
InitializationException
@@ -66,14 +63,11 @@
// Unused.
}
-
-
- /** {@inheritDoc} */
+ @Override
public final boolean isConfigurationAcceptable(
PluginCfg configuration, List<LocalizableMessage> unacceptableReasons)
{
// Unused.
return true;
}
-
}
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 9211ec6..e59962f 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
@@ -12,15 +12,17 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.authorization.dseecompat;
-import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AccessControlMessages.*;
-import java.util.regex.Pattern;
-import java.util.*;
+
import java.net.InetAddress;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Pattern;
/**
* This class represents a single ACI's IP bind rule expression. It is possible
@@ -29,21 +31,16 @@
* address for each IP address parsed from the bind rule.
*/
public class IP implements KeywordBindRule {
-
/**
* Regular expression used to do a quick check on the characters in a
* bind rule address. These are all of the valid characters that may
* appear in an bind rule address part.
*/
- private static final String ipRegEx =
- "((?i)[\\.{1}[a-f]\\d:\\+{1}\\*/{1}\\t\\[{1}\\]{1}]+(?-i))";
+ private static final Pattern ipRegEx =
+ Pattern.compile("((?i)[\\.{1}[a-f]\\d:\\+{1}\\*/{1}\\t\\[{1}\\]{1}]+(?-i))");
- /**
- * List of the pattern classes, one for each address decoded from the bind
- * rule.
- */
+ /** List of the pattern classes, one for each address decoded from the bind rule. */
private List<PatternIP> patternIPList;
-
/** The type of the bind rule (!= or =). */
private EnumBindRuleType type;
@@ -74,13 +71,10 @@
String[] ipStrs=expr.split("\\,", -1);
List<PatternIP> patternIPList= new LinkedList<>();
for (String ipStr : ipStrs) {
- if (!Pattern.matches(ipRegEx, ipStr)) {
- LocalizableMessage message =
- WARN_ACI_SYNTAX_INVALID_IP_EXPRESSION.get(expr);
- throw new AciException(message);
+ if (!ipRegEx.matcher(ipStr).matches()) {
+ throw new AciException(WARN_ACI_SYNTAX_INVALID_IP_EXPRESSION.get(expr));
}
- PatternIP ipPattern = PatternIP.decode(ipStr);
- patternIPList.add(ipPattern);
+ patternIPList.add(PatternIP.decode(ipStr));
}
return new IP(patternIPList, type);
}
@@ -94,9 +88,9 @@
*
* @return An enumeration representing if the address matched.
*/
+ @Override
public EnumEvalResult evaluate(AciEvalContext evalCtx) {
- InetAddress remoteAddr=evalCtx.getRemoteAddress();
- return evaluate(remoteAddr);
+ return evaluate(evalCtx.getRemoteAddress());
}
/**
@@ -117,7 +111,6 @@
return matched.getRet(type, false);
}
- /** {@inheritDoc} */
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
@@ -125,10 +118,8 @@
return sb.toString();
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer) {
buffer.append(super.toString());
}
-
}
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 01c042d..1c63094 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
@@ -12,19 +12,16 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.authorization.dseecompat;
-import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AccessControlMessages.*;
-/**
- * The class represents the ssf keyword in a bind rule.SSF stands for
- * security strength factor.
- */
-public class SSF implements KeywordBindRule {
+import org.forgerock.i18n.LocalizableMessage;
+/** The class represents the ssf keyword in a bind rule.SSF stands for security strength factor. */
+public class SSF implements KeywordBindRule {
/** Enumeration representing the bind rule operation type. */
private EnumBindRuleType type;
@@ -67,6 +64,7 @@
* @return An evaluation result enumeration containing the result of the
* context evaluation.
*/
+ @Override
public EnumEvalResult evaluate(AciEvalContext evalCtx) {
int currentSSF = evalCtx.getCurrentSSF();
EnumEvalResult matched = getMatched(currentSSF);
@@ -108,7 +106,6 @@
return EnumEvalResult.FALSE;
}
- /** {@inheritDoc} */
@Override
public String toString()
{
@@ -117,11 +114,9 @@
return sb.toString();
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
buffer.append(super.toString());
}
-
}
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 5999d3a..af7a0a3 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
@@ -12,24 +12,20 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.authorization.dseecompat;
-import org.forgerock.i18n.LocalizableMessage;
-
import static org.opends.messages.AccessControlMessages.*;
-import org.opends.server.util.TimeThread;
+
import java.util.regex.Pattern;
-/**
- * This class represents the timeofday keyword in a bind rule.
- */
-public class TimeOfDay implements KeywordBindRule {
+import org.forgerock.i18n.LocalizableMessage;
+import org.opends.server.util.TimeThread;
- /**
- * Regular expression matching a valid timeofday rule value (0-2359).
- */
- private static final String timeofdayRegex = "[0-2]\\d[0-5]\\d";
+/** This class represents the timeofday keyword in a bind rule. */
+public class TimeOfDay implements KeywordBindRule {
+ /** Regular expression matching a valid timeofday rule value (0-2359). */
+ private static final Pattern timeofdayRegex = Pattern.compile("[0-2]\\d[0-5]\\d");
/** Enumeration representing the bind rule operation type. */
private EnumBindRuleType type;
@@ -57,7 +53,7 @@
public static TimeOfDay decode(String expr, EnumBindRuleType type)
throws AciException {
int valueAsInt = 0;
- if (!Pattern.matches(timeofdayRegex, expr))
+ if (!timeofdayRegex.matcher(expr).matches())
{
LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_TIMEOFDAY.get(expr);
throw new AciException(message);
@@ -85,6 +81,7 @@
* @return An enumeration result representing the result of the
* evaluation.
*/
+ @Override
public EnumEvalResult evaluate(AciEvalContext evalCtx) {
EnumEvalResult matched=EnumEvalResult.FALSE;
@@ -129,7 +126,6 @@
return matched.getRet(type, false);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
@@ -138,11 +134,9 @@
return sb.toString();
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
buffer.append(super.toString());
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
index e2b81f8..643e7bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
@@ -12,24 +12,21 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
-import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.Control;
-import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import java.io.IOException;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
/**
* This class implements the Sun-defined account usable request control. The
@@ -39,13 +36,11 @@
public class AccountUsableRequestControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<AccountUsableRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public AccountUsableRequestControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -60,6 +55,7 @@
return new AccountUsableRequestControl(isCritical);
}
+ @Override
public String getOID()
{
return OID_ACCOUNT_USABLE_CONTROL;
@@ -67,16 +63,11 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<AccountUsableRequestControl> DECODER =
new Decoder();
- /**
- * Creates a new instance of the account usable request control with the
- * default settings.
- */
+ /** Creates a new instance of the account usable request control with the default settings. */
public AccountUsableRequestControl()
{
this(false);
@@ -93,28 +84,14 @@
public AccountUsableRequestControl(boolean isCritical)
{
super(OID_ACCOUNT_USABLE_CONTROL, isCritical);
-
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
protected void writeValue(ASN1Writer writer) throws IOException {
// No value element.
}
-
-
- /**
- * Appends a string representation of this account usable request control to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("AccountUsableRequestControl()");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
index 02ca4e4..51dccb9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
@@ -12,24 +12,25 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
-import org.forgerock.i18n.LocalizableMessage;
-
-import java.io.IOException;
-
-import org.forgerock.opendj.io.*;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import java.io.IOException;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
/**
* This class implements the account usable response control. This is a
@@ -52,13 +53,11 @@
public class AccountUsableResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<AccountUsableResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public AccountUsableResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -144,71 +143,41 @@
}
}
+ @Override
public String getOID()
{
return OID_ACCOUNT_USABLE_CONTROL;
}
-
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
- public static final ControlDecoder<AccountUsableResponseControl> DECODER =
- new Decoder();
+ /** The Control Decoder that can be used to decode this control. */
+ public static final ControlDecoder<AccountUsableResponseControl> DECODER = new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
- /**
- * The BER type to use for the seconds before expiration when the account is
- * available.
- */
+ /** The BER type to use for the seconds before expiration when the account is available. */
public static final byte TYPE_SECONDS_BEFORE_EXPIRATION = (byte) 0x80;
-
-
-
- /**
- * The BER type to use for the MORE_INFO sequence when the account is not
- * available.
- */
+ /** The BER type to use for the MORE_INFO sequence when the account is not available. */
public static final byte TYPE_MORE_INFO = (byte) 0xA1;
-
-
-
/**
* The BER type to use for the MORE_INFO element that indicates that the
* account has been inactivated.
*/
public static final byte TYPE_INACTIVE = (byte) 0x80;
-
-
-
/**
* The BER type to use for the MORE_INFO element that indicates that the
* password has been administratively reset.
*/
public static final byte TYPE_RESET = (byte) 0x81;
-
-
-
/**
* The BER type to use for the MORE_INFO element that indicates that the
* user's password is expired.
*/
public static final byte TYPE_EXPIRED = (byte) 0x82;
-
-
-
/**
* The BER type to use for the MORE_INFO element that provides the number of
* remaining grace logins.
*/
public static final byte TYPE_REMAINING_GRACE_LOGINS = (byte) 0x83;
-
-
-
/**
* The BER type to use for the MORE_INFO element that indicates that the
* password has been administratively reset.
@@ -216,19 +185,14 @@
public static final byte TYPE_SECONDS_BEFORE_UNLOCK = (byte) 0x84;
-
/** Indicates whether the user's account is usable. */
private boolean isUsable;
-
/** Indicates whether the user's password is expired. */
private boolean isExpired;
-
/** Indicates whether the user's account is inactive. */
private boolean isInactive;
-
/** Indicates whether the user's account is currently locked. */
private boolean isLocked;
-
/**
* Indicates whether the user's password has been reset and must be changed
* before anything else can be done.
@@ -237,13 +201,8 @@
/** The number of remaining grace logins, if available. */
private int remainingGraceLogins;
-
- /**
- * The length of time in seconds before the user's password expires, if
- * available.
- */
+ /** The length of time in seconds before the user's password expires, if available. */
private int secondsBeforeExpiration;
-
/** The length of time before the user's account is unlocked, if available. */
private int secondsBeforeUnlock;
@@ -374,13 +333,7 @@
isLocked, secondsBeforeUnlock);
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
@@ -538,14 +491,7 @@
return secondsBeforeUnlock;
}
-
-
- /**
- * Appends a string representation of this password policy response control to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("AccountUsableResponseControl(isUsable=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index 9ac8c19..d5542cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -39,13 +39,11 @@
public class AuthorizationIdentityResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<AuthorizationIdentityResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public AuthorizationIdentityResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -69,6 +67,7 @@
}
}
+ @Override
public String getOID()
{
return OID_AUTHZID_RESPONSE;
@@ -76,9 +75,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<AuthorizationIdentityResponseControl>
DECODER = new Decoder();
@@ -166,15 +163,7 @@
}
}
-
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeOctetString(authorizationID);
}
@@ -193,14 +182,7 @@
return authorizationID;
}
-
-
- /**
- * Appends a string representation of this authorization identity response
- * control to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("AuthorizationIdentityResponseControl(authzID=\"");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
index d3ec01a..43b622f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -15,22 +15,23 @@
* Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
-import org.forgerock.i18n.LocalizableMessage;
-
-import java.io.IOException;
-
-import org.forgerock.opendj.io.*;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import java.io.IOException;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
/**
* This class implements the entry change notification control defined in
@@ -40,13 +41,11 @@
public class EntryChangeNotificationControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<EntryChangeNotificationControl>
{
- /** {@inheritDoc} */
+ @Override
public EntryChangeNotificationControl decode(
boolean isCritical, ByteString value) throws DirectoryException
{
@@ -103,6 +102,7 @@
previousDN, changeNumber);
}
+ @Override
public String getOID()
{
return OID_ENTRY_CHANGE_NOTIFICATION;
@@ -110,9 +110,7 @@
}
- /**
- * The ControlDecoder that can be used to decode this control.
- */
+ /** The ControlDecoder that can be used to decode this control. */
public static final ControlDecoder<EntryChangeNotificationControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -216,15 +214,7 @@
this(false, changeType, previousDN, changeNumber);
}
-
-
- /**
- * Writes this control value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
@@ -282,14 +272,7 @@
return changeNumber;
}
-
-
- /**
- * Appends a string representation of this entry change notification control
- * to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("EntryChangeNotificationControl(changeType=");
@@ -309,4 +292,3 @@
buffer.append(")");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
index ec495de..5c697cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -12,9 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
+
import static org.opends.messages.ProtocolMessages.ERR_ECLN_CANNOT_DECODE_VALUE;
import static org.opends.messages.ProtocolMessages.ERR_ECLN_NO_CONTROL_VALUE;
import static org.opends.server.util.ServerConstants.*;
@@ -32,8 +33,6 @@
import org.opends.server.types.DirectoryException;
import org.forgerock.opendj.ldap.ResultCode;
-
-
/**
* This class implements the ECL cookie control.
* It may be included in entries returned in response to a search or
@@ -47,13 +46,11 @@
/** The cookie value - payload of this control. */
private String cookie;
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<EntryChangelogNotificationControl>
{
- /** {@inheritDoc} */
+ @Override
public EntryChangelogNotificationControl decode(
boolean isCritical, ByteString value)
throws DirectoryException
@@ -83,6 +80,7 @@
return new EntryChangelogNotificationControl(isCritical, cookie);
}
+ @Override
public String getOID()
{
return OID_ECL_COOKIE_EXCHANGE_CONTROL;
@@ -90,9 +88,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<EntryChangelogNotificationControl>
DECODER = new Decoder();
@@ -112,13 +108,7 @@
this.cookie = cookie;
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any)
- * must be written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
writer.writeStartSequence();
@@ -139,12 +129,7 @@
return cookie;
}
- /**
- * Appends a string representation of this entry change notification control
- * to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("EntryChangelogNotificationControl(cookie=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
index b33a1f0..b4934e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -12,22 +12,26 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-import org.forgerock.opendj.io.*;
-import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import java.io.IOException;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.SearchFilter;
+
/**
* This class implements the LDAP assertion request control as defined in RFC
@@ -39,13 +43,11 @@
public class LDAPAssertionRequestControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<LDAPAssertionRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public LDAPAssertionRequestControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -71,6 +73,7 @@
return new LDAPAssertionRequestControl(isCritical, filter);
}
+ @Override
public String getOID()
{
return OID_LDAP_ASSERTION;
@@ -78,9 +81,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<LDAPAssertionRequestControl> DECODER =
new Decoder();
@@ -113,15 +114,6 @@
filter = null;
}
-
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
@@ -157,18 +149,9 @@
{
filter = rawFilter.toSearchFilter();
}
-
return filter;
}
-
-
- /**
- * Appends a string representation of this LDAP assertion request control to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
@@ -179,4 +162,3 @@
buffer.append("\")");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
index a933eef..a79c12b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -46,13 +46,11 @@
*/
public class LDAPPostReadRequestControl extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder implements
ControlDecoder<LDAPPostReadRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public LDAPPostReadRequestControl decode(boolean isCritical,
ByteString value) throws DirectoryException
{
@@ -87,6 +85,7 @@
+ @Override
public String getOID()
{
return OID_LDAP_READENTRY_POSTREAD;
@@ -96,9 +95,7 @@
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<LDAPPostReadRequestControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
index 4c44638..adf9399 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -39,13 +39,11 @@
public class LDAPPostReadResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<LDAPPostReadResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public LDAPPostReadResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -78,6 +76,7 @@
return new LDAPPostReadResponseControl(isCritical, searchEntry);
}
+ @Override
public String getOID()
{
return OID_LDAP_READENTRY_POSTREAD;
@@ -85,9 +84,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<LDAPPostReadResponseControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -132,13 +129,6 @@
this.searchEntry = searchEntry;
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
index 433ee54..c14ced1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -46,13 +46,11 @@
*/
public class LDAPPreReadRequestControl extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder implements
ControlDecoder<LDAPPreReadRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public LDAPPreReadRequestControl decode(boolean isCritical,
ByteString value) throws DirectoryException
{
@@ -87,6 +85,7 @@
+ @Override
public String getOID()
{
return OID_LDAP_READENTRY_PREREAD;
@@ -96,9 +95,7 @@
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<LDAPPreReadRequestControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
index 386a191..66f2de2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -39,13 +39,11 @@
public class LDAPPreReadResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<LDAPPreReadResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public LDAPPreReadResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -78,6 +76,7 @@
return new LDAPPreReadResponseControl(isCritical, searchEntry);
}
+ @Override
public String getOID()
{
return OID_LDAP_READENTRY_PREREAD;
@@ -85,9 +84,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<LDAPPreReadResponseControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -132,15 +129,6 @@
this.searchEntry = searchEntry;
}
-
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
index 709ac8a..c3de390 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
@@ -44,13 +44,11 @@
public class MatchedValuesControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<MatchedValuesControl>
{
- /** {@inheritDoc} */
+ @Override
public MatchedValuesControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -95,6 +93,7 @@
}
+ @Override
public String getOID()
{
return OID_MATCHED_VALUES;
@@ -102,9 +101,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<MatchedValuesControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -135,15 +132,6 @@
this.filters = filters;
}
-
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
@@ -202,14 +190,6 @@
return false;
}
-
-
- /**
- * Appends a string representation of this authorization identity response
- * control to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
index c28df45..f86123f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -46,13 +46,11 @@
*/
public class PagedResultsControl extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PagedResultsControl>
{
- /** {@inheritDoc} */
+ @Override
public PagedResultsControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -116,6 +114,7 @@
return new PagedResultsControl(isCritical, size, cookie);
}
+ @Override
public String getOID()
{
return OID_PAGED_RESULTS_CONTROL;
@@ -123,9 +122,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PagedResultsControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -139,9 +136,7 @@
private int size;
- /**
- * The control value cookie element.
- */
+ /** The control value cookie element. */
private ByteString cookie;
@@ -170,14 +165,6 @@
}
}
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeStartSequence(ASN1.UNIVERSAL_OCTET_STRING_TYPE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
index f53e58e..6339c79 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -39,13 +39,11 @@
public class PasswordExpiredControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PasswordExpiredControl>
{
- /** {@inheritDoc} */
+ @Override
public PasswordExpiredControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -65,6 +63,7 @@
return new PasswordExpiredControl(isCritical);
}
+ @Override
public String getOID()
{
return OID_NS_PASSWORD_EXPIRED;
@@ -72,16 +71,11 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PasswordExpiredControl> DECODER =
new Decoder();
- /**
- * Creates a new instance of the password expired control with the default
- * settings.
- */
+ /** Creates a new instance of the password expired control with the default settings. */
public PasswordExpiredControl()
{
this(false);
@@ -99,13 +93,6 @@
super(OID_NS_PASSWORD_EXPIRED, isCritical);
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeOctetString("0");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
index ce1e041..d7a0e43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -40,13 +40,11 @@
public class PasswordExpiringControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PasswordExpiringControl>
{
- /** {@inheritDoc} */
+ @Override
public PasswordExpiringControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -76,6 +74,7 @@
secondsUntilExpiration);
}
+ @Override
public String getOID()
{
return OID_NS_PASSWORD_EXPIRING;
@@ -83,9 +82,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PasswordExpiringControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -130,14 +127,6 @@
this.secondsUntilExpiration = secondsUntilExpiration;
}
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
writer.writeOctetString(String.valueOf(secondsUntilExpiration));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
index 60676b4..8dd05a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -38,13 +38,11 @@
public class PasswordPolicyRequestControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PasswordPolicyRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public PasswordPolicyRequestControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -59,6 +57,7 @@
return new PasswordPolicyRequestControl(isCritical);
}
+ @Override
public String getOID()
{
return OID_PASSWORD_POLICY_CONTROL;
@@ -66,17 +65,12 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PasswordPolicyRequestControl> DECODER =
new Decoder();
- /**
- * Creates a new instance of the password policy request control with the
- * default settings.
- */
+ /** Creates a new instance of the password policy request control with the default settings. */
public PasswordPolicyRequestControl()
{
this(false);
@@ -98,28 +92,11 @@
}
-
-
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must be
- * written as an ASN1OctetString.
- *
- * @param writer The ASN.1 output stream to write to.
- * @throws IOException If a problem occurs while writing to the stream.
- */
@Override
public void writeValue(ASN1Writer writer) throws IOException {
// No value element.
}
-
-
- /**
- * Appends a string representation of this password policy request control to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
index 381010f..98415c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -40,13 +40,11 @@
public class PasswordPolicyResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PasswordPolicyResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public PasswordPolicyResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -120,6 +118,7 @@
}
+ @Override
public String getOID()
{
return OID_ACCOUNT_USABLE_CONTROL;
@@ -127,9 +126,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PasswordPolicyResponseControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -137,16 +134,12 @@
- /**
- * The BER type value for the warning element of the control value.
- */
+ /** The BER type value for the warning element of the control value. */
public static final byte TYPE_WARNING_ELEMENT = (byte) 0xA0;
- /**
- * The BER type value for the error element of the control value.
- */
+ /** The BER type value for the error element of the control value. */
public static final byte TYPE_ERROR_ELEMENT = (byte) 0x81;
@@ -292,14 +285,6 @@
return errorType;
}
-
-
- /**
- * Appends a string representation of this password policy response control to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
index 3554ae9..a3be2e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -40,13 +40,11 @@
public class PersistentSearchControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<PersistentSearchControl>
{
- /** {@inheritDoc} */
+ @Override
public PersistentSearchControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -90,6 +88,7 @@
changeTypes, changesOnly, returnECs);
}
+ @Override
public String getOID()
{
return OID_PERSISTENT_SEARCH;
@@ -97,9 +96,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<PersistentSearchControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
index f3d5785..9c23022 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -45,13 +45,10 @@
public class ProxiedAuthV1Control
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<ProxiedAuthV1Control>
{
- /** {@inheritDoc} */
@Override
public ProxiedAuthV1Control decode(boolean isCritical, ByteString value)
throws DirectoryException
@@ -96,9 +93,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<ProxiedAuthV1Control> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
index 26425fd..b4a2bb4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -46,13 +46,10 @@
public class ProxiedAuthV2Control
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<ProxiedAuthV2Control>
{
- /** {@inheritDoc} */
@Override
public ProxiedAuthV2Control decode(boolean isCritical, ByteString value)
throws DirectoryException
@@ -105,9 +102,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<ProxiedAuthV2Control> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -317,14 +312,6 @@
}
}
-
-
- /**
- * Appends a string representation of this proxied authorization v2 control
- * to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
index 29cf785..b1df88c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -58,26 +58,19 @@
public class ServerSideSortRequestControl
extends Control
{
- /**
- * The BER type to use when encoding the orderingRule element.
- */
+ /** The BER type to use when encoding the orderingRule element. */
private static final byte TYPE_ORDERING_RULE_ID = (byte) 0x80;
- /**
- * The BER type to use when encoding the reverseOrder element.
- */
+ /** The BER type to use when encoding the reverseOrder element. */
private static final byte TYPE_REVERSE_ORDER = (byte) 0x81;
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<ServerSideSortRequestControl>
{
- /** {@inheritDoc} */
@Override
public ServerSideSortRequestControl decode(boolean isCritical,
ByteString value)
@@ -171,9 +164,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<ServerSideSortRequestControl> DECODER =
new Decoder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
index 6fffb36..47b7c90 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -65,13 +65,11 @@
public class ServerSideSortResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<ServerSideSortResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public ServerSideSortResponseControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -107,6 +105,7 @@
}
}
+ @Override
public String getOID()
{
return OID_SERVER_SIDE_SORT_RESPONSE_CONTROL;
@@ -114,15 +113,11 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<ServerSideSortResponseControl> DECODER =
new Decoder();
- /**
- * The BER type to use when encoding the attribute type element.
- */
+ /** The BER type to use when encoding the attribute type element. */
private static final byte TYPE_ATTRIBUTE_TYPE = (byte) 0x80;
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 6e7b97e..9b3a9d1 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -36,13 +36,11 @@
public class SubentriesControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<SubentriesControl>
{
- /** {@inheritDoc} */
+ @Override
public SubentriesControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -70,6 +68,7 @@
return new SubentriesControl(isCritical, visibility);
}
+ @Override
public String getOID()
{
return OID_LDAP_SUBENTRIES;
@@ -77,9 +76,7 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<SubentriesControl> DECODER =
new Decoder();
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
index e706495..1206b64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -39,14 +39,11 @@
*/
public class SubtreeDeleteControl extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a
- * ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder implements
ControlDecoder<SubtreeDeleteControl>
{
- /** {@inheritDoc} */
+ @Override
public SubtreeDeleteControl decode(boolean isCritical,
ByteString value) throws DirectoryException
{
@@ -62,6 +59,7 @@
+ @Override
public String getOID()
{
return OID_SUBTREE_DELETE_CONTROL;
@@ -71,9 +69,7 @@
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<SubtreeDeleteControl> DECODER =
new Decoder();
@@ -93,7 +89,6 @@
- /** {@inheritDoc} */
@Override
protected void writeValue(ASN1Writer writer) throws IOException
{
@@ -102,7 +97,6 @@
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
index 2957fc7..341d1aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -52,13 +52,11 @@
public class VLVRequestControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<VLVRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public VLVRequestControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -126,6 +124,7 @@
}
}
+ @Override
public String getOID()
{
return OID_VLV_REQUEST_CONTROL;
@@ -133,22 +132,16 @@
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<VLVRequestControl> DECODER =
new Decoder();
- /**
- * The BER type to use when encoding the byOffset target element.
- */
+ /** The BER type to use when encoding the byOffset target element. */
public static final byte TYPE_TARGET_BYOFFSET = (byte) 0xA0;
- /**
- * The BER type to use when encoding the greaterThanOrEqual target element.
- */
+ /** The BER type to use when encoding the greaterThanOrEqual target element. */
public static final byte TYPE_TARGET_GREATERTHANOREQUAL = (byte) 0x81;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
index f975721..36c1511 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
@@ -58,13 +58,11 @@
public class VLVResponseControl
extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<VLVResponseControl>
{
- /** {@inheritDoc} */
+ @Override
public VLVResponseControl decode(boolean isCritical, ByteString value)
throws DirectoryException
{
@@ -100,16 +98,14 @@
}
}
- /** {@inheritDoc} */
+ @Override
public String getOID()
{
return OID_VLV_RESPONSE_CONTROL;
}
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<VLVResponseControl> DECODER =
new Decoder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
index a6245f6..0f876a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
@@ -39,11 +39,9 @@
PreParseAbandonOperation,
PostOperationAbandonOperation
{
-
/** The message ID of the operation that should be abandoned. */
private final int idToAbandon;
-
/**
* Creates a new abandon operation with the provided information.
*
@@ -65,14 +63,11 @@
{
super(clientConnection, operationID, messageID, requestControls);
-
this.idToAbandon = idToAbandon;
this.cancelResult = new CancelResult(ResultCode.CANNOT_CANCEL,
ERR_CANNOT_CANCEL_ABANDON.get());
}
-
-
/**
* Retrieves the message ID of the operation that should be abandoned.
*
@@ -84,26 +79,17 @@
return idToAbandon;
}
-
-
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return null;
}
-
-
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
}
-
-
- /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -113,9 +99,6 @@
return OperationType.ABANDON;
}
-
-
- /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
@@ -124,26 +107,18 @@
return NO_RESPONSE_CONTROLS;
}
-
-
- /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
// An abandon operation can never have a response, so just ignore this.
}
-
-
- /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
// An abandon operation can never have a response, so just ignore this.
}
-
-
/**
* Performs the work of actually processing this operation. This
* should include all processing for the operation, including
@@ -174,7 +149,6 @@
// code to reflect whether the abandon was successful and an error message
// if it was not. Even though there is no response, the result should
// still be logged.
- //
// Even though it is technically illegal to send a response for
// operations that have been abandoned, it may be a good idea to do so
// to ensure that the requestor isn't left hanging. This will be a
@@ -198,18 +172,13 @@
}
}
-
// Stop the processing timer.
setProcessingStopTime();
-
// Log the result of the abandon operation.
logAbandonResult(this);
}
-
-
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java
index 150c10d..c97fbcd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationWrapper.java
@@ -11,11 +11,10 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.core;
-
/**
* This abstract class wraps/decorates a given abandon operation. This class
* will be extended by sub-classes to enhance the functionality of the
@@ -24,7 +23,6 @@
public abstract class AbandonOperationWrapper extends
OperationWrapper<AbandonOperation> implements AbandonOperation
{
-
/**
* Creates a new abandon operation wrapper based on the provided abandon
* operation.
@@ -37,11 +35,9 @@
super(abandon);
}
- /** {@inheritDoc} */
@Override
public int getIDToAbandon()
{
return getOperation().getIDToAbandon();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 3270356..2b9eaa7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -51,11 +51,7 @@
ConfigurationAddListener <AccountStatusNotificationHandlerCfg>,
ConfigurationDeleteListener <AccountStatusNotificationHandlerCfg>
{
-
- /**
- * A mapping between the DNs of the config entries and the associated
- * notification handlers.
- */
+ /** A mapping between the DNs of the config entries and the associated notification handlers. */
private final ConcurrentHashMap<DN,AccountStatusNotificationHandler> notificationHandlers;
private final ServerContext serverContext;
@@ -72,8 +68,6 @@
notificationHandlers = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all account status notification handlers currently defined in
* the Directory Server configuration. This should only be called at
@@ -118,9 +112,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
AccountStatusNotificationHandlerCfg configuration,
@@ -150,9 +141,6 @@
return status;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
AccountStatusNotificationHandlerCfg configuration
@@ -208,9 +196,6 @@
return changeResult;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
AccountStatusNotificationHandlerCfg configuration,
@@ -249,9 +234,6 @@
return status;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
AccountStatusNotificationHandlerCfg configuration
@@ -282,9 +264,6 @@
return changeResult;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
AccountStatusNotificationHandlerCfg configuration,
@@ -295,9 +274,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
AccountStatusNotificationHandlerCfg configuration
@@ -307,7 +283,6 @@
return new ConfigChangeResult();
}
-
/**
* Loads the specified class, instantiates it as a notification handler,
* and optionally initializes that instance. Any initialized notification
@@ -342,7 +317,6 @@
);
}
-
/**
* Loads the specified class, instantiates it as a notification handler,
* and optionally initializes that instance.
@@ -402,7 +376,6 @@
}
}
-
/**
* Remove a notification handler that has been installed in the server.
*
@@ -424,4 +397,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java
index a04eac1..803800d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperation.java
@@ -177,6 +177,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
DN getProxiedAuthorizationDN();
/**
@@ -188,6 +189,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java
index 862511a..2dfb382 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationWrapper.java
@@ -32,7 +32,6 @@
public abstract class AddOperationWrapper extends
OperationWrapper<AddOperation> implements AddOperation
{
-
/**
* Creates a new add operation based on the provided add operation.
*
@@ -43,77 +42,66 @@
super(add);
}
- /** {@inheritDoc} */
@Override
public void addObjectClass(ObjectClass objectClass, String name)
{
getOperation().addObjectClass(objectClass, name);
}
- /** {@inheritDoc} */
@Override
public void addRawAttribute(RawAttribute rawAttribute)
{
getOperation().addRawAttribute(rawAttribute);
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN()
{
return getOperation().getEntryDN();
}
- /** {@inheritDoc} */
@Override
public Map<ObjectClass, String> getObjectClasses()
{
return getOperation().getObjectClasses();
}
- /** {@inheritDoc} */
@Override
public Map<AttributeType, List<Attribute>> getOperationalAttributes()
{
return getOperation().getOperationalAttributes();
}
- /** {@inheritDoc} */
@Override
public List<RawAttribute> getRawAttributes()
{
return getOperation().getRawAttributes();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawEntryDN()
{
return getOperation().getRawEntryDN();
}
- /** {@inheritDoc} */
@Override
public Map<AttributeType, List<Attribute>> getUserAttributes()
{
return getOperation().getUserAttributes();
}
- /** {@inheritDoc} */
@Override
public void removeAttribute(AttributeType attributeType)
{
getOperation().removeAttribute(attributeType);
}
- /** {@inheritDoc} */
@Override
public void removeObjectClass(ObjectClass objectClass)
{
getOperation().removeObjectClass(objectClass);
}
- /** {@inheritDoc} */
@Override
public void setAttribute(AttributeType attributeType,
List<Attribute> attributeList)
@@ -121,25 +109,21 @@
getOperation().setAttribute(attributeType, attributeList);
}
- /** {@inheritDoc} */
@Override
public void setRawAttributes(List<RawAttribute> rawAttributes)
{
getOperation().setRawAttributes(rawAttributes);
}
- /** {@inheritDoc} */
@Override
public void setRawEntryDN(ByteString rawEntryDN)
{
getOperation().setRawEntryDN(rawEntryDN);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return getOperation().toString();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
index 2c53212..030a108 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
@@ -50,9 +50,7 @@
implements ConfigurationChangeListener<AlertHandlerCfg>,
ConfigurationAddListener<AlertHandlerCfg>,
ConfigurationDeleteListener<AlertHandlerCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** A mapping between the DNs of the config entries and the associated alert handlers. */
@@ -90,7 +88,6 @@
rootConfiguration.addAlertHandlerAddListener(this);
rootConfiguration.addAlertHandlerDeleteListener(this);
-
//Initialize the existing alert handlers.
for (String name : rootConfiguration.listAlertHandlers())
{
@@ -115,9 +112,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(AlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -142,9 +136,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(AlertHandlerCfg configuration)
{
@@ -180,9 +171,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
AlertHandlerCfg configuration,
@@ -193,9 +181,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
AlertHandlerCfg configuration)
@@ -212,9 +197,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(AlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -239,20 +221,15 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
AlertHandlerCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing alert handler if it's already enabled.
AlertHandler<?> existingHandler = alertHandlers.get(configuration.dn());
-
// If the new configuration has the handler disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -271,7 +248,6 @@
return ccr;
}
-
// Get the class for the alert handler. If the handler is already enabled,
// then we shouldn't do anything with it although if the class has changed
// then we'll at least need to indicate that administrative action is
@@ -308,8 +284,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as an alert handler, and
* optionally initializes that instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
index fd22525..4c4ca33 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -53,15 +53,10 @@
implements ConfigurationChangeListener<AttributeSyntaxCfg>,
ConfigurationAddListener<AttributeSyntaxCfg>,
ConfigurationDeleteListener<AttributeSyntaxCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated
- * attribute syntaxes.
- */
+ /** A mapping between the DNs of the config entries and the associated attribute syntaxes. */
private ConcurrentHashMap<DN,AttributeSyntax> syntaxes;
private final ServerContext serverContext;
@@ -78,8 +73,6 @@
syntaxes = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all attribute syntaxes currently defined in the Directory
* Server configuration. This should only be called at Directory Server
@@ -99,7 +92,6 @@
rootConfiguration.addAttributeSyntaxAddListener(this);
rootConfiguration.addAttributeSyntaxDeleteListener(this);
-
//Initialize the existing attribute syntaxes.
for (String name : rootConfiguration.listAttributeSyntaxes())
{
@@ -142,9 +134,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
AttributeSyntaxCfg configuration,
@@ -170,9 +159,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
AttributeSyntaxCfg configuration)
@@ -216,9 +202,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
AttributeSyntaxCfg configuration,
@@ -248,9 +231,6 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
AttributeSyntaxCfg configuration)
@@ -276,9 +256,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
AttributeSyntaxCfg configuration,
@@ -324,19 +301,14 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(AttributeSyntaxCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing syntax if it's already enabled.
AttributeSyntax<?> existingSyntax = syntaxes.get(configuration.dn());
-
// If the new configuration has the syntax disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -363,7 +335,6 @@
return ccr;
}
-
// Get the class for the attribute syntax. If the syntax is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -406,8 +377,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as an attribute syntax, and
* optionally initializes that instance.
@@ -464,4 +433,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
index 588f296..d2a9ea0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
@@ -92,9 +92,7 @@
/** The SASL mechanism used for SASL authentication. */
private String saslMechanism;
- /**
- * A string representation of the protocol version for this bind operation.
- */
+ /** A string representation of the protocol version for this bind operation. */
private String protocolVersion;
/**
@@ -128,8 +126,6 @@
cancelResult = getBindCancelResult();
}
-
-
/**
* Creates a new SASL bind operation with the provided information.
*
@@ -196,8 +192,6 @@
cancelResult = getBindCancelResult();
}
-
-
/**
* Creates a new SASL bind operation with the provided information.
*
@@ -246,34 +240,29 @@
return new CancelResult(CANNOT_CANCEL, ERR_CANNOT_CANCEL_BIND.get());
}
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return null;
}
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
}
- /** {@inheritDoc} */
@Override
public final AuthenticationType getAuthenticationType()
{
return authType;
}
- /** {@inheritDoc} */
@Override
public final ByteString getRawBindDN()
{
return rawBindDN;
}
- /** {@inheritDoc} */
@Override
public final void setRawBindDN(ByteString rawBindDN)
{
@@ -315,7 +304,6 @@
return simplePassword;
}
- /** {@inheritDoc} */
@Override
public final void setSimplePassword(ByteString simplePassword)
{
@@ -333,21 +321,18 @@
saslCredentials = null;
}
- /** {@inheritDoc} */
@Override
public final String getSASLMechanism()
{
return saslMechanism;
}
- /** {@inheritDoc} */
@Override
public final ByteString getSASLCredentials()
{
return saslCredentials;
}
- /** {@inheritDoc} */
@Override
public final void setSASLCredentials(String saslMechanism,
ByteString saslCredentials)
@@ -359,42 +344,36 @@
simplePassword = null;
}
- /** {@inheritDoc} */
@Override
public final ByteString getServerSASLCredentials()
{
return serverSASLCredentials;
}
- /** {@inheritDoc} */
@Override
public final void setServerSASLCredentials(ByteString serverSASLCredentials)
{
this.serverSASLCredentials = serverSASLCredentials;
}
- /** {@inheritDoc} */
@Override
public final Entry getSASLAuthUserEntry()
{
return saslAuthUserEntry;
}
- /** {@inheritDoc} */
@Override
public final void setSASLAuthUserEntry(Entry saslAuthUserEntry)
{
this.saslAuthUserEntry = saslAuthUserEntry;
}
- /** {@inheritDoc} */
@Override
public final LocalizableMessage getAuthFailureReason()
{
return authFailureReason;
}
- /** {@inheritDoc} */
@Override
public final void setAuthFailureReason(LocalizableMessage message)
{
@@ -408,28 +387,24 @@
}
}
- /** {@inheritDoc} */
@Override
public final DN getUserEntryDN()
{
return userEntryDN;
}
- /** {@inheritDoc} */
@Override
public final AuthenticationInfo getAuthenticationInfo()
{
return authInfo;
}
- /** {@inheritDoc} */
@Override
public final void setAuthenticationInfo(AuthenticationInfo authInfo)
{
this.authInfo = authInfo;
}
- /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -438,28 +413,24 @@
return OperationType.BIND;
}
- /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
return responseControls;
}
- /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
responseControls.add(control);
}
- /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
responseControls.remove(control);
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
@@ -478,28 +449,24 @@
buffer.append(")");
}
- /** {@inheritDoc} */
@Override
public void setUserEntryDN(DN userEntryDN)
{
this.userEntryDN = userEntryDN;
}
- /** {@inheritDoc} */
@Override
public String getProtocolVersion()
{
return protocolVersion;
}
- /** {@inheritDoc} */
@Override
public void setProtocolVersion(String protocolVersion)
{
this.protocolVersion = protocolVersion;
}
- /** {@inheritDoc} */
@Override
public final void run()
{
@@ -520,7 +487,6 @@
CancelRequest cancelRequest = new CancelRequest(true, cancelReason);
clientConnection.cancelAllOperationsExcept(cancelRequest, getMessageID());
-
// This flag is set to true as soon as a workflow has been executed.
boolean workflowExecuted = false;
try
@@ -531,7 +497,6 @@
return;
}
-
// Process the bind DN to convert it from the raw form as provided by the
// client into the form required for the rest of the bind processing.
DN bindDN = getBindDN();
@@ -616,7 +581,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void updateOperationErrMsgAndResCode()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
index a4e9e04..5f1e795 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
@@ -39,91 +39,78 @@
super(bind);
}
- /** {@inheritDoc} */
@Override
public AuthenticationInfo getAuthenticationInfo()
{
return getOperation().getAuthenticationInfo();
}
- /** {@inheritDoc} */
@Override
public AuthenticationType getAuthenticationType()
{
return getOperation().getAuthenticationType();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage getAuthFailureReason()
{
return getOperation().getAuthFailureReason();
}
- /** {@inheritDoc} */
@Override
public DN getBindDN()
{
return getOperation().getBindDN();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawBindDN()
{
return getOperation().getRawBindDN();
}
- /** {@inheritDoc} */
@Override
public Entry getSASLAuthUserEntry()
{
return getOperation().getSASLAuthUserEntry();
}
- /** {@inheritDoc} */
@Override
public ByteString getSASLCredentials()
{
return getOperation().getSASLCredentials();
}
- /** {@inheritDoc} */
@Override
public String getSASLMechanism()
{
return getOperation().getSASLMechanism();
}
- /** {@inheritDoc} */
@Override
public ByteString getServerSASLCredentials()
{
return getOperation().getServerSASLCredentials();
}
- /** {@inheritDoc} */
@Override
public ByteString getSimplePassword()
{
return getOperation().getSimplePassword();
}
- /** {@inheritDoc} */
@Override
public DN getUserEntryDN()
{
return getOperation().getUserEntryDN();
}
- /** {@inheritDoc} */
@Override
public void setAuthenticationInfo(AuthenticationInfo authInfo)
{
getOperation().setAuthenticationInfo(authInfo);
}
- /** {@inheritDoc} */
@Override
public void setAuthFailureReason(LocalizableMessage reason)
{
@@ -137,21 +124,18 @@
}
}
- /** {@inheritDoc} */
@Override
public void setRawBindDN(ByteString rawBindDN)
{
getOperation().setRawBindDN(rawBindDN);
}
- /** {@inheritDoc} */
@Override
public void setSASLAuthUserEntry(Entry saslAuthUserEntry)
{
getOperation().setSASLAuthUserEntry(saslAuthUserEntry);
}
- /** {@inheritDoc} */
@Override
public void setSASLCredentials(String saslMechanism,
ByteString saslCredentials)
@@ -159,45 +143,38 @@
getOperation().setSASLCredentials(saslMechanism, saslCredentials);
}
- /** {@inheritDoc} */
@Override
public void setServerSASLCredentials(ByteString serverSASLCredentials)
{
getOperation().setServerSASLCredentials(serverSASLCredentials);
}
- /** {@inheritDoc} */
@Override
public void setSimplePassword(ByteString simplePassword)
{
getOperation().setSimplePassword(simplePassword);
}
- /** {@inheritDoc} */
@Override
public void setUserEntryDN(DN userEntryDN){
getOperation().setUserEntryDN(userEntryDN);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return getOperation().toString();
}
- /** {@inheritDoc} */
@Override
public void setProtocolVersion(String protocolVersion)
{
getOperation().setProtocolVersion(protocolVersion);
}
- /** {@inheritDoc} */
@Override
public String getProtocolVersion()
{
return getOperation().getProtocolVersion();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java
index 2a5859e..d68b860 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BoundedWorkQueueStrategy.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2014 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -28,11 +28,7 @@
*/
public class BoundedWorkQueueStrategy implements QueueingStrategy
{
-
- /**
- * The number of concurrently running operations for this
- * BoundedWorkQueueStrategy.
- */
+ /** The number of concurrently running operations for this BoundedWorkQueueStrategy. */
private final AtomicInteger nbRunningOperations = new AtomicInteger(0);
/** Maximum number of concurrent operations. 0 means "unlimited". */
private final int maxNbConcurrentOperations;
@@ -70,7 +66,6 @@
return DirectoryServer.getWorkQueue().getNumWorkerThreads();
}
- /** {@inheritDoc} */
@Override
public void enqueueRequest(final Operation operation)
throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
index 2dacf92..a45c602 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
@@ -51,15 +51,10 @@
implements ConfigurationChangeListener<CertificateMapperCfg>,
ConfigurationAddListener<CertificateMapperCfg>,
ConfigurationDeleteListener<CertificateMapperCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated
- * certificate mappers.
- */
+ /** A mapping between the DNs of the config entries and the associated certificate mappers. */
private ConcurrentHashMap<DN,CertificateMapper> certificateMappers;
private final ServerContext serverContext;
@@ -95,7 +90,6 @@
rootConfiguration.addCertificateMapperAddListener(this);
rootConfiguration.addCertificateMapperDeleteListener(this);
-
//Initialize the existing certificate mappers.
for (String mapperName : rootConfiguration.listCertificateMappers())
{
@@ -122,7 +116,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
CertificateMapperCfg configuration,
@@ -148,7 +141,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
CertificateMapperCfg configuration)
@@ -186,7 +178,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
CertificateMapperCfg configuration,
@@ -197,7 +188,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
CertificateMapperCfg configuration)
@@ -216,7 +206,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
CertificateMapperCfg configuration,
@@ -242,19 +231,16 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
CertificateMapperCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing mapper if it's already enabled.
CertificateMapper existingMapper =
certificateMappers.get(configuration.dn());
-
// If the new configuration has the mapper disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -274,7 +260,6 @@
return ccr;
}
-
// Get the class for the certificate mapper. If the mapper is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -311,8 +296,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a certificate mapper, and
* optionally initializes that instance.
@@ -373,4 +356,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
index bc31caa..2f719f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -55,7 +55,6 @@
ConfigurationChangeListener<ConnectionHandlerCfg> {
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/**
* The mapping between configuration entry DNs and their corresponding
* connection handler implementations.
@@ -75,7 +74,6 @@
connectionHandlers = new ConcurrentHashMap<>();
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
ConnectionHandlerCfg configuration) {
@@ -117,9 +115,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
ConnectionHandlerCfg configuration) {
@@ -176,7 +171,6 @@
.deregisterConnectionHandler(connectionHandler);
connectionHandlers.remove(dn);
-
connectionHandler.finalizeConnectionHandler(
INFO_CONNHANDLER_CLOSED_BY_DISABLE.get());
}
@@ -185,9 +179,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
ConnectionHandlerCfg configuration) {
@@ -209,8 +200,6 @@
return ccr;
}
-
-
/**
* Initializes the configuration associated with the Directory
* Server connection handlers. This should only be called at
@@ -231,7 +220,6 @@
initializeAdministrationConnectorConfig();
-
RootCfg root = serverContext.getRootConfig();
root.addConnectionHandlerAddListener(this);
root.addConnectionHandlerDeleteListener(this);
@@ -265,8 +253,6 @@
}
}
-
-
private void initializeAdministrationConnectorConfig()
throws ConfigException, InitializationException {
AdministrationConnectorCfg administrationConnectorCfg =
@@ -284,8 +270,6 @@
DirectoryServer.registerConnectionHandler(connectionHandler);
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
ConnectionHandlerCfg configuration,
@@ -294,9 +278,6 @@
|| isJavaClassAcceptable(configuration, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
ConnectionHandlerCfg configuration,
@@ -305,9 +286,6 @@
|| isJavaClassAcceptable(configuration, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
ConnectionHandlerCfg configuration,
@@ -316,8 +294,6 @@
return true;
}
-
-
/** Load and initialize the connection handler named in the config. */
private <T extends ConnectionHandlerCfg> ConnectionHandler<T> getConnectionHandler(
T config) throws ConfigException
@@ -344,12 +320,7 @@
}
}
-
-
- /**
- * Determines whether or not the new configuration's implementation
- * class is acceptable.
- */
+ /** Determines whether or not the new configuration's implementation class is acceptable. */
private boolean isJavaClassAcceptable(
ConnectionHandlerCfg config,
List<LocalizableMessage> unacceptableReasons) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
index 8de9bfe..621b5fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
@@ -34,9 +34,7 @@
class DefaultAccessControlHandler
extends AccessControlHandler<AccessControlHandlerCfg>
{
- /**
- * Create a new default access control handler.
- */
+ /** Create a new default access control handler. */
public DefaultAccessControlHandler()
{
super();
@@ -44,9 +42,6 @@
// No implementation required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeAccessControlHandler(AccessControlHandlerCfg
configuration)
@@ -55,98 +50,66 @@
// No implementation required.
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeAccessControlHandler()
{
// No implementation required.
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(LocalBackendAddOperation addOperation)
{
return true;
}
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(BindOperation bindOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(LocalBackendCompareOperation compareOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(LocalBackendDeleteOperation deleteOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(ExtendedOperation extendedOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(LocalBackendModifyOperation modifyOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(DN dn, Operation op, Control control)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(ModifyDNOperation modifyDNOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(SearchOperation searchOperation)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isAllowed(Operation operation, Entry entry,
SearchFilter filter) throws DirectoryException
@@ -154,18 +117,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean maySend(Operation operation, SearchResultEntry unfilteredEntry)
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public void filterEntry(Operation operation,
SearchResultEntry unfilteredEntry, SearchResultEntry filteredEntry)
@@ -173,9 +130,6 @@
return;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean maySend(DN dn, Operation operation,
SearchResultReference searchReference)
@@ -183,13 +137,9 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean mayProxy(Entry proxyUser, Entry proxiedUser,
Operation operation) {
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
index 538976c..39b3a68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
@@ -49,8 +49,6 @@
/** Synchronizes calls to save. */
private final Object saveLock = new Object();
-
-
/**
* Creates a new instance of this compressed schema manager.
*
@@ -63,9 +61,6 @@
load();
}
-
-
- /** {@inheritDoc} */
@Override
protected void storeAttribute(final byte[] encodedAttribute,
final String attributeName, final Iterable<String> attributeOptions)
@@ -74,9 +69,6 @@
save();
}
-
-
- /** {@inheritDoc} */
@Override
protected void storeObjectClasses(final byte[] encodedObjectClasses,
final Collection<String> objectClassNames) throws DirectoryException
@@ -84,11 +76,7 @@
save();
}
-
-
- /**
- * Loads the compressed schema information from disk.
- */
+ /** Loads the compressed schema information from disk. */
private void load()
{
FileInputStream inputStream = null;
@@ -169,8 +157,6 @@
}
}
-
-
/**
* Writes the compressed schema information to disk.
*
@@ -276,5 +262,4 @@
}
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java
index 804cfea..3556067 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperation.java
@@ -64,6 +64,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
DN getProxiedAuthorizationDN();
/**
@@ -75,6 +76,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java
index eb58afa..d00d3f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationWrapper.java
@@ -27,7 +27,6 @@
public abstract class DeleteOperationWrapper extends
OperationWrapper<DeleteOperation> implements DeleteOperation
{
-
/**
* Creates a new delete operation based on the provided delete operation.
*
@@ -38,32 +37,27 @@
super(delete);
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN()
{
return getOperation().getEntryDN();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawEntryDN()
{
return getOperation().getRawEntryDN();
}
- /** {@inheritDoc} */
@Override
public void setRawEntryDN(ByteString rawEntryDN)
{
getOperation().setRawEntryDN(rawEntryDN);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return getOperation().toString();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java
index 9545e3d..d787b71 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServerShutdownHook.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -55,6 +55,7 @@
/**
* Invokes the shutdown hook to signal the Directory Server to stop running.
*/
+ @Override
public void run()
{
logger.trace(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
index d7dc6d6..6af2171 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -83,7 +83,6 @@
this.serverContext = serverContext;
}
-
/**
* Initializes the default entry cache.
* This should only be called at Directory Server startup.
@@ -109,10 +108,8 @@
stackTraceToSingleLineString(e));
throw new InitializationException(message, e);
}
-
}
-
/**
* Initializes the configuration associated with the Directory Server entry
* cache. This should only be called at Directory Server startup. If an
@@ -188,8 +185,6 @@
}
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
EntryCacheCfg configuration,
@@ -230,8 +225,6 @@
return status;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
EntryCacheCfg configuration
@@ -315,8 +308,6 @@
return changeResult;
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
EntryCacheCfg configuration,
@@ -353,8 +344,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(EntryCacheCfg configuration)
{
@@ -383,8 +372,6 @@
return changeResult;
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
EntryCacheCfg configuration,
@@ -397,8 +384,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
EntryCacheCfg configuration
@@ -437,7 +422,6 @@
return changeResult;
}
-
/**
* Loads the specified class, instantiates it as an entry cache,
* and optionally initializes that instance. Any initialize entry
@@ -584,5 +568,4 @@
throw new InitializationException(message, e);
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
index 468e9ec..a50fc01 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
@@ -43,10 +43,7 @@
import org.opends.server.types.operation.PreOperationExtendedOperation;
import org.opends.server.types.operation.PreParseExtendedOperation;
-/**
- * This class defines an extended operation, which can perform virtually any
- * kind of task.
- */
+/** This class defines an extended operation, which can perform virtually any kind of task. */
public class ExtendedOperationBasis
extends AbstractOperation
implements ExtendedOperation,
@@ -72,8 +69,6 @@
/** The OID for the response associated with this extended operation. */
private String responseOID;
-
-
/**
* Creates a new extended operation with the provided information.
*
@@ -95,7 +90,6 @@
{
super(clientConnection, operationID, messageID, requestControls);
-
this.requestOID = requestOID;
this.requestValue = requestValue;
@@ -116,17 +110,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public final String getRequestOID()
{
return requestOID;
}
-
-
/**
* Specifies the OID for the request associated with this extended operation.
* This should only be called by pre-parse plugins.
@@ -140,33 +129,23 @@
this.requestOID = requestOID;
}
-
-
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return null;
}
-
-
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
}
-
- /** {@inheritDoc} */
@Override
public final ByteString getRequestValue()
{
return requestValue;
}
-
-
/**
* Specifies the value for the request associated with this extended
* operation. This should only be called by pre-parse plugins.
@@ -180,44 +159,30 @@
this.requestValue = requestValue;
}
-
-
- /** {@inheritDoc} */
@Override
public final String getResponseOID()
{
return responseOID;
}
-
-
- /** {@inheritDoc} */
@Override
public final void setResponseOID(String responseOID)
{
this.responseOID = responseOID;
}
-
-
- /** {@inheritDoc} */
@Override
public final ByteString getResponseValue()
{
return responseValue;
}
-
-
- /** {@inheritDoc} */
@Override
public final void setResponseValue(ByteString responseValue)
{
this.responseValue = responseValue;
}
-
- /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -226,35 +191,24 @@
return OperationType.EXTENDED;
}
-
-
- /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
return responseControls;
}
-
-
- /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
responseControls.add(control);
}
-
-
- /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
responseControls.remove(control);
}
-
-
/**
* Performs the work of actually processing this operation. This
* should include all processing for the operation, including
@@ -285,7 +239,6 @@
checkIfCanceled(false);
-
// Get the extended operation handler for the request OID. If there is
// none, then fail.
ExtendedOperationHandler<?> handler =
@@ -297,7 +250,6 @@
return;
}
-
// Look at the controls included in the request and ensure that all
// critical controls are supported by the handler.
for (Iterator<Control> iter = getRequestControls().iterator(); iter.hasNext();)
@@ -341,7 +293,6 @@
}
}
-
// Check to see if the client has permission to perform the
// extended operation.
@@ -376,13 +327,11 @@
// Actually perform the processing for this operation.
handler.processExtendedOperation(this);
-
}
finally
{
getPluginConfigManager().invokePostOperationExtendedPlugins(this);
}
-
}
catch(CanceledOperationException coe)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
index 160845d..7a5422d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -115,7 +115,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
ExtendedOperationHandlerCfg configuration)
@@ -131,7 +130,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
ExtendedOperationHandlerCfg configuration,
@@ -141,7 +139,6 @@
|| isJavaClassAcceptable(configuration, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
ExtendedOperationHandlerCfg configuration)
@@ -163,7 +160,6 @@
// Put this handler in the hash so that we will
// be able to find it if it is altered.
handlers.put(dn, handler);
-
} catch (ConfigException e) {
logger.traceException(e);
@@ -200,7 +196,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
ExtendedOperationHandlerCfg configuration,
@@ -209,7 +204,6 @@
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
ExtendedOperationHandlerCfg configuration)
@@ -232,7 +226,6 @@
// Put this connection handler in the hash so that we will be
// able to find it if it is altered.
handlers.put(dn, handler);
-
}
catch (ConfigException e)
{
@@ -254,7 +247,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
ExtendedOperationHandlerCfg configuration,
@@ -290,12 +282,7 @@
}
}
-
-
- /**
- * Determines whether or not the new configuration's implementation
- * class is acceptable.
- */
+ /** Determines whether or not the new configuration's implementation class is acceptable. */
private boolean isJavaClassAcceptable(ExtendedOperationHandlerCfg config,
List<LocalizableMessage> unacceptableReasons)
{
@@ -319,4 +306,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java
index 8f31189..4a3dd9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationWrapper.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -25,7 +25,6 @@
public abstract class ExtendedOperationWrapper extends
OperationWrapper<ExtendedOperation> implements ExtendedOperation
{
-
/**
* Creates a new extended operation wrapper based on the provided extended
* operation.
@@ -38,46 +37,39 @@
super(extended);
}
- /** {@inheritDoc} */
@Override
public String getRequestOID()
{
return getOperation().getRequestOID();
}
- /** {@inheritDoc} */
@Override
public String getResponseOID()
{
return getOperation().getResponseOID();
}
- /** {@inheritDoc} */
@Override
public ByteString getRequestValue()
{
return getOperation().getRequestValue();
}
- /** {@inheritDoc} */
@Override
public ByteString getResponseValue()
{
return getOperation().getResponseValue();
}
- /** {@inheritDoc} */
@Override
public void setResponseOID(String responseOID)
{
getOperation().setResponseOID(responseOID);
}
- /** {@inheritDoc} */
@Override
public void setResponseValue(ByteString responseValue)
{
getOperation().setResponseValue(responseValue);
}
-
}
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 d32d6e3..478c1ad 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
@@ -99,23 +99,13 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /**
- * Used by group instances to determine if new groups have been registered or
- * groups deleted.
- */
+ /** Used by group instances to determine if new groups have been registered or groups deleted. */
private volatile long refreshToken;
- /**
- * A mapping between the DNs of the config entries and the associated group
- * implementations.
- */
+ /** A mapping between the DNs of the config entries and the associated group implementations. */
private ConcurrentMap<DN, Group<?>> groupImplementations;
- /**
- * A mapping between the DNs of all group entries and the corresponding group
- * instances.
- */
+ /** A mapping between the DNs of all group entries and the corresponding group instances. */
private DITCacheMap<Group<?>> groupInstances;
/** Lock to protect internal data structures. */
@@ -155,8 +145,6 @@
DirectoryServer.registerBackendInitializationListener(this);
}
-
-
/**
* Initializes all group implementations currently defined in the Directory
* Server configuration. This should only be called at Directory Server
@@ -176,7 +164,6 @@
rootConfiguration.addGroupImplementationAddListener(this);
rootConfiguration.addGroupImplementationDeleteListener(this);
-
//Initialize the existing group implementations.
for (String name : rootConfiguration.listGroupImplementations())
{
@@ -200,9 +187,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
GroupImplementationCfg configuration,
@@ -223,9 +207,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
GroupImplementationCfg configuration)
@@ -260,9 +241,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
GroupImplementationCfg configuration,
@@ -273,9 +251,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
GroupImplementationCfg configuration)
@@ -309,9 +284,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
GroupImplementationCfg configuration,
@@ -332,9 +304,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
GroupImplementationCfg configuration)
@@ -377,7 +346,6 @@
return ccr;
}
-
// Get the class for the group implementation. If the group is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -415,8 +383,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a group implementation, and
* optionally initializes that instance.
@@ -473,12 +439,7 @@
}
}
-
-
- /**
- * Performs any cleanup work that may be needed when the server is shutting
- * down.
- */
+ /** Performs any cleanup work that may be needed when the server is shutting down. */
public void finalizeGroupManager()
{
DirectoryServer.deregisterInternalPlugin(this);
@@ -494,8 +455,6 @@
groupImplementations.clear();
}
-
-
/**
* Retrieves an {@code Iterable} object that may be used to cursor across the
* group implementations defined in the server.
@@ -508,8 +467,6 @@
return groupImplementations.values();
}
-
-
/**
* Retrieves an {@code Iterable} object that may be used to cursor across the
* group instances defined in the server.
@@ -531,8 +488,6 @@
}
}
-
-
/**
* Retrieves the group instance defined in the entry with the specified DN.
*
@@ -555,8 +510,6 @@
}
}
-
-
/**
* {@inheritDoc} In this case, the server will search the backend to find
* all group instances that it may contain and register them with this group
@@ -586,7 +539,6 @@
continue;
}
-
for (DN baseDN : backend.getBaseDNs())
{
try
@@ -602,7 +554,6 @@
continue;
}
-
SearchRequest request = newSearchRequest(baseDN, SearchScope.WHOLE_SUBTREE, filter)
.addControl(control);
InternalSearchOperation internalSearch =
@@ -647,8 +598,6 @@
}
}
-
-
/**
* {@inheritDoc} In this case, the server will de-register all group
* instances associated with entries in the provided backend.
@@ -686,7 +635,6 @@
// Nothing to do.
}
-
/**
* In this case, each entry is checked to see if it contains
* a group definition, and if so it will be instantiated and
@@ -702,8 +650,6 @@
createAndRegisterGroup(entry);
}
-
-
private static boolean hasGroupMembershipUpdateControl(PluginOperation operation)
{
List<Control> requestControls = operation.getRequestControls();
@@ -720,8 +666,6 @@
return false;
}
-
-
/**
* In this case, if the entry is associated with a registered
* group instance, then that group instance will be deregistered.
@@ -747,8 +691,6 @@
}
}
-
-
/**
* Scan the list of provided modifications looking for any changes to the objectClass,
* which might change the entry to another kind of group, or even to a non-group.
@@ -769,8 +711,6 @@
return false;
}
-
-
/**
* In this case, if the entry is associated with a registered
* group instance, then that instance will be recreated from
@@ -831,8 +771,6 @@
}
}
-
-
/**
* In this case, if the entry is associated with a registered
* group instance, then that instance will be recreated from
@@ -873,9 +811,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public PostOperation doPostOperation(
PostOperationAddOperation addOperation)
@@ -891,7 +826,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public PostOperation doPostOperation(
PostOperationDeleteOperation deleteOperation)
@@ -907,7 +841,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public PostOperation doPostOperation(
PostOperationModifyOperation modifyOperation)
@@ -926,7 +859,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public PostOperation doPostOperation(
PostOperationModifyDNOperation modifyDNOperation)
@@ -944,7 +876,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public void doPostSynchronization(
PostSynchronizationAddOperation addOperation)
@@ -956,7 +887,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void doPostSynchronization(
PostSynchronizationDeleteOperation deleteOperation)
@@ -968,7 +898,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void doPostSynchronization(
PostSynchronizationModifyOperation modifyOperation)
@@ -981,7 +910,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void doPostSynchronization(
PostSynchronizationModifyDNOperation modifyDNOperation)
@@ -994,8 +922,6 @@
}
}
-
-
/**
* Attempts to create a group instance from the provided entry, and if that is
* successful then register it with the server, overwriting any existing
@@ -1032,8 +958,6 @@
}
}
-
-
/**
* Removes all group instances that might happen to be registered with the
* group manager. This method is only intended for testing purposes and
@@ -1052,7 +976,6 @@
}
}
-
/**
* Compare the specified token against the current group manager
* token value. Can be used to reload cached group instances if there has
@@ -1077,4 +1000,3 @@
return this.refreshToken;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
index a86708b..c463dfa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
@@ -50,9 +50,7 @@
implements ConfigurationChangeListener<IdentityMapperCfg>,
ConfigurationAddListener<IdentityMapperCfg>,
ConfigurationDeleteListener<IdentityMapperCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** A mapping between the DNs of the config entries and the associated identity mappers. */
@@ -72,8 +70,6 @@
identityMappers = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all identity mappers currently defined in the Directory Server
* configuration. This should only be called at Directory Server startup.
@@ -92,7 +88,6 @@
rootConfiguration.addIdentityMapperAddListener(this);
rootConfiguration.addIdentityMapperDeleteListener(this);
-
//Initialize the existing identity mappers.
for (String mapperName : rootConfiguration.listIdentityMappers())
{
@@ -119,7 +114,6 @@
}
}
-
// Now that all of the identity mappers are defined, see if the Directory
// Server's proxied auth mapper is valid. If not, then log a warning
// message.
@@ -134,9 +128,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
IdentityMapperCfg configuration,
@@ -162,9 +153,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
IdentityMapperCfg configuration)
@@ -202,9 +190,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
IdentityMapperCfg configuration,
@@ -215,9 +200,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
IdentityMapperCfg configuration)
@@ -235,9 +217,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
IdentityMapperCfg configuration,
@@ -263,20 +242,15 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
IdentityMapperCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing mapper if it's already enabled.
IdentityMapper existingMapper = identityMappers.get(configuration.dn());
-
// If the new configuration has the mapper disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -296,7 +270,6 @@
return ccr;
}
-
// Get the class for the identity mapper. If the mapper is already enabled,
// then we shouldn't do anything with it although if the class has changed
// then we'll at least need to indicate that administrative action is
@@ -333,8 +306,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as an identity mapper, and
* optionally initializes that instance.
@@ -391,4 +362,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
index 57576c5..e4c9eb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.core;
@@ -39,17 +39,11 @@
/** The debug log tracer for this object. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/** Shutdown monitor state. */
private volatile boolean shutdownRequested;
private final Object shutdownLock = new Object();
-
-
- /**
- * Creates a new instance of this idle time limit thread.
- */
+ /** Creates a new instance of this idle time limit thread. */
public IdleTimeLimitThread()
{
super("Idle Time Limit Thread");
@@ -59,12 +53,8 @@
DirectoryServer.registerShutdownListener(this);
}
-
-
- /**
- * Operates in a loop, teriminating any client connections that have been idle
- * for too long.
- */
+ /** Operates in a loop, teriminating any client connections that have been idle for too long. */
+ @Override
public void run()
{
LocalizableMessage disconnectMessage = INFO_IDLETIME_LIMIT_EXCEEDED.get();
@@ -154,17 +144,13 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
public String getShutdownListenerName()
{
return "Idle Time Limit Thread";
}
-
-
- /** {@inheritDoc} */
+ @Override
public void processServerShutdown(LocalizableMessage reason)
{
synchronized (shutdownLock)
@@ -174,4 +160,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
index 0c34bbe..fa0eac4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -52,15 +52,10 @@
implements ConfigurationChangeListener<KeyManagerProviderCfg>,
ConfigurationAddListener<KeyManagerProviderCfg>,
ConfigurationDeleteListener<KeyManagerProviderCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated key
- * manager providers.
- */
+ /** A mapping between the DNs of the config entries and the associated key manager providers. */
private final ConcurrentHashMap<DN,KeyManagerProvider> providers;
private final ServerContext serverContext;
@@ -96,7 +91,6 @@
rootConfiguration.addKeyManagerProviderAddListener(this);
rootConfiguration.addKeyManagerProviderDeleteListener(this);
-
//Initialize the existing key manager providers.
for (String name : rootConfiguration.listKeyManagerProviders())
{
@@ -124,9 +118,7 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationAddAcceptable(
KeyManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -151,9 +143,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationAdd(
KeyManagerProviderCfg configuration)
{
@@ -190,9 +180,7 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationDeleteAcceptable(
KeyManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -202,9 +190,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationDelete(
KeyManagerProviderCfg configuration)
{
@@ -221,9 +207,7 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
KeyManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -248,19 +232,15 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
KeyManagerProviderCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing provider if it's already enabled.
KeyManagerProvider existingProvider = providers.get(configuration.dn());
-
// If the new configuration has the provider disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -279,7 +259,6 @@
return ccr;
}
-
// Get the class for the key manager provider. If the provider is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -316,8 +295,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a key manager provider, and
* optionally initializes that instance.
@@ -352,7 +329,6 @@
propertyDefinition.loadClass(className, KeyManagerProvider.class);
KeyManagerProvider provider = providerClass.newInstance();
-
if (initialize)
{
provider.initializeKeyManagerProvider(configuration);
@@ -382,4 +358,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
index 127bcf5..9818288 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
@@ -54,15 +54,10 @@
implements ConfigurationChangeListener<MatchingRuleCfg>,
ConfigurationAddListener<MatchingRuleCfg>,
ConfigurationDeleteListener<MatchingRuleCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated matching
- * rule Factories.
- */
+ /** A mapping between the DNs of the config entries and the associated matching rule Factories. */
private ConcurrentHashMap<DN, MatchingRuleFactory<?>> matchingRuleFactories;
private final ServerContext serverContext;
@@ -79,8 +74,6 @@
matchingRuleFactories = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all matching rules after reading all the Matching Rule
* factories currently defined in the Directory Server configuration.
@@ -136,9 +129,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(MatchingRuleCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -163,9 +153,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(MatchingRuleCfg configuration)
{
@@ -208,9 +195,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(MatchingRuleCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -269,8 +253,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(MatchingRuleCfg configuration)
{
@@ -297,9 +279,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(MatchingRuleCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -380,19 +359,16 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
MatchingRuleCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing matching rule factory if it's already enabled.
MatchingRuleFactory<?> existingFactory =
matchingRuleFactories.get(configuration.dn());
-
// If the new configuration has the matching rule disabled, then disable it
// if it is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -417,7 +393,6 @@
return ccr;
}
-
// Get the class for the matching rule. If the matching rule is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -459,8 +434,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as an attribute syntax, and
* optionally initializes that instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java
index 1a4e683..e675711 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperation.java
@@ -39,6 +39,7 @@
*
* @return The raw, unprocessed entry DN as included in the client request.
*/
+ @Override
ByteString getRawEntryDN();
/**
@@ -59,6 +60,7 @@
* @return The DN of the entry to rename, or <CODE>null</CODE> if the raw
* entry DN has not yet been processed.
*/
+ @Override
DN getEntryDN();
/**
@@ -69,6 +71,7 @@
* @return The raw, unprocessed newRDN as included in the request from the
* client.
*/
+ @Override
ByteString getRawNewRDN();
/**
@@ -89,6 +92,7 @@
* @return The new RDN to use for the entry, or <CODE>null</CODE> if the raw
* newRDN has not yet been processed.
*/
+ @Override
RDN getNewRDN();
@@ -98,6 +102,7 @@
* @return <CODE>true</CODE> if the current RDN value should be removed from
* the entry, or <CODE>false</CODE> if not.
*/
+ @Override
boolean deleteOldRDN();
/**
@@ -116,6 +121,7 @@
* @return The raw, unprocessed newSuperior from the client request, or
* <CODE>null</CODE> if there is none.
*/
+ @Override
ByteString getRawNewSuperior();
/**
@@ -138,6 +144,7 @@
* no newSuperior DN for this request or if the raw newSuperior has
* not yet been processed.
*/
+ @Override
DN getNewSuperior();
/**
@@ -185,6 +192,7 @@
* @return The current entry, or <CODE>null</CODE> if it is not yet
* available.
*/
+ @Override
Entry getOriginalEntry();
@@ -196,6 +204,7 @@
* @return The updated entry, or <CODE>null</CODE> if it is not yet
* available.
*/
+ @Override
Entry getUpdatedEntry();
/**
@@ -206,6 +215,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
DN getProxiedAuthorizationDN();
@@ -217,6 +227,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
void setProxiedAuthorizationDN(DN dn);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
index f297cb5..2f3a666 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
@@ -58,19 +58,13 @@
/** Indicates whether to delete the old RDN value from the entry. */
private boolean deleteOldRDN;
- /**
- * The raw, unprocessed current DN of the entry as included in the request
- * from the client.
- */
+ /** The raw, unprocessed current DN of the entry as included in the request from the client. */
private ByteString rawEntryDN;
/** The raw, unprocessed newRDN as included in the request from the client. */
private ByteString rawNewRDN;
- /**
- * The raw, unprocessed newSuperior as included in the request from the
- * client.
- */
+ /** The raw, unprocessed newSuperior as included in the request from the client. */
private ByteString rawNewSuperior;
/** The current DN of the entry. */
@@ -123,7 +117,6 @@
{
super(clientConnection, operationID, messageID, requestControls);
-
this.rawEntryDN = rawEntryDN;
this.rawNewRDN = rawNewRDN;
this.deleteOldRDN = deleteOldRDN;
@@ -137,8 +130,6 @@
modifications = null;
}
-
-
/**
* Creates a new modify DN operation with the provided information.
*
@@ -163,7 +154,6 @@
{
super(clientConnection, operationID, messageID, requestControls);
-
this.entryDN = entryDN;
this.newRDN = newRDN;
this.deleteOldRDN = deleteOldRDN;
@@ -186,14 +176,12 @@
modifications = null;
}
- /** {@inheritDoc} */
@Override
public final ByteString getRawEntryDN()
{
return rawEntryDN;
}
- /** {@inheritDoc} */
@Override
public final void setRawEntryDN(ByteString rawEntryDN)
{
@@ -233,7 +221,6 @@
return rawNewRDN;
}
- /** {@inheritDoc} */
@Override
public final void setRawNewRDN(ByteString rawNewRDN)
{
@@ -243,7 +230,6 @@
newDN = null;
}
- /** {@inheritDoc} */
@Override
public final RDN getNewRDN()
{
@@ -264,28 +250,24 @@
return newRDN;
}
- /** {@inheritDoc} */
@Override
public final boolean deleteOldRDN()
{
return deleteOldRDN;
}
- /** {@inheritDoc} */
@Override
public final void setDeleteOldRDN(boolean deleteOldRDN)
{
this.deleteOldRDN = deleteOldRDN;
}
- /** {@inheritDoc} */
@Override
public final ByteString getRawNewSuperior()
{
return rawNewSuperior;
}
- /** {@inheritDoc} */
@Override
public final void setRawNewSuperior(ByteString rawNewSuperior)
{
@@ -311,7 +293,6 @@
return modifications;
}
- /** {@inheritDoc} */
@Override
public final void addModification(Modification modification)
{
@@ -325,21 +306,18 @@
}
}
- /** {@inheritDoc} */
@Override
public final Entry getOriginalEntry()
{
return null;
}
- /** {@inheritDoc} */
@Override
public final Entry getUpdatedEntry()
{
return null;
}
- /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -349,35 +327,30 @@
return OperationType.MODIFY_DN;
}
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return proxiedAuthorizationDN;
}
- /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
return responseControls;
}
- /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
responseControls.add(control);
}
- /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
responseControls.remove(control);
}
-
/**
* Performs the work of actually processing this operation. This
* should include all processing for the operation, including
@@ -463,7 +436,6 @@
}
}
-
/**
* Invokes the post response plugins. If a workflow has been executed
* then invoke the post response plugins provided by the workflow
@@ -500,7 +472,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void updateOperationErrMsgAndResCode()
{
@@ -508,7 +479,6 @@
appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_CURRENT_ENTRY.get(entryDN));
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
@@ -531,14 +501,12 @@
buffer.append(")");
}
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN dn)
{
proxiedAuthorizationDN = dn;
}
- /** {@inheritDoc} */
@Override
public DN getNewDN()
{
@@ -567,6 +535,4 @@
}
return newDN;
}
-
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java
index d29fdfc..4a96ca4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationWrapper.java
@@ -31,7 +31,6 @@
public abstract class ModifyDNOperationWrapper extends
OperationWrapper<ModifyDNOperation> implements ModifyDNOperation
{
-
/**
* Creates a new moddn operation based on the provided moddn operation.
*
@@ -42,101 +41,84 @@
super(modifyDN);
}
- /** {@inheritDoc} */
@Override
public void addModification(Modification modification) {
getOperation().addModification(modification);
}
- /** {@inheritDoc} */
@Override
public boolean deleteOldRDN() {
return getOperation().deleteOldRDN();
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN() {
return getOperation().getEntryDN();
}
- /** {@inheritDoc} */
@Override
public List<Modification> getModifications() {
return getOperation().getModifications();
}
- /** {@inheritDoc} */
@Override
public RDN getNewRDN() {
return getOperation().getNewRDN();
}
- /** {@inheritDoc} */
@Override
public DN getNewSuperior() {
return getOperation().getNewSuperior();
}
- /** {@inheritDoc} */
@Override
public Entry getOriginalEntry() {
return getOperation().getOriginalEntry();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawEntryDN() {
return getOperation().getRawEntryDN();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawNewRDN() {
return getOperation().getRawNewRDN();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawNewSuperior() {
return getOperation().getRawNewSuperior();
}
- /** {@inheritDoc} */
@Override
public Entry getUpdatedEntry() {
return getOperation().getUpdatedEntry();
}
- /** {@inheritDoc} */
@Override
public void setDeleteOldRDN(boolean deleteOldRDN) {
getOperation().setDeleteOldRDN(deleteOldRDN);
}
- /** {@inheritDoc} */
@Override
public void setRawEntryDN(ByteString rawEntryDN) {
getOperation().setRawEntryDN(rawEntryDN);
}
- /** {@inheritDoc} */
@Override
public void setRawNewRDN(ByteString rawNewRDN) {
getOperation().setRawNewRDN(rawNewRDN);
}
- /** {@inheritDoc} */
@Override
public void setRawNewSuperior(ByteString rawNewSuperior) {
getOperation().setRawNewSuperior(rawNewSuperior);
}
- /** {@inheritDoc} */
@Override
public DN getNewDN()
{
return getOperation().getNewDN();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java
index 55e8b3d..ce8d377 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperation.java
@@ -113,6 +113,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
DN getProxiedAuthorizationDN();
/**
@@ -124,6 +125,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java
index 1e21572..8096c26 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationWrapper.java
@@ -30,7 +30,6 @@
public abstract class ModifyOperationWrapper extends
OperationWrapper<ModifyOperation> implements ModifyOperation
{
-
/**
* Creates a new modify operation based on the provided modify operation.
*
@@ -41,7 +40,6 @@
super(modify);
}
- /** {@inheritDoc} */
@Override
public void addModification(Modification modification)
throws DirectoryException
@@ -49,60 +47,51 @@
getOperation().addModification(modification);
}
- /** {@inheritDoc} */
@Override
public void addRawModification(RawModification rawModification)
{
getOperation().addRawModification(rawModification);
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN()
{
return getOperation().getEntryDN();
}
- /** {@inheritDoc} */
@Override
public List<Modification> getModifications()
{
return getOperation().getModifications();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawEntryDN()
{
return getOperation().getRawEntryDN();
}
- /** {@inheritDoc} */
@Override
public List<RawModification> getRawModifications()
{
return getOperation().getRawModifications();
}
- /** {@inheritDoc} */
@Override
public void setRawEntryDN(ByteString rawEntryDN)
{
getOperation().setRawEntryDN(rawEntryDN);
}
- /** {@inheritDoc} */
@Override
public void setRawModifications(List<RawModification> rawModifications)
{
getOperation().setRawModifications(rawModifications);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return getOperation().toString();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
index c66f532..22b21e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
@@ -48,15 +48,10 @@
implements ConfigurationChangeListener<MonitorProviderCfg>,
ConfigurationAddListener<MonitorProviderCfg>,
ConfigurationDeleteListener<MonitorProviderCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated monitor
- * providers.
- */
+ /** A mapping between the DNs of the config entries and the associated monitor providers. */
private final ConcurrentHashMap<DN,MonitorProvider<?>> monitors;
private final ServerContext serverContext;
@@ -91,7 +86,6 @@
rootConfiguration.addMonitorProviderAddListener(this);
rootConfiguration.addMonitorProviderDeleteListener(this);
-
//Initialize the existing monitor providers.
for (String name : rootConfiguration.listMonitorProviders())
{
@@ -118,9 +112,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
MonitorProviderCfg configuration,
@@ -146,9 +137,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
MonitorProviderCfg configuration)
@@ -186,9 +174,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
MonitorProviderCfg configuration,
@@ -198,9 +183,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
MonitorProviderCfg configuration)
@@ -217,9 +199,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
MonitorProviderCfg configuration,
@@ -245,9 +224,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
MonitorProviderCfg configuration)
@@ -274,7 +250,6 @@
return ccr;
}
-
// Get the class for the monitor provider. If the monitor is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -311,8 +286,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a monitor provider, and
* optionally initializes that instance.
@@ -358,4 +331,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
index 4ad9f49..6d595f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
@@ -48,7 +48,6 @@
/** The wrapped operation. */
private W operation;
-
/**
* Creates a new generic operation wrapper.
*
@@ -59,49 +58,42 @@
this.operation = operation;
}
- /** {@inheritDoc} */
@Override
public void addRequestControl(Control control)
{
operation.addRequestControl(control);
}
- /** {@inheritDoc} */
@Override
public void addResponseControl(Control control)
{
operation.addResponseControl(control);
}
- /** {@inheritDoc} */
@Override
public void appendErrorMessage(LocalizableMessage message)
{
operation.appendErrorMessage(message);
}
- /** {@inheritDoc} */
@Override
public void appendMaskedErrorMessage(LocalizableMessage maskedMessage)
{
operation.appendMaskedErrorMessage(maskedMessage);
}
- /** {@inheritDoc} */
@Override
public CancelResult cancel(CancelRequest cancelRequest)
{
return operation.cancel(cancelRequest);
}
- /** {@inheritDoc} */
@Override
public void abort(CancelRequest cancelRequest)
{
operation.abort(cancelRequest);
}
- /** {@inheritDoc} */
@Override
public void disconnectClient(
DisconnectReason disconnectReason,
@@ -113,112 +105,96 @@
disconnectReason, sendNotification, message);
}
- /** {@inheritDoc} */
@Override
public boolean dontSynchronize()
{
return operation.dontSynchronize();
}
- /** {@inheritDoc} */
@Override
public <T> T getAttachment(String name)
{
return operation.getAttachment(name);
}
- /** {@inheritDoc} */
@Override
public Map<String, Object> getAttachments()
{
return operation.getAttachments();
}
- /** {@inheritDoc} */
@Override
public DN getAuthorizationDN()
{
return operation.getAuthorizationDN();
}
- /** {@inheritDoc} */
@Override
public Entry getAuthorizationEntry()
{
return operation.getAuthorizationEntry();
}
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return operation.getProxiedAuthorizationDN();
}
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
operation.setProxiedAuthorizationDN(proxiedAuthorizationDN);
}
- /** {@inheritDoc} */
@Override
public CancelRequest getCancelRequest()
{
return operation.getCancelRequest();
}
- /** {@inheritDoc} */
@Override
public CancelResult getCancelResult()
{
return operation.getCancelResult();
}
- /** {@inheritDoc} */
@Override
public ClientConnection getClientConnection()
{
return operation.getClientConnection();
}
- /** {@inheritDoc} */
@Override
public long getConnectionID()
{
return operation.getConnectionID();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessageBuilder getErrorMessage()
{
return operation.getErrorMessage();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessageBuilder getMaskedErrorMessage()
{
return operation.getMaskedErrorMessage();
}
- /** {@inheritDoc} */
@Override
public ResultCode getMaskedResultCode()
{
return operation.getMaskedResultCode();
}
- /** {@inheritDoc} */
@Override
public DN getMatchedDN()
{
return operation.getMatchedDN();
}
- /** {@inheritDoc} */
@Override
public int getMessageID()
{
@@ -235,63 +211,54 @@
return operation;
}
- /** {@inheritDoc} */
@Override
public long getOperationID()
{
return operation.getOperationID();
}
- /** {@inheritDoc} */
@Override
public OperationType getOperationType()
{
return operation.getOperationType();
}
- /** {@inheritDoc} */
@Override
public long getProcessingStartTime()
{
return operation.getProcessingStartTime();
}
- /** {@inheritDoc} */
@Override
public long getProcessingStopTime()
{
return operation.getProcessingStopTime();
}
- /** {@inheritDoc} */
@Override
public long getProcessingTime()
{
return operation.getProcessingTime();
}
- /** {@inheritDoc} */
@Override
public long getProcessingNanoTime()
{
return operation.getProcessingNanoTime();
}
- /** {@inheritDoc} */
@Override
public List<String> getReferralURLs()
{
return operation.getReferralURLs();
}
- /** {@inheritDoc} */
@Override
public List<Control> getRequestControls()
{
return operation.getRequestControls();
}
- /** {@inheritDoc} */
@Override
public <T extends Control> T getRequestControl(
ControlDecoder<T> d)throws DirectoryException
@@ -299,168 +266,144 @@
return operation.getRequestControl(d);
}
- /** {@inheritDoc} */
@Override
public List<Control> getResponseControls()
{
return operation.getResponseControls();
}
- /** {@inheritDoc} */
@Override
public ResultCode getResultCode()
{
return operation.getResultCode();
}
- /** {@inheritDoc} */
@Override
public boolean isInnerOperation()
{
return operation.isInnerOperation();
}
- /** {@inheritDoc} */
@Override
public boolean isInternalOperation()
{
return operation.isInternalOperation();
}
- /** {@inheritDoc} */
@Override
public boolean isSynchronizationOperation()
{
return operation.isSynchronizationOperation();
}
- /** {@inheritDoc} */
@Override
public void operationCompleted()
{
operation.operationCompleted();
}
- /** {@inheritDoc} */
@Override
public <T> T removeAttachment(String name)
{
return operation.removeAttachment(name);
}
- /** {@inheritDoc} */
@Override
public void removeResponseControl(Control control)
{
operation.removeResponseControl(control);
}
- /** {@inheritDoc} */
@Override
public <T> T setAttachment(String name, Object value)
{
return operation.setAttachment(name, value);
}
- /** {@inheritDoc} */
@Override
public void setAttachments(Map<String, Object> attachments)
{
operation.setAttachments(attachments);
}
- /** {@inheritDoc} */
@Override
public void setAuthorizationEntry(Entry authorizationEntry)
{
operation.setAuthorizationEntry(authorizationEntry);
}
- /** {@inheritDoc} */
@Override
public void setDontSynchronize(boolean dontSynchronize)
{
operation.setDontSynchronize(dontSynchronize);
}
- /** {@inheritDoc} */
@Override
public void setErrorMessage(LocalizableMessageBuilder errorMessage)
{
operation.setErrorMessage(errorMessage);
}
- /** {@inheritDoc} */
@Override
public void setInnerOperation(boolean isInnerOperation)
{
operation.setInnerOperation(isInnerOperation);
}
- /** {@inheritDoc} */
@Override
public void setInternalOperation(boolean isInternalOperation)
{
operation.setInternalOperation(isInternalOperation);
}
- /** {@inheritDoc} */
@Override
public void setMaskedErrorMessage(LocalizableMessageBuilder maskedErrorMessage)
{
operation.setMaskedErrorMessage(maskedErrorMessage);
}
- /** {@inheritDoc} */
@Override
public void setMaskedResultCode(ResultCode maskedResultCode)
{
operation.setMaskedResultCode(maskedResultCode);
}
- /** {@inheritDoc} */
@Override
public void setMatchedDN(DN matchedDN)
{
operation.setMatchedDN(matchedDN);
}
- /** {@inheritDoc} */
@Override
public void setReferralURLs(List<String> referralURLs)
{
operation.setReferralURLs(referralURLs);
}
- /** {@inheritDoc} */
@Override
public void setResponseData(DirectoryException directoryException)
{
operation.setResponseData(directoryException);
}
- /** {@inheritDoc} */
@Override
public void setResultCode(ResultCode resultCode)
{
operation.setResultCode(resultCode);
}
- /** {@inheritDoc} */
@Override
public void setSynchronizationOperation(boolean isSynchronizationOperation)
{
operation.setSynchronizationOperation(isSynchronizationOperation);
}
- /** {@inheritDoc} */
@Override
public final int hashCode()
{
return getClientConnection().hashCode() * (int) getOperationID();
}
- /** {@inheritDoc} */
@Override
public final boolean equals(Object obj)
{
@@ -481,54 +424,45 @@
return false;
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return "Wrapped " + operation;
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
operation.toString(buffer);
}
- /** {@inheritDoc} */
@Override
final synchronized public void checkIfCanceled(boolean signalTooLate)
throws CanceledOperationException {
operation.checkIfCanceled(signalTooLate);
}
- /** {@inheritDoc} */
@Override
public void registerPostResponseCallback(Runnable callback)
{
operation.registerPostResponseCallback(callback);
}
- /** {@inheritDoc} */
@Override
public void run()
{
operation.run();
}
- /** {@inheritDoc} */
@Override
public List<AdditionalLogItem> getAdditionalLogItems()
{
return operation.getAdditionalLogItems();
}
- /** {@inheritDoc} */
@Override
public void addAdditionalLogItem(AdditionalLogItem item)
{
operation.addAdditionalLogItem(item);
}
-
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
index 179cbc0..c5d0019 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -52,13 +52,9 @@
ConfigurationDeleteListener<PasswordGeneratorCfg>,
ConfigurationChangeListener<PasswordGeneratorCfg>
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated password
- * generators.
- */
+ /** A mapping between the DNs of the config entries and the associated password generators. */
private final ConcurrentHashMap<DN,PasswordGenerator> passwordGenerators;
private final ServerContext serverContext;
@@ -94,7 +90,6 @@
rootConfiguration.addPasswordGeneratorAddListener(this);
rootConfiguration.addPasswordGeneratorDeleteListener(this);
-
//Initialize the existing password generators.
for (String generatorName : rootConfiguration.listPasswordGenerators())
{
@@ -123,7 +118,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
PasswordGeneratorCfg configuration,
@@ -149,20 +143,16 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
PasswordGeneratorCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing generator if it's already enabled.
PasswordGenerator existingGenerator =
passwordGenerators.get(configuration.dn());
-
// If the new configuration has the generator disabled, then disable it if
// it is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -182,7 +172,6 @@
return ccr;
}
-
// Get the class for the password generator. If the generator is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -220,7 +209,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
PasswordGeneratorCfg configuration,
@@ -246,8 +234,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
PasswordGeneratorCfg configuration)
@@ -287,7 +273,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
PasswordGeneratorCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -296,8 +281,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
PasswordGeneratorCfg configuration)
@@ -375,4 +358,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
index 7e80028..2c7dbba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
@@ -34,20 +34,15 @@
*/
public abstract class PasswordPolicy extends AuthenticationPolicy
{
-
/** Creates a new password policy. */
protected PasswordPolicy()
{
// Nothing to do.
}
-
-
- /** {@inheritDoc} */
+ @Override
public abstract DN getDN();
-
-
/**
* Indicates whether the associated password attribute uses the auth password
* syntax.
@@ -57,8 +52,6 @@
*/
public abstract boolean isAuthPasswordSyntax();
-
-
/**
* Retrieves the default set of password storage schemes that will be used for
* this password policy. The returned set should not be modified by the
@@ -70,8 +63,6 @@
public abstract List<PasswordStorageScheme<?>>
getDefaultPasswordStorageSchemes();
-
-
/**
* Gets the "deprecated-password-storage-scheme" property.
* <p>
@@ -88,8 +79,6 @@
*/
public abstract Set<String> getDeprecatedPasswordStorageSchemes();
-
-
/**
* Indicates whether the specified storage scheme is a default scheme for this
* password policy.
@@ -102,8 +91,6 @@
*/
public abstract boolean isDefaultPasswordStorageScheme(String name);
-
-
/**
* Indicates whether the specified storage scheme is deprecated.
*
@@ -115,8 +102,6 @@
*/
public abstract boolean isDeprecatedPasswordStorageScheme(String name);
-
-
/**
* Retrieves the set of password validators for this password policy. The
* returned list should not be altered by the caller.
@@ -125,8 +110,6 @@
*/
public abstract Collection<PasswordValidator<?>> getPasswordValidators();
-
-
/**
* Retrieves the set of account status notification handlers that should be
* used with this password policy. The returned list should not be altered by
@@ -138,8 +121,6 @@
public abstract Collection<AccountStatusNotificationHandler<?>>
getAccountStatusNotificationHandlers();
-
-
/**
* Retrieves the password generator that will be used with this password
* policy.
@@ -149,8 +130,6 @@
*/
public abstract PasswordGenerator<?> getPasswordGenerator();
-
-
/**
* Retrieves the time by which all users will be required to change their
* passwords, expressed in the number of milliseconds since midnight of
@@ -164,8 +143,6 @@
*/
public abstract long getRequireChangeByTime();
-
-
/**
* Gets the "allow-expired-password-changes" property.
* <p>
@@ -176,8 +153,6 @@
*/
public abstract boolean isAllowExpiredPasswordChanges();
-
-
/**
* Gets the "allow-multiple-password-values" property.
* <p>
@@ -193,8 +168,6 @@
*/
public abstract boolean isAllowMultiplePasswordValues();
-
-
/**
* Gets the "allow-pre-encoded-passwords" property.
* <p>
@@ -209,8 +182,6 @@
*/
public abstract boolean isAllowPreEncodedPasswords();
-
-
/**
* Gets the "allow-user-password-changes" property.
* <p>
@@ -223,8 +194,6 @@
*/
public abstract boolean isAllowUserPasswordChanges();
-
-
/**
* Gets the "expire-passwords-without-warning" property.
* <p>
@@ -241,8 +210,6 @@
*/
public abstract boolean isExpirePasswordsWithoutWarning();
-
-
/**
* Gets the "force-change-on-add" property.
* <p>
@@ -254,8 +221,6 @@
*/
public abstract boolean isForceChangeOnAdd();
-
-
/**
* Gets the "force-change-on-reset" property.
* <p>
@@ -269,8 +234,6 @@
*/
public abstract boolean isForceChangeOnReset();
-
-
/**
* Gets the "grace-login-count" property.
* <p>
@@ -283,8 +246,6 @@
*/
public abstract int getGraceLoginCount();
-
-
/**
* Gets the "idle-lockout-interval" property.
* <p>
@@ -301,8 +262,6 @@
*/
public abstract long getIdleLockoutInterval();
-
-
/**
* Gets the "last-login-time-attribute" property.
* <p>
@@ -317,8 +276,6 @@
*/
public abstract AttributeType getLastLoginTimeAttribute();
-
-
/**
* Gets the "last-login-time-format" property.
* <p>
@@ -332,8 +289,6 @@
*/
public abstract String getLastLoginTimeFormat();
-
-
/**
* Gets the "lockout-duration" property.
* <p>
@@ -348,8 +303,6 @@
*/
public abstract long getLockoutDuration();
-
-
/**
* Gets the "lockout-failure-count" property.
* <p>
@@ -363,8 +316,6 @@
*/
public abstract int getLockoutFailureCount();
-
-
/**
* Gets the "lockout-failure-expiration-interval" property.
* <p>
@@ -381,8 +332,6 @@
*/
public abstract long getLockoutFailureExpirationInterval();
-
-
/**
* Gets the "max-password-age" property.
* <p>
@@ -398,8 +347,6 @@
*/
public abstract long getMaxPasswordAge();
-
-
/**
* Gets the "max-password-reset-age" property.
* <p>
@@ -413,8 +360,6 @@
*/
public abstract long getMaxPasswordResetAge();
-
-
/**
* Gets the "min-password-age" property.
* <p>
@@ -430,8 +375,6 @@
*/
public abstract long getMinPasswordAge();
-
-
/**
* Gets the "password-attribute" property.
* <p>
@@ -444,8 +387,6 @@
*/
public abstract AttributeType getPasswordAttribute();
-
-
/**
* Gets the "password-change-requires-current-password" property.
* <p>
@@ -458,8 +399,6 @@
*/
public abstract boolean isPasswordChangeRequiresCurrentPassword();
-
-
/**
* Gets the "password-expiration-warning-interval" property.
* <p>
@@ -476,8 +415,6 @@
*/
public abstract long getPasswordExpirationWarningInterval();
-
-
/**
* Gets the "password-history-count" property.
* <p>
@@ -496,8 +433,6 @@
*/
public abstract int getPasswordHistoryCount();
-
-
/**
* Gets the "password-history-duration" property.
* <p>
@@ -515,8 +450,6 @@
*/
public abstract long getPasswordHistoryDuration();
-
-
/**
* Gets the "previous-last-login-time-format" property.
* <p>
@@ -534,8 +467,6 @@
*/
public abstract SortedSet<String> getPreviousLastLoginTimeFormats();
-
-
/**
* Gets the "require-secure-authentication" property.
* <p>
@@ -550,8 +481,6 @@
*/
public abstract boolean isRequireSecureAuthentication();
-
-
/**
* Gets the "require-secure-password-changes" property.
* <p>
@@ -564,8 +493,6 @@
*/
public abstract boolean isRequireSecurePasswordChanges();
-
-
/**
* Gets the "skip-validation-for-administrators" property.
* <p>
@@ -577,8 +504,6 @@
*/
public abstract boolean isSkipValidationForAdministrators();
-
-
/**
* Gets the "state-update-failure-policy" property.
* <p>
@@ -598,17 +523,13 @@
*/
public abstract StateUpdateFailurePolicy getStateUpdateFailurePolicy();
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isPasswordPolicy()
{
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public PasswordPolicyState createAuthenticationPolicyState(Entry userEntry,
long time) throws DirectoryException
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index f4fb88d..1ab2aa3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -50,10 +50,7 @@
ConfigurationAddListener <PasswordStorageSchemeCfg>,
ConfigurationDeleteListener <PasswordStorageSchemeCfg>
{
- /**
- * A mapping between the DNs of the config entries and the associated password
- * storage schemes.
- */
+ /** A mapping between the DNs of the config entries and the associated password storage schemes. */
private final ConcurrentHashMap<DN,PasswordStorageScheme> storageSchemes;
private final ServerContext serverContext;
@@ -70,8 +67,6 @@
storageSchemes = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all password storage schemes currently defined in the Directory
* Server configuration. This should only be called at Directory Server
@@ -113,9 +108,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
PasswordStorageSchemeCfg configuration,
@@ -145,9 +137,6 @@
return status;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
PasswordStorageSchemeCfg configuration
@@ -204,9 +193,6 @@
return changeResult;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
PasswordStorageSchemeCfg configuration,
@@ -245,9 +231,6 @@
return status;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
PasswordStorageSchemeCfg configuration
@@ -279,9 +262,6 @@
return changeResult;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
PasswordStorageSchemeCfg configuration,
@@ -292,9 +272,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
PasswordStorageSchemeCfg configuration
@@ -307,8 +284,6 @@
return changeResult;
}
-
-
/**
* Loads the specified class, instantiates it as a password storage scheme,
* and optionally initializes that instance. Any initialized password
@@ -340,7 +315,6 @@
DirectoryServer.registerPasswordStorageScheme (configEntryDN, schemeClass);
}
-
/**
* Loads the specified class, instantiates it as a password storage scheme,
* and optionally initializes that instance.
@@ -399,7 +373,6 @@
}
}
-
/**
* Remove a password storage that has been installed in the server.
*
@@ -419,4 +392,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
index d7793526..a66211f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -51,15 +51,10 @@
implements ConfigurationChangeListener<PasswordValidatorCfg>,
ConfigurationAddListener<PasswordValidatorCfg>,
ConfigurationDeleteListener<PasswordValidatorCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated password
- * validators.
- */
+ /** A mapping between the DNs of the config entries and the associated password validators. */
private final ConcurrentHashMap<DN,PasswordValidator> passwordValidators;
private final ServerContext serverContext;
@@ -95,7 +90,6 @@
rootConfiguration.addPasswordValidatorAddListener(this);
rootConfiguration.addPasswordValidatorDeleteListener(this);
-
//Initialize the existing password validators.
for (String validatorName : rootConfiguration.listPasswordValidators())
{
@@ -124,9 +118,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
PasswordValidatorCfg configuration,
@@ -152,9 +143,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
PasswordValidatorCfg configuration)
@@ -193,9 +181,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
PasswordValidatorCfg configuration,
@@ -206,9 +191,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
PasswordValidatorCfg configuration)
@@ -227,9 +209,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
PasswordValidatorCfg configuration,
@@ -255,21 +234,16 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
PasswordValidatorCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing validator if it's already enabled.
PasswordValidator existingValidator =
passwordValidators.get(configuration.dn());
-
// If the new configuration has the validator disabled, then disable it if
// it is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -289,7 +263,6 @@
return ccr;
}
-
// Get the class for the password validator. If the validator is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -327,8 +300,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a password validator, and
* optionally initializes that instance.
@@ -386,4 +357,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
index 40063a0..478f640 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
@@ -66,7 +66,6 @@
*/
public final class PersistentSearch
{
-
/**
* A cancellation call-back which can be used by work-flow element
* implementations in order to register for resource cleanup when a
@@ -74,7 +73,6 @@
*/
public static interface CancellationCallback
{
-
/**
* The provided persistent search has been cancelled. Any
* resources associated with the persistent search should be
@@ -87,8 +85,6 @@
}
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/** Cancel a persistent search. */
private static synchronized void cancel(PersistentSearch psearch)
{
@@ -125,10 +121,7 @@
/** Indicates whether or not this persistent search has already been aborted. */
private boolean isCancelled;
- /**
- * Indicates whether entries returned should include the entry change
- * notification control.
- */
+ /** Indicates whether entries returned should include the entry change notification control. */
private final boolean returnECs;
/** The reference to the associated search operation. */
@@ -164,8 +157,6 @@
this.returnECs = returnECs;
}
-
-
/**
* Cancels this persistent search operation. On exit this persistent
* search will no longer be valid and any resources associated with
@@ -198,8 +189,6 @@
return new CancelResult(ResultCode.CANCELLED, null);
}
-
-
/**
* Gets the message ID associated with this persistent search.
*
@@ -210,7 +199,6 @@
return searchOperation.getMessageID();
}
-
/**
* Get the search operation associated with this persistent search.
*
@@ -303,8 +291,6 @@
}
}
-
-
/**
* Notifies the persistent searches that an entry has been modified.
*
@@ -316,8 +302,6 @@
processModify(entry, entry);
}
-
-
/**
* Notifies persistent searches that an entry has been modified.
*
@@ -426,8 +410,6 @@
}
}
-
-
/**
* Registers a cancellation callback with this persistent search.
* The cancellation callback will be notified when this persistent
@@ -441,8 +423,6 @@
cancellationCallbacks.add(callback);
}
-
-
/**
* Enable this persistent search. The persistent search will be
* registered with the client connection and will be prevented from
@@ -456,8 +436,6 @@
DirectoryServer.registerPersistentSearch();
}
-
-
/**
* Retrieves a string representation of this persistent search.
*
@@ -471,8 +449,6 @@
return buffer.toString();
}
-
-
/**
* Appends a string representation of this persistent search to the
* provided buffer.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
index 75a9973..233f335 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
@@ -178,11 +178,7 @@
private DirectoryServerPlugin[] subordinateDeletePlugins;
private DirectoryServerPlugin[] intermediateResponsePlugins;
-
- /**
- * The mapping between the DN of a plugin entry and the plugin instance loaded
- * from that entry.
- */
+ /** The mapping between the DN of a plugin entry and the plugin instance loaded from that entry. */
private ConcurrentHashMap<DN,
DirectoryServerPlugin<? extends PluginCfg>>
registeredPlugins;
@@ -202,10 +198,7 @@
/** The plugin root configuration read at server startup. */
private PluginRootCfg pluginRootConfig;
- /**
- * The lock that will provide threadsafe access to the sets of registered
- * plugins.
- */
+ /** The lock that will provide threadsafe access to the sets of registered plugins. */
private ReentrantLock pluginLock;
private final ServerContext serverContext;
@@ -278,8 +271,6 @@
skippedPreOperationPlugins = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes this plugin configuration manager. This should only be called
* at Directory Server startup and before user plugins are loaded.
@@ -297,8 +288,6 @@
pluginRootConfig.addPluginDeleteListener(this);
}
-
-
/**
* Initializes any plugins defined in the directory server
* configuration. This should only be called at Directory Server
@@ -364,8 +353,6 @@
}
}
-
-
/**
* Loads the specified class, instantiates it as a plugin, and optionally
* initializes that plugin.
@@ -431,8 +418,6 @@
}
}
-
-
/**
* Gets the OpenDS plugin type object that corresponds to the configuration
* counterpart.
@@ -506,11 +491,7 @@
}
}
-
-
- /**
- * Finalizes all plugins that are registered with the Directory Server.
- */
+ /** Finalizes all plugins that are registered with the Directory Server. */
public void finalizePlugins()
{
pluginLock.lock();
@@ -537,8 +518,6 @@
}
}
-
-
/**
* Retrieves the set of plugins that have been registered with the Directory
* Server.
@@ -553,8 +532,6 @@
return registeredPlugins;
}
-
-
/**
* Retrieves the plugin with the specified configuration entry DN.
*
@@ -569,8 +546,6 @@
return registeredPlugins.get(pluginDN);
}
-
-
/**
* Registers the provided internal plugin with this plugin config
* manager and ensures that it will be invoked in the specified ways.
@@ -593,8 +568,6 @@
}
}
-
-
/**
* Register a plugin in the appropriate tables.
*
@@ -885,8 +858,6 @@
}
}
-
-
/**
* Registers the provided plugin with this plugin config manager and
* ensures that it will be invoked in the specified ways.
@@ -915,8 +886,6 @@
}
}
-
-
/**
* Adds the provided plugin to the given array. The provided array will not
* itself be modified, but rather a new array will be created with one
@@ -1043,7 +1012,6 @@
}
}
-
// Parse the array of already registered plugins to sort them accordingly.
HashMap<String,DirectoryServerPlugin> initialPlugins = new HashMap<>(initialPluginNames.size());
HashMap<String,DirectoryServerPlugin> finalPlugins = new HashMap<>(finalPluginNames.size());
@@ -1066,7 +1034,6 @@
}
}
-
// Get the name of the provided plugin from its RDN value and put it in
// the correct category.
DN dn = plugin.getPluginEntryDN();
@@ -1084,7 +1051,6 @@
otherPlugins.add(plugin);
}
-
// Compile a list of all the plugins in the correct order, convert it to
// an array, and return it.
ArrayList<DirectoryServerPlugin> newList = new ArrayList<>(pluginArray.length + 1);
@@ -1115,8 +1081,6 @@
}
}
-
-
/**
* Deregisters the provided internal plugin.
*
@@ -1137,8 +1101,6 @@
}
}
-
-
/**
* Deregisters the plugin with the provided configuration entry DN.
*
@@ -1165,8 +1127,6 @@
}
}
-
-
/**
* Deregisters the provided plugin.
*
@@ -1384,8 +1344,6 @@
}
}
-
-
/**
* Removes the provided plugin from the given array. The provided array will
* not itself be modified, but rather a new array will be created with one
@@ -1417,14 +1375,12 @@
return pluginArray;
}
-
// If it was the only element in the array, then return an empty array.
if (length == 0)
{
return new DirectoryServerPlugin[0];
}
-
// Create an array that's one element smaller and copy the remaining "good"
// elements into it.
DirectoryServerPlugin[] newPlugins = new DirectoryServerPlugin[length-1];
@@ -1441,8 +1397,6 @@
return newPlugins;
}
-
-
/**
* Invokes the set of startup plugins that have been registered with the
* Directory Server.
@@ -1494,8 +1448,6 @@
return result;
}
-
-
/**
* Invokes the set of shutdown plugins that have been configured in the
* Directory Server.
@@ -1518,8 +1470,6 @@
}
}
-
-
/**
* Invokes the set of post-connect plugins that have been configured in the
* Directory Server.
@@ -1554,7 +1504,6 @@
DisconnectReason.SERVER_ERROR, true, message);
}
-
if (result == null)
{
LocalizableMessage message = ERR_PLUGIN_POST_CONNECT_PLUGIN_RETURNED_NULL.
@@ -1580,8 +1529,6 @@
return result;
}
-
-
/**
* Invokes the set of post-disconnect plugins that have been configured in the
* Directory Server.
@@ -1618,7 +1565,6 @@
stackTraceToSingleLineString(e));
}
-
if (result == null)
{
logger.error(ERR_PLUGIN_POST_DISCONNECT_PLUGIN_RETURNED_NULL,
@@ -1642,8 +1588,6 @@
return result;
}
-
-
/**
* Invokes the set of LDIF import plugins that have been configured in the
* Directory Server.
@@ -1700,8 +1644,6 @@
return result;
}
-
-
/**
* Invokes the LDIF import session finalization of LDIF import plugins that
* have been configured in the Directory Server.
@@ -1718,8 +1660,6 @@
}
}
-
-
/**
* Invokes the LDIF import session initialization of LDIF import plugins that
* have been configured in the Directory Server.
@@ -1736,8 +1676,6 @@
}
}
-
-
/**
* Invokes the set of LDIF export plugins that have been configured in the
* Directory Server.
@@ -1796,8 +1734,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse abandon plugins that have been configured in
* the Directory Server.
@@ -1848,7 +1784,6 @@
return result;
}
-
private PluginResult.PreParse handlePreParseException(
Exception e, PreParseOperation operation, DirectoryServerPlugin plugin)
{
@@ -1878,7 +1813,6 @@
.getServerErrorResultCode(), message);
}
-
/**
* Invokes the set of pre-parse add plugins that have been configured in the
* Directory Server.
@@ -1935,8 +1869,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse bind plugins that have been configured in
* the Directory Server.
@@ -1987,8 +1919,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse compare plugins that have been configured in
* the Directory Server.
@@ -2045,8 +1975,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse delete plugins that have been configured in
* the Directory Server.
@@ -2103,8 +2031,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse extended plugins that have been configured in
* the Directory Server.
@@ -2161,8 +2087,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse modify plugins that have been configured in
* the Directory Server.
@@ -2219,8 +2143,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse modify DN plugins that have been configured in
* the Directory Server.
@@ -2277,8 +2199,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse search plugins that have been configured in
* the Directory Server.
@@ -2335,8 +2255,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-parse unbind plugins that have been configured in
* the Directory Server.
@@ -2387,8 +2305,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation add plugins that have been configured in
* the Directory Server.
@@ -2450,8 +2366,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation bind plugins that have been configured in
* the Directory Server.
@@ -2508,8 +2422,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation compare plugins that have been configured
* in the Directory Server.
@@ -2569,8 +2481,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation delete plugins that have been configured
* in the Directory Server.
@@ -2669,8 +2579,6 @@
.getServerErrorResultCode(), message);
}
-
-
/**
* Invokes the set of pre-operation extended plugins that have been configured
* in the Directory Server.
@@ -2734,8 +2642,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation modify plugins that have been configured
* in the Directory Server.
@@ -2798,8 +2704,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation modify DN plugins that have been
* configured in the Directory Server.
@@ -2862,8 +2766,6 @@
return result;
}
-
-
/**
* Invokes the set of pre-operation search plugins that have been configured
* in the Directory Server.
@@ -2926,8 +2828,6 @@
return result;
}
-
-
/**
* Invokes the set of post-operation abandon plugins that have been configured
* in the Directory Server.
@@ -2989,8 +2889,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation add plugins that have been configured in
* the Directory Server.
@@ -3056,8 +2954,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation bind plugins that have been configured
* in the Directory Server.
@@ -3123,8 +3019,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation compare plugins that have been configured
* in the Directory Server.
@@ -3265,8 +3159,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation extended plugins that have been
* configured in the Directory Server.
@@ -3332,8 +3224,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation modify plugins that have been configured
* in the Directory Server.
@@ -3398,8 +3288,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation modify DN plugins that have been
* configured in the Directory Server.
@@ -3465,8 +3353,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation search plugins that have been configured
* in the Directory Server.
@@ -3532,8 +3418,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-operation unbind plugins that have been configured
* in the Directory Server.
@@ -3599,8 +3483,6 @@
return finalResult;
}
-
-
/**
* Invokes the set of post-response add plugins that have been configured in
* the Directory Server.
@@ -3651,8 +3533,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response bind plugins that have been configured in
* the Directory Server.
@@ -3703,8 +3583,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response compare plugins that have been configured
* in the Directory Server.
@@ -3804,8 +3682,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response extended plugins that have been configured
* in the Directory Server.
@@ -3856,8 +3732,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response modify plugins that have been configured
* in the Directory Server.
@@ -3908,8 +3782,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response modify DN plugins that have been
* configured in the Directory Server.
@@ -3960,8 +3832,6 @@
return result;
}
-
-
/**
* Invokes the set of post-response search plugins that have been configured
* in the Directory Server.
@@ -4055,8 +3925,6 @@
}
}
-
-
/**
* Invokes the set of post-synchronization delete plugins that have been
* configured in the Directory Server.
@@ -4103,8 +3971,6 @@
}
}
-
-
/**
* Invokes the set of post-synchronization modify DN plugins that have been
* configured in the Directory Server.
@@ -4128,8 +3994,6 @@
}
}
-
-
/**
* Invokes the set of search result entry plugins that have been configured
* in the Directory Server.
@@ -4202,8 +4066,6 @@
return result;
}
-
-
/**
* Invokes the set of search result reference plugins that have been
* configured in the Directory Server.
@@ -4276,8 +4138,6 @@
return result;
}
-
-
/**
* Invokes the set of subordinate modify DN plugins that have been configured
* in the Directory Server.
@@ -4355,8 +4215,6 @@
return result;
}
-
-
/**
* Invokes the set of subordinate delete plugins that have been configured
* in the Directory Server.
@@ -4427,8 +4285,6 @@
return result;
}
-
-
/**
* Invokes the set of intermediate response plugins that have been configured
* in the Directory Server.
@@ -4493,9 +4349,6 @@
return result;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(PluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -4521,9 +4374,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
PluginCfg configuration)
@@ -4560,9 +4410,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
PluginCfg configuration,
@@ -4572,9 +4419,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
PluginCfg configuration)
@@ -4586,9 +4430,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
PluginCfg configuration,
@@ -4615,21 +4456,16 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
PluginCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing plugin if it's already enabled.
DirectoryServerPlugin existingPlugin =
registeredPlugins.get(configuration.dn());
-
// If the new configuration has the plugin disabled, then deregister it if
// it is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -4642,7 +4478,6 @@
return ccr;
}
-
// Get the class for the identity mapper. If the mapper is already enabled,
// then we shouldn't do anything with it although if the class has changed
// then we'll at least need to indicate that administrative action is
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
index db185f3..e65f893 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
@@ -47,7 +47,6 @@
implements ConfigurationChangeListener<RootDNUserCfg>,
ConfigurationAddListener<RootDNUserCfg>,
ConfigurationDeleteListener<RootDNUserCfg>
-
{
/** A mapping between the actual root DNs and their alternate bind DNs. */
private ConcurrentHashMap<DN,HashSet<DN>> alternateBindDNs;
@@ -92,11 +91,9 @@
rootPrivilegeChangeListener.setDefaultRootPrivileges(rootDNCfg);
rootDNCfg.addChangeListener(rootPrivilegeChangeListener);
-
rootDNCfg.addRootDNUserAddListener(this);
rootDNCfg.addRootDNUserDeleteListener(this);
-
// Get the set of root users defined below "cn=Root DNs,cn=config". For
// each one, register as a change listener, and get the set of alternate
// bind DNs.
@@ -125,8 +122,6 @@
}
}
-
-
/**
* Retrieves the set of privileges that will be granted to root users by
* default.
@@ -139,9 +134,6 @@
return rootPrivilegeChangeListener.getDefaultRootPrivileges();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(RootDNUserCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -163,9 +155,6 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(RootDNUserCfg configuration)
{
@@ -205,9 +194,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(RootDNUserCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -215,9 +201,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
RootDNUserCfg configuration)
@@ -239,9 +222,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(RootDNUserCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -264,9 +244,6 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
RootDNUserCfg configuration)
@@ -336,4 +313,3 @@
return ccr;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
index 0daa97b..9350e93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -43,7 +43,6 @@
defaultRootPrivileges = Privilege.getDefaultRootPrivileges();
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(RootDNCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -52,7 +51,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(RootDNCfg configuration)
{
@@ -72,8 +70,6 @@
return defaultRootPrivileges;
}
-
-
/**
* Specifies the set of privileges that will be automatically granted to root
* users.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
index 6e2ecdb..d3c5d6c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
@@ -52,13 +52,9 @@
ConfigurationAddListener<SASLMechanismHandlerCfg>,
ConfigurationDeleteListener<SASLMechanismHandlerCfg>
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated SASL
- * mechanism handlers.
- */
+ /** A mapping between the DNs of the config entries and the associated SASL mechanism handlers. */
private final ConcurrentHashMap<DN, SASLMechanismHandler> handlers;
private final ServerContext serverContext;
@@ -75,8 +71,6 @@
handlers = new ConcurrentHashMap<>();
}
-
-
/**
* Initializes all SASL mechanism handlers currently defined in the Directory
* Server configuration. This should only be called at Directory Server
@@ -96,7 +90,6 @@
rootConfiguration.addSASLMechanismHandlerAddListener(this);
rootConfiguration.addSASLMechanismHandlerDeleteListener(this);
-
//Initialize the existing SASL mechanism handlers.
for (String handlerName : rootConfiguration.listSASLMechanismHandlers())
{
@@ -123,9 +116,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -151,9 +141,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
SASLMechanismHandlerCfg configuration)
@@ -190,9 +177,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -203,9 +187,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
SASLMechanismHandlerCfg configuration)
@@ -221,9 +202,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -249,20 +227,15 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SASLMechanismHandlerCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing handler if it's already enabled.
SASLMechanismHandler existingHandler = handlers.get(configuration.dn());
-
// If the new configuration has the handler disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -279,7 +252,6 @@
return ccr;
}
-
// Get the class for the SASL handler. If the handler is already enabled,
// then we shouldn't do anything with it although if the class has changed
// then we'll at least need to indicate that administrative action is
@@ -315,8 +287,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a SASL mechanism hanlder, and
* optionally initializes that instance.
@@ -374,4 +344,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
index 9676b9e..27196e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
@@ -98,8 +98,6 @@
}
}
-
-
/**
* Retrieves the path to the directory containing the server schema files.
*
@@ -115,8 +113,6 @@
return null;
}
-
-
/**
* Retrieves a reference to the schema information that has been read from the
* server configuration. Note that this information will not be complete
@@ -133,8 +129,6 @@
return schema;
}
-
-
/**
* Initializes all the matching rules defined in the Directory Server
* configuration. This should only be called at Directory Server startup.
@@ -153,8 +147,6 @@
matchingRuleConfigManager.initializeMatchingRules();
}
-
-
/**
* Initializes all the attribute syntaxes defined in the Directory Server
* configuration. This should only be called at Directory Server startup.
@@ -174,14 +166,9 @@
syntaxConfigManager.initializeAttributeSyntaxes();
}
-
-
- /**
- * Filter implementation that accepts only ldif files.
- */
+ /** Filter implementation that accepts only ldif files. */
public static class SchemaFileFilter implements FilenameFilter
{
- /** {@inheritDoc} */
@Override
public boolean accept(File directory, String filename)
{
@@ -189,8 +176,6 @@
}
}
-
-
/**
* Initializes all the attribute type, object class, name form, DIT content
* rule, DIT structure rule, and matching rule use definitions by reading the
@@ -245,7 +230,6 @@
throw new InitializationException(message);
}
-
FilenameFilter filter = new SchemaFileFilter();
File[] schemaInstanceDirFiles =
schemaInstanceDir.listFiles(filter);
@@ -292,7 +276,6 @@
throw new InitializationException(message, e);
}
-
// If the oldest and youngest modification timestamps didn't get set for
// some reason, then set them to the current time.
if (oldestModificationTime <= 0)
@@ -308,7 +291,6 @@
schema.setOldestModificationTime(oldestModificationTime);
schema.setYoungestModificationTime(youngestModificationTime);
-
// Iterate through the schema files and read them as an LDIF file containing
// a single entry. Then get the attributeTypes and objectClasses attributes
// from that entry and parse them to initialize the server schema.
@@ -318,8 +300,6 @@
}
}
-
-
/**
* Loads the contents of the specified schema file into the provided schema.
*
@@ -344,8 +324,6 @@
return loadSchemaFile(schema, schemaFile, true);
}
-
-
/**
* Loads the contents of the specified schema file into the provided schema.
*
@@ -400,7 +378,6 @@
}
}
-
// Read the LDIF entry from the file and close the file.
Entry entry;
try
@@ -1030,8 +1007,6 @@
}
}
-
-
/**
* This method checks if a given attribute is an attribute that
* is used by the definition of the schema.
@@ -1064,4 +1039,3 @@
attributeOid.equals("ldapsyntaxes-oid");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java
index 83dcabd..3ddefde 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperation.java
@@ -464,6 +464,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
DN getProxiedAuthorizationDN();
/**
@@ -475,6 +476,7 @@
* authorization has been requested, or {@code null} if proxied
* authorization has not been requested.
*/
+ @Override
void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java
index 2948e51..42afbd3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationWrapper.java
@@ -34,7 +34,6 @@
public abstract class SearchOperationWrapper extends
OperationWrapper<SearchOperation> implements SearchOperation
{
-
/**
* Creates a new search operation based on the provided search operation.
*
@@ -45,14 +44,12 @@
super(search);
}
- /** {@inheritDoc} */
@Override
public boolean returnEntry(Entry entry, List<Control> controls)
{
return getOperation().returnEntry(entry, controls);
}
- /** {@inheritDoc} */
@Override
public boolean returnEntry(Entry entry, List<Control> controls,
boolean evaluateAci)
@@ -60,14 +57,12 @@
return getOperation().returnEntry(entry, controls, evaluateAci);
}
- /** {@inheritDoc} */
@Override
public boolean returnReference(DN dn, SearchResultReference reference)
{
return getOperation().returnReference(dn, reference);
}
- /** {@inheritDoc} */
@Override
public boolean returnReference(DN dn, SearchResultReference reference,
boolean evaluateAci)
@@ -75,277 +70,237 @@
return getOperation().returnReference(dn, reference, evaluateAci);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return getOperation().toString();
}
- /** {@inheritDoc} */
@Override
public Set<String> getAttributes()
{
return getOperation().getAttributes();
}
- /** {@inheritDoc} */
@Override
public DN getBaseDN()
{
return getOperation().getBaseDN();
}
- /** {@inheritDoc} */
@Override
public DereferenceAliasesPolicy getDerefPolicy()
{
return getOperation().getDerefPolicy();
}
- /** {@inheritDoc} */
@Override
public int getEntriesSent()
{
return getOperation().getEntriesSent();
}
- /** {@inheritDoc} */
@Override
public SearchFilter getFilter()
{
return getOperation().getFilter();
}
- /** {@inheritDoc} */
@Override
public ByteString getRawBaseDN()
{
return getOperation().getRawBaseDN();
}
- /** {@inheritDoc} */
@Override
public RawFilter getRawFilter()
{
return getOperation().getRawFilter();
}
- /** {@inheritDoc} */
@Override
public int getReferencesSent()
{
return getOperation().getReferencesSent();
}
- /** {@inheritDoc} */
@Override
public SearchScope getScope()
{
return getOperation().getScope();
}
- /** {@inheritDoc} */
@Override
public int getSizeLimit()
{
return getOperation().getSizeLimit();
}
- /** {@inheritDoc} */
@Override
public int getTimeLimit()
{
return getOperation().getTimeLimit();
}
- /** {@inheritDoc} */
@Override
public boolean getTypesOnly()
{
return getOperation().getTypesOnly();
}
- /** {@inheritDoc} */
@Override
public void sendSearchResultDone()
{
getOperation().sendSearchResultDone();
}
- /** {@inheritDoc} */
@Override
public void setAttributes(Set<String> attributes)
{
getOperation().setAttributes(attributes);
}
- /** {@inheritDoc} */
@Override
public void setBaseDN(DN baseDN)
{
getOperation().setBaseDN(baseDN);
}
- /** {@inheritDoc} */
@Override
public void setDerefPolicy(DereferenceAliasesPolicy derefPolicy)
{
getOperation().setDerefPolicy(derefPolicy);
}
- /** {@inheritDoc} */
@Override
public void setRawBaseDN(ByteString rawBaseDN)
{
getOperation().setRawBaseDN(rawBaseDN);
}
- /** {@inheritDoc} */
@Override
public void setRawFilter(RawFilter rawFilter)
{
getOperation().setRawFilter(rawFilter);
}
- /** {@inheritDoc} */
@Override
public void setScope(SearchScope scope)
{
getOperation().setScope(scope);
}
- /** {@inheritDoc} */
@Override
public void setSizeLimit(int sizeLimit)
{
getOperation().setSizeLimit(sizeLimit);
}
- /** {@inheritDoc} */
@Override
public void setTimeLimit(int timeLimit)
{
getOperation().setTimeLimit(timeLimit);
}
- /** {@inheritDoc} */
@Override
public void setTypesOnly(boolean typesOnly)
{
getOperation().setTypesOnly(typesOnly);
}
- /** {@inheritDoc} */
@Override
public void setTimeLimitExpiration(long timeLimitExpiration)
{
getOperation().setTimeLimitExpiration(timeLimitExpiration);
}
- /** {@inheritDoc} */
@Override
public boolean isReturnSubentriesOnly()
{
return getOperation().isReturnSubentriesOnly();
}
- /** {@inheritDoc} */
@Override
public void setReturnSubentriesOnly(boolean returnLDAPSubentries)
{
getOperation().setReturnSubentriesOnly(returnLDAPSubentries);
}
- /** {@inheritDoc} */
@Override
public MatchedValuesControl getMatchedValuesControl()
{
return getOperation().getMatchedValuesControl();
}
- /** {@inheritDoc} */
@Override
public void setMatchedValuesControl(MatchedValuesControl controls)
{
getOperation().setMatchedValuesControl(controls);
}
- /** {@inheritDoc} */
@Override
public boolean isIncludeUsableControl()
{
return getOperation().isIncludeUsableControl();
}
- /** {@inheritDoc} */
@Override
public void setIncludeUsableControl(boolean includeUsableControl)
{
getOperation().setIncludeUsableControl(includeUsableControl);
}
- /** {@inheritDoc} */
@Override
public long getTimeLimitExpiration()
{
return getOperation().getTimeLimitExpiration();
}
- /** {@inheritDoc} */
@Override
public boolean isClientAcceptsReferrals()
{
return getOperation().isClientAcceptsReferrals();
}
- /** {@inheritDoc} */
@Override
public void setClientAcceptsReferrals(boolean clientAcceptReferrals)
{
getOperation().setClientAcceptsReferrals(clientAcceptReferrals);
}
- /** {@inheritDoc} */
@Override
public boolean isSendResponse()
{
return getOperation().isSendResponse();
}
- /** {@inheritDoc} */
@Override
public void setSendResponse(boolean sendResponse)
{
getOperation().setSendResponse(sendResponse);
}
- /** {@inheritDoc} */
@Override
public boolean isRealAttributesOnly(){
return getOperation().isRealAttributesOnly();
}
- /** {@inheritDoc} */
@Override
public void setRealAttributesOnly(boolean realAttributesOnly){
getOperation().setRealAttributesOnly(realAttributesOnly);
}
- /** {@inheritDoc} */
@Override
public boolean isVirtualAttributesOnly()
{
return getOperation().isVirtualAttributesOnly();
}
- /** {@inheritDoc} */
@Override
public void setVirtualAttributesOnly(boolean virtualAttributesOnly){
getOperation().setVirtualAttributesOnly(virtualAttributesOnly);
}
- /** {@inheritDoc} */
@Override
public void sendSearchEntry(SearchResultEntry entry)
throws DirectoryException
@@ -353,12 +308,10 @@
getOperation().sendSearchEntry(entry);
}
- /** {@inheritDoc} */
@Override
public boolean sendSearchReference(SearchResultReference reference)
throws DirectoryException
{
return getOperation().sendSearchReference(reference);
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
index dc99930..aea2297 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
@@ -64,7 +64,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Password Policy Subentry draft attributes.
+ /** Password Policy Subentry draft attributes. */
private static final String PWD_OC_POLICY = "pwdpolicy";
private static final String PWD_ATTR_ATTRIBUTE = "pwdattribute";
private static final String PWD_ATTR_MINAGE = "pwdminage";
@@ -328,8 +328,6 @@
return null;
}
-
-
/**
* Helper method to validate integer values.
*
@@ -361,8 +359,6 @@
}
}
-
-
/**
* Helper method to retrieve an attribute value from given entry.
*
@@ -410,14 +406,12 @@
: getDefaultPasswordPolicy().isAllowUserPasswordChanges();
}
- /** {@inheritDoc} */
@Override
public boolean isExpirePasswordsWithoutWarning()
{
return getDefaultPasswordPolicy().isExpirePasswordsWithoutWarning();
}
- /** {@inheritDoc} */
@Override
public boolean isForceChangeOnAdd()
{
@@ -426,7 +420,6 @@
return getDefaultPasswordPolicy().isForceChangeOnAdd();
}
- /** {@inheritDoc} */
@Override
public boolean isForceChangeOnReset()
{
@@ -434,7 +427,6 @@
: getDefaultPasswordPolicy().isForceChangeOnReset();
}
- /** {@inheritDoc} */
@Override
public int getGraceLoginCount()
{
@@ -442,28 +434,24 @@
: getDefaultPasswordPolicy().getGraceLoginCount();
}
- /** {@inheritDoc} */
@Override
public long getIdleLockoutInterval()
{
return getDefaultPasswordPolicy().getIdleLockoutInterval();
}
- /** {@inheritDoc} */
@Override
public AttributeType getLastLoginTimeAttribute()
{
return getDefaultPasswordPolicy().getLastLoginTimeAttribute();
}
- /** {@inheritDoc} */
@Override
public String getLastLoginTimeFormat()
{
return getDefaultPasswordPolicy().getLastLoginTimeFormat();
}
- /** {@inheritDoc} */
@Override
public long getLockoutDuration()
{
@@ -471,7 +459,6 @@
: getDefaultPasswordPolicy().getLockoutDuration();
}
- /** {@inheritDoc} */
@Override
public int getLockoutFailureCount()
{
@@ -479,7 +466,6 @@
: getDefaultPasswordPolicy().getLockoutFailureCount();
}
- /** {@inheritDoc} */
@Override
public long getLockoutFailureExpirationInterval()
{
@@ -488,7 +474,6 @@
: getDefaultPasswordPolicy().getLockoutFailureExpirationInterval();
}
- /** {@inheritDoc} */
@Override
public long getMaxPasswordAge()
{
@@ -496,14 +481,12 @@
: getDefaultPasswordPolicy().getMaxPasswordAge();
}
- /** {@inheritDoc} */
@Override
public long getMaxPasswordResetAge()
{
return getDefaultPasswordPolicy().getMaxPasswordResetAge();
}
- /** {@inheritDoc} */
@Override
public long getMinPasswordAge()
{
@@ -511,7 +494,6 @@
: getDefaultPasswordPolicy().getMinPasswordAge();
}
- /** {@inheritDoc} */
@Override
public AttributeType getPasswordAttribute()
{
@@ -519,7 +501,6 @@
: getDefaultPasswordPolicy().getPasswordAttribute();
}
- /** {@inheritDoc} */
@Override
public boolean isPasswordChangeRequiresCurrentPassword()
{
@@ -528,7 +509,6 @@
: getDefaultPasswordPolicy().isPasswordChangeRequiresCurrentPassword();
}
- /** {@inheritDoc} */
@Override
public long getPasswordExpirationWarningInterval()
{
@@ -537,7 +517,6 @@
: getDefaultPasswordPolicy().getPasswordExpirationWarningInterval();
}
- /** {@inheritDoc} */
@Override
public int getPasswordHistoryCount()
{
@@ -545,56 +524,48 @@
: getDefaultPasswordPolicy().getPasswordHistoryCount();
}
- /** {@inheritDoc} */
@Override
public long getPasswordHistoryDuration()
{
return getDefaultPasswordPolicy().getPasswordHistoryDuration();
}
- /** {@inheritDoc} */
@Override
public SortedSet<String> getPreviousLastLoginTimeFormats()
{
return getDefaultPasswordPolicy().getPreviousLastLoginTimeFormats();
}
- /** {@inheritDoc} */
@Override
public long getRequireChangeByTime()
{
return getDefaultPasswordPolicy().getRequireChangeByTime();
}
- /** {@inheritDoc} */
@Override
public boolean isRequireSecureAuthentication()
{
return getDefaultPasswordPolicy().isRequireSecureAuthentication();
}
- /** {@inheritDoc} */
@Override
public boolean isRequireSecurePasswordChanges()
{
return getDefaultPasswordPolicy().isRequireSecurePasswordChanges();
}
- /** {@inheritDoc} */
@Override
public boolean isSkipValidationForAdministrators()
{
return getDefaultPasswordPolicy().isSkipValidationForAdministrators();
}
- /** {@inheritDoc} */
@Override
public StateUpdateFailurePolicy getStateUpdateFailurePolicy()
{
return getDefaultPasswordPolicy().getStateUpdateFailurePolicy();
}
- /** {@inheritDoc} */
@Override
public boolean isAuthPasswordSyntax()
{
@@ -602,42 +573,36 @@
: getDefaultPasswordPolicy().isAuthPasswordSyntax();
}
- /** {@inheritDoc} */
@Override
public List<PasswordStorageScheme<?>> getDefaultPasswordStorageSchemes()
{
return getDefaultPasswordPolicy().getDefaultPasswordStorageSchemes();
}
- /** {@inheritDoc} */
@Override
public Set<String> getDeprecatedPasswordStorageSchemes()
{
return getDefaultPasswordPolicy().getDeprecatedPasswordStorageSchemes();
}
- /** {@inheritDoc} */
@Override
public DN getDN()
{
return passwordPolicySubentryDN;
}
- /** {@inheritDoc} */
@Override
public boolean isDefaultPasswordStorageScheme(String name)
{
return getDefaultPasswordPolicy().isDefaultPasswordStorageScheme(name);
}
- /** {@inheritDoc} */
@Override
public boolean isDeprecatedPasswordStorageScheme(String name)
{
return getDefaultPasswordPolicy().isDeprecatedPasswordStorageScheme(name);
}
- /** {@inheritDoc} */
@Override
public Collection<PasswordValidator<?>> getPasswordValidators()
{
@@ -661,7 +626,6 @@
return getDefaultPasswordPolicy().getPasswordValidators();
}
-
/**
* Implementation of a specific Password Validator that reject all
* password due to mis-configured password policy subentry.
@@ -680,7 +644,6 @@
pwPolicyName = policyName;
}
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(PasswordValidatorCfg configuration)
throws ConfigException, InitializationException
@@ -688,7 +651,6 @@
// do nothing
}
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -707,7 +669,6 @@
}
}
- /** {@inheritDoc} */
@Override
public Collection<AccountStatusNotificationHandler<?>>
getAccountStatusNotificationHandlers()
@@ -715,11 +676,9 @@
return getDefaultPasswordPolicy().getAccountStatusNotificationHandlers();
}
- /** {@inheritDoc} */
@Override
public PasswordGenerator<?> getPasswordGenerator()
{
return getDefaultPasswordPolicy().getPasswordGenerator();
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
index dd7171e..bc3ef38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -121,9 +121,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SynchronizationProviderCfg configuration)
@@ -204,9 +201,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SynchronizationProviderCfg configuration,
@@ -216,9 +210,6 @@
|| isJavaClassAcceptable(configuration, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
SynchronizationProviderCfg configuration)
@@ -268,9 +259,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
SynchronizationProviderCfg configuration,
@@ -280,8 +268,6 @@
|| isJavaClassAcceptable(configuration, unacceptableReasons);
}
-
-
/**
* Check if the class provided in the configuration is an acceptable
* java class for a synchronization provider.
@@ -383,7 +369,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
SynchronizationProviderCfg configuration)
@@ -402,9 +387,6 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
SynchronizationProviderCfg configuration,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
index 9d1ce1a..dcd4cad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -52,15 +52,10 @@
implements ConfigurationChangeListener<TrustManagerProviderCfg>,
ConfigurationAddListener<TrustManagerProviderCfg>,
ConfigurationDeleteListener<TrustManagerProviderCfg>
-
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated trust
- * manager providers.
- */
+ /** A mapping between the DNs of the config entries and the associated trust manager providers. */
private final ConcurrentHashMap<DN,TrustManagerProvider> providers;
private final ServerContext serverContext;
@@ -96,7 +91,6 @@
rootConfiguration.addTrustManagerProviderAddListener(this);
rootConfiguration.addTrustManagerProviderDeleteListener(this);
-
//Initialize the existing trust manager providers.
for (String name : rootConfiguration.listTrustManagerProviders())
{
@@ -124,9 +118,7 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationAddAcceptable(
TrustManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -151,9 +143,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationAdd(
TrustManagerProviderCfg configuration)
{
@@ -191,9 +181,7 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationDeleteAcceptable(
TrustManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -203,9 +191,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationDelete(
TrustManagerProviderCfg configuration)
{
@@ -222,9 +208,7 @@
return ccr;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
TrustManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -249,19 +233,15 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
TrustManagerProviderCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing provider if it's already enabled.
TrustManagerProvider existingProvider = providers.get(configuration.dn());
-
// If the new configuration has the provider disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -280,7 +260,6 @@
return ccr;
}
-
// Get the class for the trust manager provider. If the provider is already
// enabled, then we shouldn't do anything with it although if the class has
// changed then we'll at least need to indicate that administrative action
@@ -317,8 +296,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a trust manager provider, and
* optionally initializes that instance.
@@ -376,4 +353,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
index 16ac360..42cdf68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
@@ -62,7 +62,6 @@
ERR_CANNOT_CANCEL_UNBIND.get());
}
- /** {@inheritDoc} */
@Override
public final OperationType getOperationType()
{
@@ -71,20 +70,17 @@
return OperationType.UNBIND;
}
- /** {@inheritDoc} */
@Override
public DN getProxiedAuthorizationDN()
{
return null;
}
- /** {@inheritDoc} */
@Override
public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
{
}
- /** {@inheritDoc} */
@Override
public final List<Control> getResponseControls()
{
@@ -93,14 +89,12 @@
return NO_RESPONSE_CONTROLS;
}
- /** {@inheritDoc} */
@Override
public final void addResponseControl(Control control)
{
// An unbind operation can never have a response, so just ignore this.
}
- /** {@inheritDoc} */
@Override
public final void removeResponseControl(Control control)
{
@@ -125,23 +119,19 @@
logUnbind(this);
-
// Check the set of controls included in the request. If there are any,
// see if any special processing is needed.
// NYI
-
// Disconnect the client.
getClientConnection().disconnect(DisconnectReason.UNBIND, false, null);
-
// Invoke the post-operation unbind plugins.
getPluginConfigManager().invokePostOperationUnbindPlugins(this);
setProcessingStopTime();
}
- /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
@@ -151,6 +141,4 @@
buffer.append(operationID);
buffer.append(")");
}
-
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
index c977bc3..9fc0bb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -65,10 +65,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A mapping between the DNs of the config entries and the associated virtual
- * attribute rules.
- */
+ /** A mapping between the DNs of the config entries and the associated virtual attribute rules. */
private final ConcurrentMap<DN, VirtualAttributeRule> rules = new ConcurrentHashMap<>();
private final ServerContext serverContext;
@@ -103,7 +100,6 @@
rootConfiguration.addVirtualAttributeAddListener(this);
rootConfiguration.addVirtualAttributeDeleteListener(this);
-
//Initialize the existing virtual attribute providers.
for (String providerName : rootConfiguration.listVirtualAttributes())
{
@@ -171,7 +167,6 @@
cfg.getConflictBehavior());
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
VirtualAttributeCfg configuration,
@@ -220,7 +215,6 @@
return filters;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
VirtualAttributeCfg configuration)
@@ -270,7 +264,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
VirtualAttributeCfg configuration,
@@ -280,7 +273,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
VirtualAttributeCfg configuration)
@@ -296,7 +288,6 @@
return ccr;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
VirtualAttributeCfg configuration,
@@ -337,18 +328,15 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
VirtualAttributeCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the existing rule if it's already enabled.
VirtualAttributeRule existingRule = rules.get(configuration.dn());
-
// If the new configuration has the rule disabled, then disable it if it
// is enabled, or do nothing if it's already disabled.
if (! configuration.isEnabled())
@@ -362,7 +350,6 @@
return ccr;
}
-
// Make sure that we can parse all of the search filters.
Map<LocalizableMessage, DirectoryException> reasons =
new LinkedHashMap<>();
@@ -403,8 +390,6 @@
return ccr;
}
-
-
/**
* Loads the specified class, instantiates it as a certificate mapper, and
* optionally initializes that instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
index 00417e4..c433a08 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
@@ -30,10 +30,7 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
-/**
- * This class defines a utility that will be used to manage the Directory Server
- * work queue.
- */
+/** This class defines a utility that will be used to manage the Directory Server work queue. */
public class WorkQueueConfigManager
implements ConfigurationChangeListener<WorkQueueCfg>
{
@@ -50,7 +47,6 @@
this.serverContext = serverContext;
}
-
/**
* Initializes the Directory Server's work queue. This should only be called
* at server startup.
@@ -72,7 +68,6 @@
WorkQueueCfg workQueueConfig = serverContext.getRootConfig().getWorkQueue();
workQueueConfig.addChangeListener(this);
-
// Get the work queue class, and load and instantiate an instance of it
// using that configuration.
WorkQueueCfgDefn definition = WorkQueueCfgDefn.getInstance();
@@ -98,9 +93,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(WorkQueueCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -110,9 +102,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(WorkQueueCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
index a9413d8..81ca447 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.AESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -36,8 +34,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme that will
* encode values using the AES reversible encryption algorithm. This
@@ -49,16 +45,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* The reference to the Directory Server crypto manager that we will use to
* handle the encryption/decryption.
*/
private CryptoManager cryptoManager;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -69,7 +61,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
AESPasswordStorageSchemeCfg configuration)
@@ -78,14 +69,12 @@
cryptoManager = DirectoryServer.getCryptoManager();
}
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_AES;
}
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -118,7 +107,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -157,7 +145,6 @@
return ByteString.valueOfUtf8(buffer);
}
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -177,14 +164,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -206,7 +191,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -214,7 +198,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -224,7 +207,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -233,7 +215,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -244,7 +225,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -252,4 +232,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
index 9d93ece..c728deb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -45,11 +45,7 @@
/** The current configuration for this password validator. */
private AttributeValuePasswordValidatorCfg currentConfig;
-
-
- /**
- * Creates a new instance of this attribute value password validator.
- */
+ /** Creates a new instance of this attribute value password validator. */
public AttributeValuePasswordValidator()
{
super();
@@ -58,9 +54,6 @@
// performed in the initializePasswordValidator() method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
AttributeValuePasswordValidatorCfg configuration)
@@ -69,17 +62,12 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeAttributeValueChangeListener(this);
}
-
-
/**
* Search for substrings of the password in an Attribute. The search is
* case-insensitive.
@@ -113,9 +101,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -125,7 +110,6 @@
// Get a handle to the current configuration.
AttributeValuePasswordValidatorCfg config = currentConfig;
-
// Get the string representation (both forward and reversed) for the password.
final String password = newPassword.toString();
final String reversed = new StringBuilder(password).reverse().toString();
@@ -165,14 +149,10 @@
}
}
-
// If we've gotten here, then the password is acceptable.
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -182,9 +162,7 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
AttributeValuePasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -193,9 +171,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
AttributeValuePasswordValidatorCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
index 82a7fc8..7fa3e77 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.Base64PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -32,8 +30,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-
-
/**
* This class defines a Directory Server password storage scheme that will store
* the values in base64-encoded form. This is a reversible algorithm that
@@ -45,8 +41,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -57,9 +51,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
Base64PasswordStorageSchemeCfg configuration)
@@ -68,18 +59,12 @@
// No initialization is required.
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_BASE64;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -87,9 +72,6 @@
return ByteString.valueOfUtf8(Base64.encode(plaintext));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -103,9 +85,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -115,18 +94,12 @@
return userString.equals(storedString);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -145,9 +118,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -155,9 +125,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -167,9 +134,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -178,9 +142,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -191,9 +152,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -202,4 +160,3 @@
return false;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
index 52f8f87..f4e659e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.cert.X509Certificate;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
@@ -28,8 +26,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-
-
/**
* This class provides an implementation of a trust manager provider that will
* indicate that any certificate presented should be blindly trusted by the
@@ -52,9 +48,6 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeTrustManagerProvider(
BlindTrustManagerProviderCfg configuration)
@@ -63,21 +56,12 @@
// No implementation is required.
}
-
-
- /**
- * Performs any finalization that may be necessary for this trust manager
- * provider.
- */
@Override
public void finalizeTrustManagerProvider()
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public TrustManager[] getTrustManagers()
throws DirectoryException
@@ -85,8 +69,6 @@
return new TrustManager[] { this };
}
-
-
/**
* Determines whether an SSL client with the provided certificate chain should
* be trusted. In this case, all client certificates will be trusted.
@@ -94,14 +76,13 @@
* @param chain The certificate chain for the SSL client.
* @param authType The authentication type based on the client certificate.
*/
+ @Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
{
// As long as we don't throw an exception, then the client certificate will
// be considered trusted.
}
-
-
/**
* Determines whether an SSL server with the provided certificate chain should
* be trusted. In this case, all server certificates will be trusted.
@@ -109,14 +90,13 @@
* @param chain The certificate chain for the SSL server.
* @param authType The key exchange algorithm used.
*/
+ @Override
public void checkServerTrusted(X509Certificate[] chain, String authType)
{
// As long as we don't throw an exception, then the server certificate will
// be considered trusted.
}
-
-
/**
* Retrieves the set of certificate authority certificates which are trusted
* for authenticating peers.
@@ -124,9 +104,9 @@
* @return An empty array, since we don't care what certificates are
* presented because we will trust them all.
*/
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
return new X509Certificate[0];
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
index db4e63a..5241a11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.BlowfishPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -36,8 +34,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme that will
* encode values using the Blowfish reversible encryption algorithm. This
@@ -49,16 +45,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* The reference to the Directory Server crypto manager that we will use to
* handle the encryption/decryption.
*/
private CryptoManager cryptoManager;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -69,9 +61,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
BlowfishPasswordStorageSchemeCfg configuration)
@@ -80,18 +69,12 @@
cryptoManager = DirectoryServer.getCryptoManager();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_BLOWFISH;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -124,9 +107,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -166,9 +146,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -188,18 +165,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -221,9 +192,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -231,9 +199,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -243,9 +208,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -254,9 +216,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -267,9 +226,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -277,4 +233,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 92a2c9f..8149ec5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -84,19 +84,12 @@
/** The message digest engine that will be used to create the MD5 digests. */
private MessageDigest md5Digest;
- /**
- * The lock that will be used to provide threadsafe access to the message
- * digest.
- */
+ /** The lock that will be used to provide threadsafe access to the message digest. */
private Object digestLock;
- /**
- * The random number generator that we will use to create the server challenge.
- */
+ /** The random number generator that we will use to create the server challenge. */
private SecureRandom randomGenerator;
-
-
/**
* Creates a new instance of this SASL mechanism handler. No initialization
* should be done in this method, as it should all be performed in the
@@ -107,9 +100,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeSASLMechanismHandler(
CramMD5SASLMechanismHandlerCfg configuration)
@@ -135,14 +125,12 @@
throw new InitializationException(message, e);
}
-
// Create and fill the iPad and oPad arrays.
iPad = new byte[HMAC_MD5_BLOCK_LENGTH];
oPad = new byte[HMAC_MD5_BLOCK_LENGTH];
Arrays.fill(iPad, CRAMMD5_IPAD_BYTE);
Arrays.fill(oPad, CRAMMD5_OPAD_BYTE);
-
// Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
@@ -150,9 +138,6 @@
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_CRAM_MD5, this);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeSASLMechanismHandler()
{
@@ -160,10 +145,6 @@
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_CRAM_MD5);
}
-
-
-
- /** {@inheritDoc} */
@Override
public void processSASLBind(BindOperation bindOperation)
{
@@ -195,7 +176,6 @@
return;
}
-
// If we've gotten here, then the client did provide credentials. First,
// make sure that we have a stored version of the credentials associated
// with the client connection. If not, then it likely means that the client
@@ -224,7 +204,6 @@
// Wipe out the stored challenge so it can't be used again.
clientConnection.setSASLAuthStateInfo(null);
-
// Now look at the client credentials and make sure that we can decode them.
// It should be a username followed by a space and a digest string. Since
// the username itself may contain spaces but the digest string may not,
@@ -243,7 +222,6 @@
String userName = credString.substring(0, spacePos);
String digest = credString.substring(spacePos+1);
-
// Look at the digest portion of the provided credentials. It must have a
// length of exactly 32 bytes and be comprised only of hex characters.
if (digest.length() != 2*MD5_DIGEST_LENGTH)
@@ -274,7 +252,6 @@
return;
}
-
// Get the user entry for the authentication ID. Allow for an
// authentication ID that is just a username (as per the CRAM-MD5 spec), but
// also allow a value in the authzid form specified in RFC 2829.
@@ -353,7 +330,6 @@
}
}
-
// At this point, we should have a user entry. If we don't then fail.
if (userEntry == null)
{
@@ -368,7 +344,6 @@
bindOperation.setSASLAuthUserEntry(userEntry);
}
-
// Get the clear-text passwords from the user entry, if there are any.
List<ByteString> clearPasswords;
try
@@ -405,7 +380,6 @@
return;
}
-
// Iterate through the clear-text values and see if any of them can be used
// in conjunction with the challenge to construct the provided digest.
boolean matchFound = false;
@@ -428,7 +402,6 @@
return;
}
-
// If we've gotten here, then the authentication was successful.
bindOperation.setResultCode(ResultCode.SUCCESS);
@@ -437,8 +410,6 @@
bindOperation.setAuthenticationInfo(authInfo);
}
-
-
/**
* Generates the appropriate HMAC-MD5 digest for a CRAM-MD5 authentication
* with the given information.
@@ -456,7 +427,6 @@
byte[] p = password.toByteArray();
byte[] c = challenge.toByteArray();
-
// Grab a lock to protect the MD5 digest generation.
synchronized (digestLock)
{
@@ -467,7 +437,6 @@
p = md5Digest.digest(p);
}
-
// Create byte arrays with data needed for the hash generation.
byte[] iPadAndData = new byte[HMAC_MD5_BLOCK_LENGTH + c.length];
System.arraycopy(iPad, 0, iPadAndData, 0, HMAC_MD5_BLOCK_LENGTH);
@@ -476,7 +445,6 @@
byte[] oPadAndHash = new byte[HMAC_MD5_BLOCK_LENGTH + MD5_DIGEST_LENGTH];
System.arraycopy(oPad, 0, oPadAndHash, 0, HMAC_MD5_BLOCK_LENGTH);
-
// Iterate through the bytes in the key and XOR them with the iPad and
// oPad as appropriate.
for (int i=0; i < p.length; i++)
@@ -485,21 +453,16 @@
oPadAndHash[i] ^= p[i];
}
-
// Copy an MD5 digest of the iPad-XORed key and the data into the array to
// be hashed.
System.arraycopy(md5Digest.digest(iPadAndData), 0, oPadAndHash,
HMAC_MD5_BLOCK_LENGTH, MD5_DIGEST_LENGTH);
-
// Return an MD5 digest of the resulting array.
return md5Digest.digest(oPadAndHash);
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isPasswordBased(String mechanism)
{
@@ -507,9 +470,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure(String mechanism)
{
@@ -517,9 +477,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -530,9 +487,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
CramMD5SASLMechanismHandlerCfg configuration,
@@ -541,9 +495,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
CramMD5SASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
index 5a67173..60b2ea5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CancelExtendedOperation.java
@@ -54,7 +54,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializeExtendedOperationHandler(
CancelExtendedOperationHandlerCfg config)
@@ -102,19 +101,16 @@
return;
}
-
// Create the cancel request for the target operation.
LocalizableMessage cancelReason =
INFO_EXTOP_CANCEL_REASON.get(operation.getMessageID());
CancelRequest cancelRequest = new CancelRequest(true, cancelReason);
-
// Get the client connection and attempt the cancel.
ClientConnection clientConnection = operation.getClientConnection();
CancelResult cancelResult = clientConnection.cancelOperation(idToCancel,
cancelRequest);
-
// Update the result of the extended operation and return.
ResultCode resultCode = cancelResult.getResultCode();
operation.setResultCode(resultCode == ResultCode.CANCELLED
@@ -122,14 +118,12 @@
operation.appendErrorMessage(cancelResult.getResponseMessage());
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationOID()
{
return OID_CANCEL_REQUEST;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationName()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
index 14172bc..5ec3013 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -105,6 +105,7 @@
*
* @return The human-readable name for this certificate validation policy.
*/
+ @Override
public String toString()
{
return policyName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 5adbc27..a6956fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -49,10 +49,7 @@
/** The current configuration for this password validator. */
private CharacterSetPasswordValidatorCfg currentConfig;
- /**
- * A mapping between the character sets and the minimum number of characters
- * required for each.
- */
+ /** A mapping between the character sets and the minimum number of characters required for each. */
private HashMap<String,Integer> characterSets;
/**
@@ -61,11 +58,7 @@
*/
private HashMap<String,Integer> characterRanges;
-
-
- /**
- * Creates a new instance of this character set password validator.
- */
+ /** Creates a new instance of this character set password validator. */
public CharacterSetPasswordValidator()
{
super();
@@ -74,9 +67,6 @@
// performed in the initializePasswordValidator() method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
CharacterSetPasswordValidatorCfg configuration)
@@ -90,18 +80,12 @@
processCharacterSetsAndRanges(configuration, true);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeCharacterSetChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -112,7 +96,6 @@
CharacterSetPasswordValidatorCfg config = currentConfig;
HashMap<String,Integer> characterSets = this.characterSets;
-
// Process the provided password.
String password = newPassword.toString();
HashMap<String,Integer> setCounts = new HashMap<>();
@@ -227,7 +210,6 @@
usedOptionalCharacterSets++;
}
}
-
}
// Check minimum optional character sets are present.
@@ -285,8 +267,6 @@
return true;
}
-
-
/**
* Parses the provided configuration and extracts the character set
* definitions and associated minimum counts from them.
@@ -469,9 +449,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -481,9 +458,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
CharacterSetPasswordValidatorCfg configuration,
@@ -504,9 +478,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
CharacterSetPasswordValidatorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
index fb5beda..59f97c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.ClearPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -29,8 +27,6 @@
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-
-
/**
* This class defines a Directory Server password storage scheme that will store
* the values in clear-text with no encoding at all. This is not at all secure
@@ -50,9 +46,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
ClearPasswordStorageSchemeCfg configuration)
@@ -61,18 +54,12 @@
// No initialization is required.
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_CLEAR;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -80,9 +67,6 @@
return plaintext.toByteString();
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -96,9 +80,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -106,18 +87,12 @@
return plaintextPassword.equals(storedPassword);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -125,9 +100,6 @@
return storedPassword.toByteString();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -135,9 +107,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -147,9 +116,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -158,9 +124,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -171,9 +134,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -181,4 +141,3 @@
return false;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
index fdca727..ef96526 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
@@ -38,10 +38,7 @@
extends VirtualAttributeProvider<
CollectiveAttributeSubentriesVirtualAttributeCfg>
{
- /**
- * Creates a new instance of this collectiveAttributeSubentries
- * virtual attribute provider.
- */
+ /** Creates a new instance of this collectiveAttributeSubentries virtual attribute provider. */
public CollectiveAttributeSubentriesVirtualAttributeProvider()
{
super();
@@ -50,18 +47,15 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return true;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
-
AttributeBuilder builder = new AttributeBuilder(rule.getAttributeType());
if (!entry.isSubentry() && !entry.isLDAPSubentry())
{
@@ -80,7 +74,6 @@
return builder.toAttribute();
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -89,7 +82,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
index b39a178..4da56d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -52,16 +52,11 @@
extends PasswordStorageScheme<CryptPasswordStorageSchemeCfg>
implements ConfigurationChangeListener<CryptPasswordStorageSchemeCfg>
{
-
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
+ /** The fully-qualified name of this class for debugging purposes. */
private static final String CLASS_NAME =
"org.opends.server.extensions.CryptPasswordStorageScheme";
- /**
- * The current configuration for the CryptPasswordStorageScheme.
- */
+ /** The current configuration for the CryptPasswordStorageScheme. */
private CryptPasswordStorageSchemeCfg currentConfig;
/**
@@ -76,7 +71,6 @@
private final Object saltLock = new Object();
private final Crypt crypt = new Crypt();
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -87,29 +81,22 @@
super();
}
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
CryptPasswordStorageSchemeCfg configuration)
throws ConfigException, InitializationException {
-
configuration.addCryptChangeListener(this);
currentConfig = configuration;
}
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_CRYPT;
}
-
- /**
- * Encrypt plaintext password with the Unix Crypt algorithm.
- */
+ /** Encrypt plaintext password with the Unix Crypt algorithm. */
private ByteString unixCryptEncodePassword(ByteSequence plaintext)
throws DirectoryException
{
@@ -230,7 +217,6 @@
return ByteString.valueOfUtf8(output);
}
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -254,8 +240,6 @@
return bytes;
}
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -271,9 +255,7 @@
return ByteString.valueOfUtf8(buffer);
}
- /**
- * Matches passwords encrypted with the Unix Crypt algorithm.
- */
+ /** Matches passwords encrypted with the Unix Crypt algorithm. */
private boolean unixCryptPasswordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
{
@@ -370,7 +352,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -394,7 +375,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -402,9 +382,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -414,9 +391,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -425,18 +399,12 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -446,9 +414,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -459,9 +424,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -472,7 +434,6 @@
// category, but it's certainly a lot more vulnerable to lookup tables
// than most other algorithms. I'd say we can keep it this way for now,
// but it might be something to reconsider later.
- //
// Currently, this method is unused. However, the intended purpose is
// eventually for use in issue #321, where we could do things like prevent
// even authorized users from seeing the password value over an insecure
@@ -481,7 +442,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
PasswordStorageSchemeCfg configuration,
@@ -492,9 +452,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
CryptPasswordStorageSchemeCfg configuration,
@@ -504,7 +461,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
CryptPasswordStorageSchemeCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
index f8388cf..297c7f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DefaultEntryCache.java
@@ -49,7 +49,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/**
* The entry cache order array reflects all currently configured and
* active entry cache implementations in cache level specific order.
@@ -57,10 +56,7 @@
private static EntryCache<? extends EntryCacheCfg>[] cacheOrder =
new EntryCache<?>[0];
-
- /**
- * Creates a new instance of this default entry cache.
- */
+ /** Creates a new instance of this default entry cache. */
public DefaultEntryCache()
{
super();
@@ -70,7 +66,6 @@
DirectoryServer.registerBackendInitializationListener(this);
}
- /** {@inheritDoc} */
@Override
public void initializeEntryCache(EntryCacheCfg configEntry)
throws ConfigException, InitializationException
@@ -78,7 +73,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public void finalizeEntryCache()
{
@@ -89,7 +83,6 @@
cacheOrder = new EntryCache<?>[0];
}
- /** {@inheritDoc} */
@Override
public boolean containsEntry(DN entryDN)
{
@@ -106,7 +99,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public Entry getEntry(String backendID, long entryID)
{
@@ -127,7 +119,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public Entry getEntry(DN entryDN)
{
@@ -148,7 +139,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public long getEntryID(DN entryDN)
{
@@ -163,7 +153,6 @@
return -1;
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN(String backendID, long entryID)
{
@@ -178,7 +167,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public void putEntry(Entry entry, String backendID, long entryID)
{
@@ -192,7 +180,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean putEntryIfAbsent(Entry entry, String backendID, long entryID)
{
@@ -208,7 +195,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void removeEntry(DN entryDN)
{
@@ -220,7 +206,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clear()
{
@@ -229,7 +214,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clearBackend(String backendID)
{
@@ -238,7 +222,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clearSubtree(DN baseDN)
{
@@ -247,7 +230,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void handleLowMemory()
{
@@ -256,7 +238,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
EntryCacheCfg configuration,
@@ -267,7 +248,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(EntryCacheCfg configuration)
{
@@ -306,7 +286,6 @@
}
}
- /** {@inheritDoc} */
@Override
public Long getCacheCount()
{
@@ -317,7 +296,6 @@
return cacheCount;
}
- /** {@inheritDoc} */
@Override
public String toVerboseString()
{
@@ -334,8 +312,6 @@
return verboseString.length() > 0 ? verboseString : null;
}
-
-
/**
* Retrieves the current cache order array.
*
@@ -346,8 +322,6 @@
return DefaultEntryCache.cacheOrder;
}
-
-
/**
* Sets the current cache order array.
*
@@ -361,8 +335,6 @@
cacheOrderMap.values().toArray(new EntryCache<?>[0]);
}
-
-
/**
* Performs any processing that may be required whenever a backend
* is initialized for use in the Directory Server. This method will
@@ -378,8 +350,6 @@
// Do nothing.
}
-
-
/**
* Performs any processing that may be required whenever a backend
* is finalized. This method will be invoked after the backend has
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
index 8e3122b..1031f49 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -55,11 +55,7 @@
/** The current dictionary that we should use when performing the validation. */
private HashSet<String> dictionary;
-
-
- /**
- * Creates a new instance of this dictionary password validator.
- */
+ /** Creates a new instance of this dictionary password validator. */
public DictionaryPasswordValidator()
{
super();
@@ -68,9 +64,6 @@
// performed in the initializePasswordValidator() method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
DictionaryPasswordValidatorCfg configuration)
@@ -82,18 +75,12 @@
dictionary = loadDictionary(configuration);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeDictionaryChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -142,13 +129,10 @@
return false;
}
-
// If we've gotten here, then the password is acceptable.
return true;
}
-
-
/**
* Loads the configured dictionary and returns it as a hash set.
*
@@ -174,7 +158,6 @@
throw new ConfigException(message);
}
-
// Read the contents of file into the dictionary as per the configuration.
BufferedReader reader = null;
HashSet<String> dictionary = new HashSet<>();
@@ -208,9 +191,6 @@
return dictionary;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -220,9 +200,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
DictionaryPasswordValidatorCfg configuration,
@@ -248,9 +225,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
DictionaryPasswordValidatorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 3a4947c..deffcbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -52,7 +52,6 @@
public class DigestMD5SASLMechanismHandler
extends SASLMechanismHandler<DigestMD5SASLMechanismHandlerCfg>
implements ConfigurationChangeListener<DigestMD5SASLMechanismHandlerCfg> {
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The current configuration for this SASL mechanism handler. */
@@ -73,7 +72,6 @@
/** Property used to set the realm in the environment. */
private static final String REALM_PROPERTY = "com.sun.security.sasl.digest.realm";
-
/**
* Creates a new instance of this SASL mechanism handler. No initialization
* should be done in this method, as it should all be performed in the
@@ -84,8 +82,6 @@
super();
}
-
- /** {@inheritDoc} */
@Override
public void initializeSASLMechanismHandler(
DigestMD5SASLMechanismHandlerCfg configuration)
@@ -117,16 +113,12 @@
}
}
-
- /** {@inheritDoc} */
@Override
public void finalizeSASLMechanismHandler() {
configuration.removeDigestMD5ChangeListener(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_DIGEST_MD5);
}
-
- /** {@inheritDoc} */
@Override
public void processSASLBind(BindOperation bindOp) {
ClientConnection clientConnection = bindOp.getClientConnection();
@@ -159,8 +151,6 @@
}
}
-
- /** {@inheritDoc} */
@Override
public boolean isPasswordBased(String mechanism)
{
@@ -168,9 +158,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure(String mechanism)
{
@@ -178,8 +165,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -190,8 +175,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
DigestMD5SASLMechanismHandlerCfg configuration,
@@ -200,8 +183,6 @@
return true;
}
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
DigestMD5SASLMechanismHandlerCfg configuration)
@@ -231,7 +212,6 @@
return ccr;
}
-
/**
* Retrieves the QOP (quality-of-protection) from the specified
* configuration.
@@ -251,7 +231,6 @@
}
}
-
/**
* Returns the fully qualified name either defined in the configuration, or,
* determined by examining the system configuration.
@@ -271,7 +250,6 @@
return serverName;
}
-
/**
* Retrieve the realm either defined in the specified configuration. If this
* isn't defined, the SaslServer internal code uses the server name.
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 1fb8509..7801e4e 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
@@ -80,13 +80,11 @@
this.handler = handler;
}
- /** {@inheritDoc} */
@Override
public String getMonitorInstanceName() {
return instanceName + "," + "cn=" + baseName;
}
- /** {@inheritDoc} */
@Override
public void initializeMonitorProvider(MonitorProviderCfg configuration)
throws ConfigException, InitializationException {
@@ -149,7 +147,7 @@
private class HandlerNotifier {
private File directory;
private int state;
- /** printable list of handlers names, for reporting backend names in alert messages */
+ /** Printable list of handlers names, for reporting backend names in alert messages. */
private final StringBuilder diskNames = new StringBuilder();
private final List<MonitoredDirectory> allHandlers = new ArrayList<>();
@@ -221,9 +219,7 @@
{
}
- /**
- * Starts periodic monitoring of all registered directories.
- */
+ /** Starts periodic monitoring of all registered directories. */
public void startDiskSpaceMonitor()
{
DirectoryServer.registerMonitorProvider(this);
@@ -314,7 +310,6 @@
{
synchronized (monitoredDirs)
{
-
List<MonitoredDirectory> directories = monitoredDirs.get(directory);
if (directories != null)
{
@@ -336,7 +331,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void initializeMonitorProvider(MonitorProviderCfg configuration)
throws ConfigException, InitializationException {
@@ -456,7 +450,6 @@
return DiskSpaceMonitor.class.getName();
}
- /** {@inheritDoc} */
@Override
public Map<String, String> getAlerts()
{
@@ -466,14 +459,12 @@
return alerts;
}
- /** {@inheritDoc} */
@Override
public String getShutdownListenerName()
{
return INSTANCENAME;
}
- /** {@inheritDoc} */
@Override
public void processServerShutdown(LocalizableMessage reason)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
index e0a9794..154bd2c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
@@ -68,12 +68,7 @@
/** The set of the LDAP URLs that define the membership criteria. */
private LinkedHashSet<LDAPURL> memberURLs;
-
-
- /**
- * Creates a new, uninitialized dynamic group instance. This is intended for
- * internal use only.
- */
+ /** Creates a new, uninitialized dynamic group instance. This is intended for internal use only. */
public DynamicGroup()
{
super();
@@ -81,8 +76,6 @@
// No initialization is required here.
}
-
-
/**
* Creates a new dynamic group instance with the provided information.
*
@@ -102,9 +95,6 @@
this.memberURLs = memberURLs;
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeGroupImplementation(
DynamicGroupImplementationCfg configuration)
@@ -113,17 +103,12 @@
// No additional initialization is required.
}
-
-
-
- /** {@inheritDoc} */
@Override
public DynamicGroup newInstance(ServerContext serverContext, Entry groupEntry)
throws DirectoryException
{
ifNull(groupEntry);
-
// Get the memberURL attribute from the entry, if there is one, and parse
// out the LDAP URLs that it contains.
LinkedHashSet<LDAPURL> memberURLs = new LinkedHashSet<>();
@@ -147,9 +132,6 @@
return new DynamicGroup(groupEntry.getName(), memberURLs);
}
-
-
- /** {@inheritDoc} */
@Override
public SearchFilter getGroupDefinitionFilter()
throws DirectoryException
@@ -160,9 +142,6 @@
OC_GROUP_OF_URLS + ")");
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isGroupDefinition(Entry entry)
{
@@ -175,26 +154,18 @@
return entry.hasObjectClass(groupOfURLsClass);
}
-
-
- /** {@inheritDoc} */
@Override
public DN getGroupDN()
{
return groupEntryDN;
}
-
-
- /** {@inheritDoc} */
@Override
public void setGroupDN(DN groupDN)
{
groupEntryDN = groupDN;
}
-
-
/**
* Retrieves the set of member URLs for this dynamic group. The returned set
* must not be altered by the caller.
@@ -206,9 +177,6 @@
return memberURLs;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsNestedGroups()
{
@@ -216,9 +184,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public List<DN> getNestedGroupDNs()
{
@@ -226,9 +191,6 @@
return Collections.<DN>emptyList();
}
-
-
- /** {@inheritDoc} */
@Override
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -238,9 +200,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -250,9 +209,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMember(DN userDN, Set<DN> examinedGroups)
throws DirectoryException
@@ -266,9 +222,6 @@
return entry != null && isMember(entry);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
throws DirectoryException
@@ -289,9 +242,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public MemberList getMembers()
throws DirectoryException
@@ -299,9 +249,6 @@
return new DynamicGroupMemberList(groupEntryDN, memberURLs);
}
-
-
- /** {@inheritDoc} */
@Override
public MemberList getMembers(DN baseDN, SearchScope scope,
SearchFilter filter)
@@ -318,18 +265,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean mayAlterMemberList()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public void updateMembers(List<Modification> modifications)
throws UnsupportedOperationException, DirectoryException
@@ -339,9 +280,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException
@@ -351,9 +289,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException
@@ -363,9 +298,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
@@ -391,4 +323,3 @@
buffer.append("})");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
index ec510b0..5141d91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
@@ -68,8 +68,6 @@
/** The set of LDAP URLs that define the membership criteria. */
private final Set<LDAPURL> memberURLs;
-
-
/**
* Creates a new dynamic group member list with the provided information.
*
@@ -86,8 +84,6 @@
this(groupDN, memberURLs, null, null, null);
}
-
-
/**
* Creates a new dynamic group member list with the provided information.
*
@@ -126,7 +122,6 @@
searchesCompleted = false;
resultQueue = new LinkedBlockingQueue<>(10);
-
// We're going to have to perform one or more internal searches in order to
// get the results. We need to be careful about the way that we construct
// them in order to avoid the possibility of getting duplicate results, so
@@ -213,7 +208,6 @@
}
}
-
// At this point, we should know what base DN(s) we need to use, so we can
// create the filter to use with that base DN. There are some special-case
// optimizations that we can do here, but in general the filter will look
@@ -276,7 +270,6 @@
searchMap.put(urlBaseDN, combinedFilter);
}
-
// At this point, we should have all the information we need to perform the
// searches. Create arrays of the elements for each.
DN[] baseDNArray = new DN[baseDNs.size()];
@@ -297,14 +290,11 @@
}
}
-
DynamicGroupSearchThread searchThread =
new DynamicGroupSearchThread(this, baseDNArray, filterArray, urlArray);
searchThread.start();
}
-
-
/**
* Retrieves the DN of the dynamic group with which this dynamic group member
* list is associated.
@@ -317,8 +307,6 @@
return groupDN;
}
-
-
/**
* Indicates that all of the searches needed to iterate across the member list
* have completed and there will not be any more results provided.
@@ -328,8 +316,6 @@
searchesCompleted = true;
}
-
-
/**
* Adds the provided entry to the set of results that should be returned for
* this member list.
@@ -355,8 +341,6 @@
}
}
-
-
/**
* Adds the provided membership exception so that it will be thrown along with
* the set of results for this member list.
@@ -381,9 +365,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean hasMoreMembers()
{
@@ -403,9 +384,6 @@
return resultQueue.peek() != null;
}
-
-
- /** {@inheritDoc} */
@Override
public Entry nextMemberEntry()
throws MembershipException
@@ -441,9 +419,6 @@
return null;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
@@ -451,4 +426,3 @@
resultQueue.clear();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
index fc3ec01..9bba5b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
@@ -49,7 +49,6 @@
extends DirectoryThread
implements InternalSearchListener
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The set of base DNs for the search requests. */
@@ -67,8 +66,6 @@
/** The set of search filters for the search requests. */
private final SearchFilter[] searchFilters;
-
-
/**
* Creates a new dynamic group search thread that is associated with the
* provided member list and that will perform the search using the provided
@@ -96,12 +93,7 @@
searchCounter = 0;
}
-
-
- /**
- * Performs the set of searches and provides the results to the associated
- * member list.
- */
+ /** Performs the set of searches and provides the results to the associated member list. */
@Override
public void run()
{
@@ -146,9 +138,6 @@
memberList.setSearchesCompleted();
}
-
-
- /** {@inheritDoc} */
@Override
public void handleInternalSearchEntry(InternalSearchOperation searchOperation,
SearchResultEntry searchEntry)
@@ -170,9 +159,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void handleInternalSearchReference(
InternalSearchOperation searchOperation,
@@ -181,4 +167,3 @@
// No implementation required.
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index d7aeb47..dd7d031 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -50,9 +50,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Creates a new instance of this entryDN virtual attribute provider.
- */
+ /** Creates a new instance of this entryDN virtual attribute provider. */
public EntryDNVirtualAttributeProvider()
{
super();
@@ -61,14 +59,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -76,7 +72,6 @@
return Attributes.create(rule.getAttributeType(), dnString);
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -84,7 +79,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
{
@@ -103,7 +97,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -115,7 +108,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -125,7 +117,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -135,7 +126,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -145,8 +135,6 @@
return ConditionResult.UNDEFINED;
}
-
-
/**
* {@inheritDoc}. This virtual attribute will support search operations only
* if one of the following is true about the search filter:
@@ -168,9 +156,6 @@
return isSearchable(rule.getAttributeType(), searchOperation.getFilter(), 0);
}
-
-
-
/**
* Indicates whether the provided search filter is one that may be used with
* this virtual attribute provider, optionally operating in a recursive manner
@@ -227,7 +212,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -265,8 +249,6 @@
}
}
-
-
/**
* Extracts the user DNs from the provided filter, operating recursively as
* necessary, and adds them to the provided set.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index 6ed0902..fd94e1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -51,7 +51,6 @@
ConfigurationChangeListener
<ErrorLogAccountStatusNotificationHandlerCfg>
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
@@ -67,16 +66,13 @@
}
}
-
/** The DN of the configuration entry for this notification handler. */
private DN configEntryDN;
/** The set of notification types that should generate log messages. */
private HashSet<AccountStatusNotificationType> notificationTypes;
-
-
- /** {@inheritDoc} */
+ @Override
public void initializeStatusNotificationHandler(
ErrorLogAccountStatusNotificationHandlerCfg configuration
)
@@ -90,9 +86,7 @@
processNotificationHandlerConfig (configuration, applyChanges);
}
-
-
- /** {@inheritDoc} */
+ @Override
public void handleStatusNotification(
AccountStatusNotification notification)
{
@@ -103,9 +97,6 @@
notification.getMessage());
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
AccountStatusNotificationHandlerCfg configuration,
@@ -116,9 +107,7 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
ErrorLogAccountStatusNotificationHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -130,8 +119,6 @@
configuration, applyChanges);
}
-
-
/**
* Makes a best-effort attempt to apply the configuration contained in the
* provided entry. Information about the result of this processing should be
@@ -155,9 +142,7 @@
return applyConfigurationChange(configuration);
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange (
ErrorLogAccountStatusNotificationHandlerCfg configuration
)
@@ -169,7 +154,6 @@
return new ConfigChangeResult();
}
-
/**
* Parses the provided configuration and configure the notification handler.
*
@@ -206,7 +190,6 @@
return isAcceptable;
}
-
/**
* Gets the OpenDS notification type object that corresponds to the
* configuration counterpart.
@@ -264,6 +247,4 @@
return nt;
}
-
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 03cc45e..7d35913 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -74,8 +74,6 @@
/** The set of attributes to return in search result entries. */
private LinkedHashSet<String> requestedAttributes;
-
-
/**
* Creates a new instance of this exact match identity mapper. All
* initialization should be performed in the {@code initializeIdentityMapper}
@@ -88,9 +86,6 @@
// Don't do any initialization here.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeIdentityMapper(
ExactMatchIdentityMapperCfg configuration)
@@ -101,7 +96,6 @@
currentConfig = configuration;
configEntryDN = currentConfig.dn();
-
// Get the attribute types to use for the searches. Ensure that they are
// all indexed for equality.
attributeTypes =
@@ -126,25 +120,17 @@
}
}
-
// Create the attribute list to include in search requests. We want to
// include all user and operational attributes.
requestedAttributes = newLinkedHashSet("*", "+");
}
-
-
- /**
- * Performs any finalization that may be necessary for this identity mapper.
- */
@Override
public void finalizeIdentityMapper()
{
currentConfig.removeExactMatchChangeListener(this);
}
-
-
/**
* Retrieves the user entry that was mapped to the provided identification
* string.
@@ -167,7 +153,6 @@
ExactMatchIdentityMapperCfg config = currentConfig;
AttributeType[] attributeTypes = this.attributeTypes;
-
// Construct the search filter to use to make the determination.
SearchFilter filter;
if (attributeTypes.length == 1)
@@ -187,7 +172,6 @@
filter = SearchFilter.createORFilter(filterComps);
}
-
// Iterate through the set of search bases and process an internal search
// to find any matching entries. Since we'll only allow a single match,
// then use size and time limits to constrain costly searches resulting from
@@ -262,9 +246,6 @@
return matchingEntry;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -274,9 +255,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
ExactMatchIdentityMapperCfg configuration,
@@ -309,9 +287,6 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
ExactMatchIdentityMapperCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
index 6937fcc..867d659 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FIFOEntryCache.java
@@ -80,10 +80,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The reference to the Java runtime used to determine the amount of memory
- * currently in use.
- */
+ /** The reference to the Java runtime used to determine the amount of memory currently in use. */
private static final Runtime runtime = Runtime.getRuntime();
/** The mapping between entry backends/IDs and entries. */
@@ -92,10 +89,7 @@
/** The mapping between DNs and entries. */
private LinkedHashMap<DN,CacheEntry> dnMap;
- /**
- * The lock used to provide threadsafe access when changing the contents of
- * the cache.
- */
+ /** The lock used to provide threadsafe access when changing the contents of the cache. */
private ReadWriteLock cacheLock;
private Lock cacheWriteLock;
private Lock cacheReadLock;
@@ -122,7 +116,6 @@
// All initialization should be performed in the initializeEntryCache.
}
- /** {@inheritDoc} */
@Override
public void initializeEntryCache(FIFOEntryCacheCfg configuration)
throws ConfigException, InitializationException
@@ -152,7 +145,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void finalizeEntryCache()
{
@@ -174,7 +166,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean containsEntry(DN entryDN)
{
@@ -191,7 +182,6 @@
}
}
- /** {@inheritDoc} */
@Override
public Entry getEntry(DN entryDN)
{
@@ -212,7 +202,6 @@
}
}
- /** {@inheritDoc} */
@Override
public long getEntryID(DN entryDN)
{
@@ -226,7 +215,6 @@
}
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN(String backendID, long entryID)
{
@@ -246,14 +234,12 @@
}
}
- /** {@inheritDoc} */
@Override
public void putEntry(Entry entry, String backendID, long entryID)
{
// Create the cache entry based on the provided information.
CacheEntry cacheEntry = new CacheEntry(entry, backendID, entryID);
-
// Obtain a lock on the cache. If this fails, then don't do anything.
try
{
@@ -269,7 +255,6 @@
return;
}
-
// At this point, we hold the lock. No matter what, we must release the
// lock before leaving this method, so do that in a finally block.
try
@@ -312,7 +297,6 @@
}
}
}
-
}
else
{
@@ -332,7 +316,6 @@
map.put(entryID, cacheEntry);
}
-
// See if a cap has been placed on the maximum number of entries in the
// cache. If so, then see if we have exceeded it and we need to purge
// entries until we're within the limit.
@@ -366,14 +349,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean putEntryIfAbsent(Entry entry, String backendID, long entryID)
{
// Create the cache entry based on the provided information.
CacheEntry cacheEntry = new CacheEntry(entry, backendID, entryID);
-
// Obtain a lock on the cache. If this fails, then don't do anything.
try
{
@@ -391,7 +372,6 @@
return false;
}
-
// At this point, we hold the lock. No matter what, we must release the
// lock before leaving this method, so do that in a finally block.
try
@@ -441,7 +421,6 @@
map.put(entryID, cacheEntry);
}
-
// See if a cap has been placed on the maximum number of entries in the
// cache. If so, then see if we have exceeded it and we need to purge
// entries until we're within the limit.
@@ -465,7 +444,6 @@
}
}
-
// We'll always return true in this case, even if we didn't actually add
// the entry due to memory constraints.
return true;
@@ -483,7 +461,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void removeEntry(DN entryDN)
{
@@ -494,7 +471,6 @@
// other thread before it releases the lock.
cacheWriteLock.lock();
-
// At this point, it is absolutely critical that we always release the lock
// before leaving this method, so do so in a finally block.
try
@@ -538,7 +514,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clear()
{
@@ -546,7 +521,6 @@
// been cleared, so we will block until we can obtain the lock.
cacheWriteLock.lock();
-
// At this point, it is absolutely critical that we always release the lock
// before leaving this method, so do so in a finally block.
try
@@ -569,7 +543,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clearBackend(String backendID)
{
@@ -577,7 +550,6 @@
// been cleared, so we will block until we can obtain the lock.
cacheWriteLock.lock();
-
// At this point, it is absolutely critical that we always release the lock
// before leaving this method, so do so in a finally block.
try
@@ -591,7 +563,6 @@
return;
}
-
// Unfortunately, there is no good way to dump the entries from the DN
// cache based on their backend, so we will need to iterate through the
// entries in the ID map and do it manually. Since this could take a
@@ -624,7 +595,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clearSubtree(DN baseDN)
{
@@ -636,12 +606,10 @@
return;
}
-
// Acquire a lock on the cache. We should not return until the cache has
// been cleared, so we will block until we can obtain the lock.
cacheWriteLock.lock();
-
// At this point, it is absolutely critical that we always release the lock
// before leaving this method, so do so in a finally block.
try
@@ -660,8 +628,6 @@
}
}
-
-
/**
* Clears all entries at or below the specified base DN that are associated
* with the given backend. The caller must already hold the cache lock.
@@ -681,7 +647,6 @@
return;
}
-
// Since the provided base DN could hold a subset of the information in the
// specified backend, we will have to do this by iterating through all the
// entries for that backend. Since this could take a while, we'll
@@ -709,7 +674,6 @@
}
}
-
// See if the backend has any subordinate backends. If so, then process
// them recursively.
for (Backend<?> subBackend : backend.getSubordinateBackends())
@@ -731,14 +695,12 @@
}
}
- /** {@inheritDoc} */
@Override
public void handleLowMemory()
{
// Grab the lock on the cache and wait until we have it.
cacheWriteLock.lock();
-
// At this point, it is absolutely critical that we always release the lock
// before leaving this method, so do so in a finally block.
try
@@ -782,7 +744,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(EntryCacheCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -791,7 +752,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
FIFOEntryCacheCfg configuration,
@@ -810,7 +770,6 @@
return errorHandler.getIsAcceptable();
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange( FIFOEntryCacheCfg configuration )
{
@@ -833,8 +792,6 @@
return changeResult;
}
-
-
/**
* Parses the provided configuration and configure the entry cache.
*
@@ -920,14 +877,12 @@
}
}
- /** {@inheritDoc} */
@Override
public Long getCacheCount()
{
return Long.valueOf(dnMap.size());
}
- /** {@inheritDoc} */
@Override
public String toVerboseString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index eee2e5b..efcca04 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -95,7 +95,6 @@
}
}
- /** Performs any finalization that may be necessary for this key manager provider. */
@Override
public void finalizeKeyManagerProvider()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 99ea7b4..fb842ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -55,9 +55,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
/** The DN of the configuration entry for this trust manager provider. */
private DN configEntryDN;
@@ -73,8 +70,6 @@
/** The trust store type to use. */
private String trustStoreType;
-
-
/**
* Creates a new instance of this file-based trust manager provider. The
* <CODE>initializeTrustManagerProvider</CODE> method must be called on the
@@ -85,9 +80,6 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeTrustManagerProvider(
FileBasedTrustManagerProviderCfg configuration)
@@ -99,7 +91,6 @@
configEntryDN = configuration.dn();
configuration.addFileBasedChangeListener(this);
-
// Get the path to the trust store file.
trustStoreFile = configuration.getTrustStoreFile();
File f = getFileForPath(trustStoreFile);
@@ -109,7 +100,6 @@
throw new InitializationException(message);
}
-
// Get the trust store type. If none is specified, then use the default
// type.
trustStoreType = configuration.getTrustStoreType();
@@ -131,7 +121,6 @@
throw new InitializationException(message);
}
-
// Get the PIN needed to access the contents of the trust store file. We
// will offer several places to look for the PIN, and we will do so in the
// following order:
@@ -231,18 +220,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeTrustManagerProvider()
{
currentConfig.removeFileBasedChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public TrustManager[] getTrustManagers()
throws DirectoryException
@@ -267,7 +250,6 @@
message, e);
}
-
try
{
String trustManagerAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
@@ -294,9 +276,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
TrustManagerProviderCfg configuration,
@@ -307,9 +286,7 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
FileBasedTrustManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -317,7 +294,6 @@
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
-
// Get the path to the trust store file.
String newTrustStoreFile = configuration.getTrustStoreFile();
try
@@ -337,7 +313,6 @@
configAcceptable = false;
}
-
// Check to see if the trust store type is acceptable.
String storeType = configuration.getTrustStoreType();
if (storeType != null)
@@ -356,7 +331,6 @@
}
}
-
// If there is a PIN property, then make sure the corresponding
// property is set.
String pinProp = configuration.getTrustStorePinProperty();
@@ -366,7 +340,6 @@
configAcceptable = false;
}
-
// If there is a PIN environment variable, then make sure the corresponding
// environment variable is set.
String pinEnVar = configuration.getTrustStorePinEnvironmentVariable();
@@ -376,7 +349,6 @@
configAcceptable = false;
}
-
// If there is a PIN file, then make sure the file exists and is readable.
String pinFile = configuration.getTrustStorePinFile();
if (pinFile != null)
@@ -418,17 +390,15 @@
}
}
-
return configAcceptable;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
FileBasedTrustManagerProviderCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the path to the trust store file.
String newTrustStoreFile = configuration.getTrustStoreFile();
File f = getFileForPath(newTrustStoreFile);
@@ -458,7 +428,6 @@
ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
-
// Get the PIN needed to access the contents of the trust store file. We
// will offer several places to look for the PIN, and we will do so in the
// following order:
@@ -558,7 +527,6 @@
}
}
-
if (ccr.getResultCode() == ResultCode.SUCCESS)
{
trustStoreFile = newTrustStoreFile;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index e55993c..d4a29fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -56,10 +56,7 @@
/** The iterator used to traverse the set of member DNs. */
private Iterator<CompactDn> memberDNIterator;
- /**
- * The membership exception that should be thrown the next time a member is
- * requested.
- */
+ /** The membership exception that should be thrown the next time a member is requested. */
private MembershipException nextMembershipException;
/** The search filter that all returned members should match. */
@@ -204,7 +201,6 @@
nextMembershipException = null;
}
- /** {@inheritDoc} */
@Override
public boolean hasMoreMembers()
{
@@ -212,7 +208,6 @@
&& (nextMatchingEntry != null || nextMembershipException != null);
}
- /** {@inheritDoc} */
@Override
public DN nextMemberDN() throws MembershipException
{
@@ -225,7 +220,6 @@
return entry != null ? entry.getName() : null;
}
- /** {@inheritDoc} */
@Override
public Entry nextMemberEntry() throws MembershipException
{
@@ -247,11 +241,9 @@
return e;
}
- /** {@inheritDoc} */
@Override
public void close()
{
// No implementation is required.
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
index a59ff9e..b8cc14e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -77,7 +77,6 @@
/** The set of attributes to return in search result entries. */
private LinkedHashSet<String> requestedAttributes;
-
/**
* Creates a new instance of this certificate mapper. Note that all actual
* initialization should be done in the
@@ -88,9 +87,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeCertificateMapper(
FingerprintCertificateMapperCfg configuration)
@@ -111,7 +107,6 @@
break;
}
-
// Make sure that the fingerprint attribute is configured for equality in
// all appropriate backends.
Set<DN> cfgBaseDNs = configuration.getUserBaseDN();
@@ -136,18 +131,12 @@
requestedAttributes = newLinkedHashSet("*", "+");
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeCertificateMapper()
{
currentConfig.removeFingerprintChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
@@ -163,7 +152,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the first certificate in the chain. It must be an X.509 certificate.
X509Certificate peerCertificate;
try
@@ -179,7 +167,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the signature from the peer certificate and create a digest of it
// using the configured algorithm.
String fingerprintString;
@@ -201,13 +188,11 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Create the search filter from the fingerprint.
ByteString value = ByteString.valueOfUtf8(fingerprintString);
SearchFilter filter =
SearchFilter.createEqualityFilter(fingerprintAttributeType, value);
-
// If we have an explicit set of base DNs, then use it. Otherwise, use the
// set of public naming contexts in the server.
Collection<DN> baseDNs = config.getUserBaseDN();
@@ -216,7 +201,6 @@
baseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
-
// For each base DN, issue an internal search in an attempt to map the
// certificate.
Entry userEntry = null;
@@ -247,7 +231,6 @@
throw new DirectoryException(
ResultCode.INVALID_CREDENTIALS, message);
-
case TIME_LIMIT_EXCEEDED:
case ADMIN_LIMIT_EXCEEDED:
// The search criteria was too inefficient.
@@ -277,15 +260,11 @@
}
}
-
// If we've gotten here, then we either found exactly one user entry or we
// didn't find any. Either way, return the entry or null to the caller.
return userEntry;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -295,9 +274,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
FingerprintCertificateMapperCfg configuration,
@@ -306,16 +282,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
FingerprintCertificateMapperCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the algorithm that will be used to generate the fingerprint.
String newFingerprintAlgorithm = null;
switch (configuration.getFingerprintAlgorithm())
@@ -328,7 +300,6 @@
break;
}
-
if (ccr.getResultCode() == ResultCode.SUCCESS)
{
fingerprintAlgorithm = newFingerprintAlgorithm;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 3bb2724..d325a9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -78,10 +76,7 @@
/** The identity mapper that will be used to map identities. */
private IdentityMapper<?> identityMapper;
- /**
- * The properties to use when creating a SASL server to process the
- * GSSAPI authentication.
- */
+ /** The properties to use when creating a SASL server to process the GSSAPI authentication. */
private HashMap<String, String> saslProps;
/** The fully qualified domain name used when creating the SASL server. */
@@ -91,8 +86,6 @@
private volatile LoginContext loginContext;
private final Object loginContextLock = new Object();
-
-
/**
* Creates a new instance of this SASL mechanism handler. No
* initialization should be done in this method, as it should all be
@@ -104,9 +97,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeSASLMechanismHandler(
GSSAPISASLMechanismHandlerCfg configuration) throws ConfigException,
@@ -133,8 +123,6 @@
}
}
-
-
/**
* Checks to make sure that the ds-cfg-kdc-address and dc-cfg-realm
* are both defined in the configuration. If only one is set, then
@@ -161,12 +149,9 @@
{
System.setProperty(KRBV_PROPERTY_KDC, kdcAddress);
System.setProperty(KRBV_PROPERTY_REALM, realm);
-
}
}
-
-
/**
* During login, callbacks are usually used to prompt for passwords.
* All of the GSSAPI login information is provided in the properties
@@ -182,8 +167,6 @@
{
}
-
-
/**
* Returns the fully qualified name either defined in the
* configuration, or, determined by examining the system
@@ -208,7 +191,6 @@
}
/**
- *
* Return the login context. If it's not been initialized yet,
* create a login context or login using the principal and keytab
* information specified in the configuration.
@@ -234,11 +216,7 @@
return loginContext;
}
-
-
- /**
- * Logout of the current login context.
- */
+ /** Logout of the current login context. */
private void logout()
{
try
@@ -258,8 +236,6 @@
}
}
-
-
/**
* Creates an login.conf file from information in the specified
* configuration. This file is used during the login phase.
@@ -320,9 +296,6 @@
return configFileName;
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeSASLMechanismHandler() {
logout();
@@ -335,7 +308,6 @@
logger.error(INFO_GSSAPI_STOPPED);
}
-
private void clearProperties() {
System.clearProperty(KRBV_PROPERTY_KDC);
System.clearProperty(KRBV_PROPERTY_REALM);
@@ -343,7 +315,6 @@
System.clearProperty(JAAS_PROPERTY_SUBJECT_CREDS_ONLY);
}
- /** {@inheritDoc} */
@Override
public void processSASLBind(BindOperation bindOp)
{
@@ -394,7 +365,6 @@
}
}
-
/**
* Get the underlying GSSException messages that really tell what the
* problem is. The major code is the GSS-API status and the minor is the
@@ -417,8 +387,6 @@
return message.toMessage();
}
-
- /** {@inheritDoc} */
@Override
public boolean isPasswordBased(String mechanism)
{
@@ -426,8 +394,6 @@
return false;
}
-
- /** {@inheritDoc} */
@Override
public boolean isSecure(String mechanism)
{
@@ -435,9 +401,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -447,9 +410,6 @@
return isConfigurationChangeAcceptable(newConfig, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
GSSAPISASLMechanismHandlerCfg newConfiguration,
@@ -496,9 +456,6 @@
return isAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(GSSAPISASLMechanismHandlerCfg newConfiguration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
index 114951e..2e57eb7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
@@ -52,7 +52,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializeExtendedOperationHandler(
GetConnectionIdExtendedOperationHandlerCfg config)
@@ -61,7 +60,6 @@
super.initializeExtendedOperationHandler(config);
}
- /** {@inheritDoc} */
@Override
public void processExtendedOperation(ExtendedOperation operation)
{
@@ -71,8 +69,6 @@
operation.setResultCode(ResultCode.SUCCESS);
}
-
-
/**
* Encodes the provided connection ID in an octet string suitable for use as
* the value for this extended operation.
@@ -98,8 +94,6 @@
return builder.toByteString();
}
-
-
/**
* Decodes the provided ASN.1 octet string to extract the connection ID.
*
@@ -125,14 +119,12 @@
}
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationOID()
{
return OID_GET_CONNECTION_ID_EXTOP;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationName()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
index f0ea90a..a8ea218 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -47,10 +47,7 @@
public class GoverningStructureRuleVirtualAttributeProvider extends
VirtualAttributeProvider<GoverningStructureRuleVirtualAttributeCfg>
{
- /**
- * Creates a new instance of this governingStructureRule virtual attribute
- * provider.
- */
+ /** Creates a new instance of this governingStructureRule virtual attribute provider. */
public GoverningStructureRuleVirtualAttributeProvider()
{
super();
@@ -59,14 +56,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -79,14 +74,12 @@
return Attributes.empty(rule.getAttributeType());
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
return getDITStructureRule(entry)!=null;
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -98,7 +91,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -108,7 +100,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -118,7 +109,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -128,7 +118,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -138,7 +127,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -220,4 +208,3 @@
return ditRule;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index acc3d93..2978934 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -42,9 +42,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Creates a new instance of this HasSubordinates virtual attribute provider.
- */
+ /** Creates a new instance of this HasSubordinates virtual attribute provider. */
public HasSubordinatesVirtualAttributeProvider()
{
super();
@@ -53,14 +51,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -82,7 +78,6 @@
return Attributes.empty(rule.getAttributeType());
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -101,7 +96,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
{
@@ -124,7 +118,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -136,7 +129,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -146,7 +138,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -156,7 +147,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -166,7 +156,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -175,7 +164,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -187,4 +175,3 @@
searchOperation.appendErrorMessage(message);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index 4538191..1c05e48 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -45,9 +45,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Creates a new instance of this entryDN virtual attribute provider.
- */
+ /** Creates a new instance of this entryDN virtual attribute provider. */
public IsMemberOfVirtualAttributeProvider()
{
super();
@@ -56,14 +54,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return true;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -86,7 +82,6 @@
return builder.toAttribute();
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -109,7 +104,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
ByteString value)
@@ -128,7 +122,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -140,7 +133,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -150,7 +142,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -160,7 +151,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -170,8 +160,6 @@
return ConditionResult.UNDEFINED;
}
-
-
/**
* {@inheritDoc}. This virtual attribute will support search operations only
* if one of the following is true about the search filter:
@@ -193,9 +181,6 @@
isSearchable(rule.getAttributeType(), searchOperation.getFilter(), 0);
}
-
-
-
/**
* Indicates whether the provided search filter is one that may be used with
* this virtual attribute provider, optionally operating in a recursive manner
@@ -237,7 +222,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -278,7 +262,6 @@
}
/**
- *
* @param searchOperation the search operation being processed.
* @param memberList the list of members of the group being processed.
* @param returnedDNs a set to store the normalized DNs of entries already returned,
@@ -320,8 +303,6 @@
return true;
}
-
-
/**
* Extracts the first group DN encountered in the provided filter, operating
* recursively as necessary.
@@ -367,4 +348,3 @@
return null;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
index 6cacd90..7192a71 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
@@ -71,25 +71,18 @@
private static final String CLASS_NAME =
"org.opends.server.extensions.JMXAlertHandler";
-
-
/** The current configuration for this alert handler. */
private AlertHandlerCfg currentConfig;
/** The sequence number generator used for this alert handler. */
private AtomicLong sequenceNumber;
- /**
- * The DN of the configuration entry with which this alert handler is
- * associated.
- */
+ /** The DN of the configuration entry with which this alert handler is associated. */
private DN configEntryDN;
/** The JMX object name used for this JMX alert handler. */
private ObjectName objectName;
-
-
/**
* Creates a new instance of this JMX alert handler. No initialization should
* be done here, as it should all be performed in the
@@ -100,9 +93,7 @@
super();
}
-
-
- /** {@inheritDoc} */
+ @Override
public void initializeAlertHandler(JMXAlertHandlerCfg configuration)
throws ConfigException, InitializationException
{
@@ -147,17 +138,13 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
public AlertHandlerCfg getAlertHandlerConfiguration()
{
return currentConfig;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationAcceptable(AlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
{
@@ -165,29 +152,24 @@
return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public void finalizeAlertHandler()
{
// No action is required.
}
-
-
/**
* Retrieves the JMX object name for this JMX alert handler.
*
* @return The JMX object name for this JMX alert handler.
*/
+ @Override
public ObjectName getObjectName()
{
return objectName;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void sendAlertNotification(AlertGenerator generator, String alertType,
LocalizableMessage alertMessage)
{
@@ -197,8 +179,6 @@
alertMessage.toString()));
}
-
-
/**
* Retrieves information about the types of JMX notifications that may be
* generated.
@@ -206,6 +186,7 @@
* @return Information about the types of JMX notifications that may be
* generated.
*/
+ @Override
public MBeanNotificationInfo[] getNotificationInfo()
{
ArrayList<MBeanNotificationInfo> notifications = new ArrayList<>();
@@ -219,8 +200,6 @@
return notifications.toArray(new MBeanNotificationInfo[notifications.size()]);
}
-
-
/**
* Obtain the value of a specific attribute of the Dynamic MBean.
*
@@ -231,6 +210,7 @@
* @throws AttributeNotFoundException If the specified attribute is not
* associated with this MBean.
*/
+ @Override
public Attribute getAttribute(String attribute)
throws AttributeNotFoundException
{
@@ -239,8 +219,6 @@
throw new AttributeNotFoundException(message.toString());
}
-
-
/**
* Set the value of a specific attribute of the Dynamic MBean.
*
@@ -253,6 +231,7 @@
* @throws InvalidAttributeValueException If the provided value is not
* acceptable for this MBean.
*/
+ @Override
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, InvalidAttributeValueException
{
@@ -261,8 +240,6 @@
throw new AttributeNotFoundException(message.toString());
}
-
-
/**
* Get the values of several attributes of the Dynamic MBean.
*
@@ -270,14 +247,13 @@
*
* @return The list of attributes retrieved.
*/
+ @Override
public AttributeList getAttributes(String[] attributes)
{
// There are no attributes for this MBean.
return new AttributeList();
}
-
-
/**
* Sets the values of several attributes of the Dynamic MBean.
*
@@ -287,14 +263,13 @@
*
* @return The list of attributes that were set with their new values.
*/
+ @Override
public AttributeList setAttributes(AttributeList attributes)
{
// There are no attributes for this MBean.
return new AttributeList();
}
-
-
/**
* Allows an action to be invoked on the Dynamic MBean.
*
@@ -312,6 +287,7 @@
* @throws MBeanException If a problem is encountered while invoking the
* method.
*/
+ @Override
public Object invoke(String actionName, Object[] params, String[] signature)
throws MBeanException
{
@@ -337,8 +313,6 @@
throw new MBeanException(new ConfigException(message));
}
-
-
/**
* Provides the exposed attributes and actions of the Dynamic MBean using an
* MBeanInfo object.
@@ -346,6 +320,7 @@
* @return An instance of <CODE>MBeanInfo</CODE> allowing all attributes and
* actions exposed by this Dynamic MBean to be retrieved.
*/
+ @Override
public MBeanInfo getMBeanInfo()
{
return new MBeanInfo(CLASS_NAME, "JMX Alert Handler",
@@ -353,9 +328,7 @@
new MBeanOperationInfo[0], getNotificationInfo());
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
JMXAlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -363,9 +336,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
JMXAlertHandlerCfg configuration)
{
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 1cdd27f..0e08d52 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
@@ -109,13 +109,10 @@
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.StaticUtils.*;
-/**
- * LDAP pass through authentication policy implementation.
- */
+/** LDAP pass through authentication policy implementation. */
public final class LDAPPassThroughAuthenticationPolicyFactory implements
AuthenticationPolicyFactory<LDAPPassThroughAuthenticationPolicyCfg>
{
-
// TODO: handle password policy response controls? AD?
// TODO: custom aliveness pings
// TODO: improve debug logging and error messages.
@@ -127,9 +124,7 @@
static abstract class AbstractLoadBalancer implements ConnectionFactory,
Runnable
{
- /**
- * A connection which automatically retries operations on other servers.
- */
+ /** A connection which automatically retries operations on other servers. */
private final class FailoverConnection implements Connection
{
private Connection connection;
@@ -137,8 +132,6 @@
private final int startIndex;
private int nextIndex;
-
-
private FailoverConnection(final int startIndex)
throws DirectoryException
{
@@ -175,18 +168,12 @@
throw lastException;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
connection.close();
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString search(final DN baseDN, final SearchScope scope,
final SearchFilter filter) throws DirectoryException
@@ -205,9 +192,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void simpleBind(final ByteString username,
final ByteString password) throws DirectoryException
@@ -227,8 +211,6 @@
}
}
-
-
private void handleDirectoryException(final DirectoryException e)
throws DirectoryException
{
@@ -269,8 +251,6 @@
throw e;
}
-
-
private void incrementNextIndex()
{
// Try the next index.
@@ -279,11 +259,8 @@
nextIndex = 0;
}
}
-
}
-
-
/**
* A connection factory which caches its online/offline state in order to
* avoid unnecessary connection attempts when it is known to be offline.
@@ -296,25 +273,17 @@
private volatile boolean isAvailable = true;
private DirectoryException lastException;
-
-
private MonitoredConnectionFactory(final ConnectionFactory factory)
{
this.factory = factory;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
factory.close();
}
-
-
- /** {@inheritDoc} */
@Override
public Connection getConnection() throws DirectoryException
{
@@ -334,14 +303,10 @@
}
}
-
-
private final MonitoredConnectionFactory[] factories;
private final int maxIndex;
private final ScheduledFuture<?> monitorFuture;
-
-
/**
* Creates a new abstract load-balancer.
*
@@ -365,11 +330,7 @@
TimeUnit.SECONDS);
}
-
-
- /**
- * Close underlying connection pools.
- */
+ /** Close underlying connection pools. */
@Override
public final void close()
{
@@ -381,9 +342,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public final Connection getConnection() throws DirectoryException
{
@@ -391,11 +349,7 @@
return new FailoverConnection(startIndex);
}
-
-
- /**
- * Try to connect to any offline connection factories.
- */
+ /** Try to connect to any offline connection factories. */
@Override
public void run()
{
@@ -415,19 +369,14 @@
}
}
-
-
/**
* Return the start which should be used for the next connection attempt.
*
* @return The start which should be used for the next connection attempt.
*/
abstract int getStartIndex();
-
}
-
-
/**
* A factory which returns pre-authenticated connections for searches.
* <p>
@@ -436,13 +385,10 @@
static final class AuthenticatedConnectionFactory implements
ConnectionFactory
{
-
private final ConnectionFactory factory;
private final DN username;
private final String password;
-
-
/**
* Creates a new authenticated connection factory which will bind on
* connect.
@@ -463,18 +409,12 @@
this.password = password;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
factory.close();
}
-
-
- /** {@inheritDoc} */
@Override
public Connection getConnection() throws DirectoryException
{
@@ -495,26 +435,15 @@
}
return connection;
}
-
}
-
-
- /**
- * An LDAP connection which will be used in order to search for or
- * authenticate users.
- */
+ /** An LDAP connection which will be used in order to search for or authenticate users. */
static interface Connection extends Closeable
{
-
- /**
- * Closes this connection.
- */
+ /** Closes this connection. */
@Override
void close();
-
-
/**
* Returns the name of the user whose entry matches the provided search
* criteria. This will return CLIENT_SIDE_NO_RESULTS_RETURNED/NO_SUCH_OBJECT
@@ -536,8 +465,6 @@
ByteString search(DN baseDN, SearchScope scope, SearchFilter filter)
throws DirectoryException;
-
-
/**
* Performs a simple bind for the user.
*
@@ -553,8 +480,6 @@
throws DirectoryException;
}
-
-
/**
* An interface for obtaining connections: users of this interface will obtain
* a connection, perform a single operation (search or bind), and then close
@@ -570,8 +495,6 @@
@Override
void close();
-
-
/**
* Returns a connection which can be used in order to search for or
* authenticate users.
@@ -593,26 +516,17 @@
*/
static final class ConnectionPool implements ConnectionFactory
{
-
- /**
- * Pooled connection's intercept close and release connection back to the
- * pool.
- */
+ /** Pooled connection's intercept close and release connection back to the pool. */
private final class PooledConnection implements Connection
{
private Connection connection;
private boolean connectionIsClosed;
-
-
private PooledConnection(final Connection connection)
{
this.connection = connection;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
@@ -635,9 +549,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString search(final DN baseDN, final SearchScope scope,
final SearchFilter filter) throws DirectoryException
@@ -668,9 +579,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void simpleBind(final ByteString username,
final ByteString password) throws DirectoryException
@@ -701,8 +609,6 @@
}
}
-
-
private void closeIfConnectionFailure(final DirectoryException e)
throws DirectoryException
{
@@ -715,8 +621,6 @@
}
}
-
-
private void reconnectIfConnectionFailure(final DirectoryException e)
throws DirectoryException
{
@@ -743,8 +647,6 @@
}
}
-
-
/** Guarded by PolicyImpl.lock. */
private boolean poolIsClosed;
@@ -753,8 +655,6 @@
private final Semaphore availableConnections = new Semaphore(poolSize);
private final Queue<Connection> connectionPool = new ConcurrentLinkedQueue<>();
-
-
/**
* Creates a new connection pool for the provided factory.
*
@@ -767,11 +667,7 @@
this.factory = factory;
}
-
-
- /**
- * Release all connections: do we want to block?
- */
+ /** Release all connections: do we want to block? */
@Override
public void close()
{
@@ -796,9 +692,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public Connection getConnection() throws DirectoryException
{
@@ -830,8 +723,6 @@
}
}
-
-
/**
* A simplistic two-way fail-over connection factory implementation.
* <p>
@@ -839,7 +730,6 @@
*/
static final class FailoverLoadBalancer extends AbstractLoadBalancer
{
-
/**
* Creates a new fail-over connection factory which will always try the
* primary connection factory first, before trying the second.
@@ -858,20 +748,14 @@
super(new ConnectionFactory[] { primary, secondary }, scheduler);
}
-
-
- /** {@inheritDoc} */
@Override
int getStartIndex()
{
// Always start with the primaries.
return 0;
}
-
}
-
-
/**
* The PTA design guarantees that connections are only used by a single thread
* at a time, so we do not need to perform any synchronization.
@@ -880,9 +764,7 @@
*/
static final class LDAPConnectionFactory implements ConnectionFactory
{
- /**
- * LDAP connection implementation.
- */
+ /** LDAP connection implementation. */
private final class LDAPConnection implements Connection
{
private final Socket plainSocket;
@@ -892,8 +774,6 @@
private int nextMessageID = 1;
private boolean isClosed;
-
-
private LDAPConnection(final Socket plainSocket, final Socket ldapSocket,
final LDAPReader reader, final LDAPWriter writer)
{
@@ -903,9 +783,6 @@
this.writer = writer;
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
@@ -938,9 +815,6 @@
StaticUtils.close(ldapSocket, plainSocket);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString search(final DN baseDN, final SearchScope scope,
final SearchFilter filter) throws DirectoryException
@@ -1040,9 +914,6 @@
return username;
}
-
-
- /** {@inheritDoc} */
@Override
public void simpleBind(final ByteString username,
final ByteString password) throws DirectoryException
@@ -1085,17 +956,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
protected void finalize()
{
close();
}
-
-
private void handleUnexpectedResponse(final LDAPMessage responseMessage)
throws DirectoryException
{
@@ -1136,8 +1002,6 @@
cfg.dn(), responseMessage.getProtocolOp()));
}
-
-
/** Reads a response message and adapts errors to directory exceptions. */
private LDAPMessage readResponse() throws DirectoryException
{
@@ -1190,8 +1054,6 @@
return responseMessage;
}
-
-
/** Sends a request message and adapts errors to directory exceptions. */
private void sendRequest(final ProtocolOp request)
throws DirectoryException
@@ -1210,15 +1072,11 @@
}
}
-
-
private final String host;
private final int port;
private final LDAPPassThroughAuthenticationPolicyCfg cfg;
private final int timeoutMS;
-
-
/**
* LDAP connection factory implementation is package private so that it can
* be tested.
@@ -1243,18 +1101,12 @@
Integer.MAX_VALUE);
}
-
-
- /** {@inheritDoc} */
@Override
public void close()
{
// Nothing to do.
}
-
-
- /** {@inheritDoc} */
@Override
public Connection getConnection() throws DirectoryException
{
@@ -1390,8 +1242,6 @@
}
}
-
-
/**
* An interface for obtaining a connection factory for LDAP connections to a
* named LDAP server and the monitoring scheduler.
@@ -1414,8 +1264,6 @@
ConnectionFactory getLDAPConnectionFactory(String host, int port,
LDAPPassThroughAuthenticationPolicyCfg cfg);
-
-
/**
* Returns the scheduler which should be used to periodically ping
* connection factories to determine when they are online.
@@ -1425,8 +1273,6 @@
*/
ScheduledExecutorService getScheduledExecutorService();
-
-
/**
* Returns the current time in order to perform cached password expiration
* checks. The returned string will be formatted as a a generalized time
@@ -1436,8 +1282,6 @@
*/
String getCurrentTime();
-
-
/**
* Returns the current time in order to perform cached password expiration
* checks.
@@ -1447,8 +1291,6 @@
long getCurrentTimeMS();
}
-
-
/**
* A simplistic load-balancer connection factory implementation using
* approximately round-robin balancing.
@@ -1458,8 +1300,6 @@
private final AtomicInteger nextIndex = new AtomicInteger();
private final int maxIndex;
-
-
/**
* Creates a new load-balancer which will distribute connection requests
* across a set of underlying connection factories.
@@ -1476,9 +1316,6 @@
this.maxIndex = factories.length;
}
-
-
- /** {@inheritDoc} */
@Override
int getStartIndex()
{
@@ -1508,32 +1345,20 @@
// connection factory.
return oldNextIndex;
}
-
}
-
-
- /**
- * LDAP PTA policy implementation.
- */
+ /** LDAP PTA policy implementation. */
private final class PolicyImpl extends AuthenticationPolicy implements
ConfigurationChangeListener<LDAPPassThroughAuthenticationPolicyCfg>
{
-
- /**
- * LDAP PTA policy state implementation.
- */
+ /** LDAP PTA policy state implementation. */
private final class StateImpl extends AuthenticationPolicyState
{
-
private final AttributeType cachedPasswordAttribute;
private final AttributeType cachedPasswordTimeAttribute;
private ByteString newCachedPassword;
-
-
-
private StateImpl(final Entry userEntry)
{
super(userEntry);
@@ -1542,9 +1367,6 @@
this.cachedPasswordTimeAttribute = DirectoryServer.getAttributeType(OP_ATTR_PTAPOLICY_CACHED_PASSWORD_TIME);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeStateAfterBind() throws DirectoryException
{
@@ -1593,18 +1415,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public AuthenticationPolicy getAuthenticationPolicy()
{
return PolicyImpl.this;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(final ByteString password)
throws DirectoryException
@@ -1738,9 +1554,7 @@
if (username == null)
{
- /*
- * No matching entries were found in the remote directory.
- */
+ /* No matching entries were found in the remote directory. */
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_SEARCH_NO_CANDIDATES.get(
userEntry.getName(), cfg.dn(), filter));
@@ -1783,8 +1597,6 @@
}
}
-
-
private boolean passwordMatchesCachedPassword(ByteString password)
{
if (!cfg.isUsePasswordCaching())
@@ -1872,9 +1684,7 @@
}
}
-
-
- // Guards against configuration changes.
+ /** Guards against configuration changes. */
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
private final ReadLock sharedLock = lock.readLock();
private final WriteLock exclusiveLock = lock.writeLock();
@@ -1887,17 +1697,12 @@
private PasswordStorageScheme<?> pwdStorageScheme;
-
-
private PolicyImpl(
final LDAPPassThroughAuthenticationPolicyCfg configuration)
{
initializeConfiguration(configuration);
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
final LDAPPassThroughAuthenticationPolicyCfg cfg)
@@ -1915,9 +1720,6 @@
return new ConfigChangeResult();
}
-
-
- /** {@inheritDoc} */
@Override
public AuthenticationPolicyState createAuthenticationPolicyState(
final Entry userEntry, final long time) throws DirectoryException
@@ -1926,9 +1728,6 @@
return new StateImpl(userEntry);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeAuthenticationPolicy()
{
@@ -1944,18 +1743,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public DN getDN()
{
return cfg.dn();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
final LDAPPassThroughAuthenticationPolicyCfg cfg,
@@ -1965,8 +1758,6 @@
.isConfigurationAcceptable(cfg, unacceptableReasons);
}
-
-
private void closeConnections()
{
exclusiveLock.lock();
@@ -1983,7 +1774,6 @@
bindFactory.close();
bindFactory = null;
}
-
}
finally
{
@@ -1991,8 +1781,6 @@
}
}
-
-
private void initializeConfiguration(
final LDAPPassThroughAuthenticationPolicyCfg cfg)
{
@@ -2080,19 +1868,14 @@
}
}
-
-
private ConnectionFactory newLDAPConnectionFactory(final String hostPort)
{
// Validation already performed by admin framework.
final HostPort hp = HostPort.valueOf(hostPort);
return provider.getLDAPConnectionFactory(hp.getHost(), hp.getPort(), cfg);
}
-
}
-
-
/** Debug tracer for this class. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -2130,8 +1913,6 @@
}
});
-
-
@Override
public ConnectionFactory getLDAPConnectionFactory(final String host,
final int port, final LDAPPassThroughAuthenticationPolicyCfg cfg)
@@ -2139,8 +1920,6 @@
return new LDAPConnectionFactory(host, port, cfg);
}
-
-
@Override
public ScheduledExecutorService getScheduledExecutorService()
{
@@ -2161,8 +1940,6 @@
};
-
-
/**
* Determines whether or no a result code is expected to trigger the
* associated connection to be closed immediately.
@@ -2198,8 +1975,6 @@
}
}
-
-
/**
* Get the search bind password performing mapped searches.
* We will offer several places to look for the password, and we will
@@ -2278,8 +2053,6 @@
return password;
}
-
-
private static boolean isServerAddressValid(
final LDAPPassThroughAuthenticationPolicyCfg configuration,
final List<LocalizableMessage> unacceptableReasons, final String hostPort)
@@ -2300,8 +2073,6 @@
}
}
-
-
private static String mappedAttributesAsString(
final Collection<AttributeType> attributes)
{
@@ -2324,8 +2095,6 @@
}
}
-
-
/**
* Public default constructor used by the admin framework. This will use the
* default LDAP connection factory provider.
@@ -2359,9 +2128,6 @@
this.provider = provider;
}
-
-
- /** {@inheritDoc} */
@Override
public AuthenticationPolicy createAuthenticationPolicy(
final LDAPPassThroughAuthenticationPolicyCfg configuration)
@@ -2372,9 +2138,6 @@
return policy;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
final LDAPPassThroughAuthenticationPolicyCfg cfg,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
index 60dcff8..0ae0495 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -42,11 +42,7 @@
/** The current configuration for this password validator. */
private LengthBasedPasswordValidatorCfg currentConfig;
-
-
- /**
- * Creates a new instance of this password validator.
- */
+ /** Creates a new instance of this password validator. */
public LengthBasedPasswordValidator()
{
super();
@@ -55,9 +51,6 @@
// method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
LengthBasedPasswordValidatorCfg configuration)
@@ -79,18 +72,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeLengthBasedChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -118,9 +105,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -130,9 +114,7 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
LengthBasedPasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -152,9 +134,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
LengthBasedPasswordValidatorCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
index f76e9da..f4be75e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
@@ -37,8 +35,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* MD5 algorithm defined in RFC 1321. This is a one-way digest algorithm
@@ -53,22 +49,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.MD5PasswordStorageScheme";
-
-
/** The message digest that will actually be used to generate the MD5 hashes. */
private MessageDigest messageDigest;
/** The lock used to provide threadsafe access to the message digest. */
private Object digestLock;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -77,12 +67,8 @@
public MD5PasswordStorageScheme()
{
super();
-
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
MD5PasswordStorageSchemeCfg configuration)
@@ -104,18 +90,12 @@
digestLock = new Object();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_MD5;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -152,9 +132,6 @@
return ByteString.valueOfUtf8(Base64.encode(digestBytes));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -195,13 +172,9 @@
buffer.append(Base64.encode(digestBytes));
-
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -249,9 +222,6 @@
return userPWDigestBytes.equals(storedPWDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -259,9 +229,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -271,9 +238,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -282,18 +246,12 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -302,9 +260,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -315,9 +270,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -325,4 +277,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index 76c1490..838850e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -55,11 +55,7 @@
/** The current configuration for this member virtual attribute. */
private MemberVirtualAttributeCfg currentConfig;
-
-
- /**
- * Creates a new instance of this member virtual attribute provider.
- */
+ /** Creates a new instance of this member virtual attribute provider. */
public MemberVirtualAttributeProvider()
{
super();
@@ -68,9 +64,6 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeVirtualAttributeProvider(
MemberVirtualAttributeCfg configuration)
@@ -80,18 +73,12 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -138,9 +125,6 @@
return builder.toAttribute();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -182,9 +166,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
{
@@ -207,9 +188,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -221,9 +199,6 @@
return ConditionResult.UNDEFINED;
}
-
-
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -233,9 +208,6 @@
return ConditionResult.UNDEFINED;
}
-
-
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -245,9 +217,6 @@
return ConditionResult.UNDEFINED;
}
-
-
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -257,9 +226,6 @@
return ConditionResult.UNDEFINED;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -268,9 +234,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -279,9 +242,6 @@
return;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
MemberVirtualAttributeCfg configuration,
@@ -291,9 +251,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
MemberVirtualAttributeCfg configuration)
@@ -302,4 +259,3 @@
return new ConfigChangeResult();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
index df1dfa2..138fe10 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,21 +26,16 @@
public class NotificationMessageNotificationMessageTemplateElement
extends NotificationMessageTemplateElement
{
- /**
- * Creates a new notification message notification message template element.
- */
+ /** Creates a new notification message notification message template element. */
public NotificationMessageNotificationMessageTemplateElement()
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
buffer.append(notification.getMessage());
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
index 04095fe..4e10273 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -32,8 +32,6 @@
/** The account status notification property for which to obtain the value. */
private AccountStatusNotificationProperty property;
-
-
/**
* Creates a new notification property notification message template element.
*
@@ -45,9 +43,7 @@
this.property = property;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
@@ -59,4 +55,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
index 50cd36f..f0c32d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -26,21 +26,16 @@
public class NotificationTypeNotificationMessageTemplateElement
extends NotificationMessageTemplateElement
{
- /**
- * Creates a new notification type notification message template element.
- */
+ /** Creates a new notification type notification message template element. */
public NotificationTypeNotificationMessageTemplateElement()
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
buffer.append(notification.getNotificationType().getName());
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
index 319a9b1..71fb944 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -31,9 +31,6 @@
*/
public class NullKeyManagerProvider
extends KeyManagerProvider<KeyManagerProviderCfg>{
-
-
-
/**
* Creates a new instance of this null key manager provider. The
* <CODE>initializeKeyManagerProvider</CODE> method must be called on the
@@ -44,9 +41,6 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeKeyManagerProvider(
KeyManagerProviderCfg configuration) throws ConfigException,
@@ -54,19 +48,12 @@
// No implementation is required.
}
-
-
- /**
- * Performs any finalization that may be necessary for this key manager
- * provider.
- */
+ @Override
public void finalizeKeyManagerProvider()
{
// No implementation is required.
}
-
-
/**
* Retrieves a <CODE>KeyManager</CODE> object that may be used for
* interactions requiring access to a key manager.
@@ -77,10 +64,10 @@
* @throws DirectoryException If a problem occurs while attempting to obtain
* the set of key managers.
*/
+ @Override
public KeyManager[] getKeyManagers()
throws DirectoryException
{
return new KeyManager[0];
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
index da06726..dafd8ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -43,9 +43,7 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void initializeTrustManagerProvider(
TrustManagerProviderCfg configuration)
throws ConfigException, InitializationException
@@ -53,19 +51,12 @@
// No implementation is required.
}
-
-
- /**
- * Performs any finalization that may be necessary for this trust manager
- * provider.
- */
+ @Override
public void finalizeTrustManagerProvider()
{
// No implementation is required.
}
-
-
/**
* Retrieves a <CODE>TrustManager</CODE> object that may be used for
* interactions requiring access to a trust manager.
@@ -76,10 +67,10 @@
* @throws DirectoryException If a problem occurs while attempting to obtain
* the set of trust managers.
*/
+ @Override
public TrustManager[] getTrustManagers()
throws DirectoryException
{
return new TrustManager[0];
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
index ae06ec7..5b14feb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -42,9 +42,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Creates a new instance of this NumSubordinates virtual attribute provider.
- */
+ /** Creates a new instance of this NumSubordinates virtual attribute provider. */
public NumSubordinatesVirtualAttributeProvider()
{
super();
@@ -53,14 +51,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -82,7 +78,6 @@
return Attributes.empty(rule.getAttributeType());
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -99,7 +94,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
{
@@ -116,7 +110,6 @@
}
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -128,7 +121,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -138,7 +130,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -147,7 +138,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -159,4 +149,3 @@
searchOperation.appendErrorMessage(message);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index a9a367e..ff5f40c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -82,7 +82,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(PBKDF2PasswordStorageSchemeCfg configuration)
throws ConfigException, InitializationException
@@ -102,7 +101,6 @@
config.addPBKDF2ChangeListener(this);
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(PBKDF2PasswordStorageSchemeCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -110,7 +108,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(PBKDF2PasswordStorageSchemeCfg configuration)
{
@@ -118,14 +115,12 @@
return new ConfigChangeResult();
}
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_PBKDF2;
}
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -139,7 +134,6 @@
return ByteString.valueOfUtf8(iterations + ":" + Base64.encode(hashPlusSalt));
}
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -147,7 +141,6 @@
return ByteString.valueOfUtf8('{' + STORAGE_SCHEME_NAME_PBKDF2 + '}' + encodePassword(plaintext));
}
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword, ByteSequence storedPassword) {
// Split the iterations from the stored value (separated by a ':')
@@ -185,21 +178,18 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
return true;
}
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_PBKDF2;
}
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -213,7 +203,6 @@
+ iterations + ':' + Base64.encode(saltBytes) + '$' + Base64.encode(digestBytes));
}
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword, String authInfo, String authValue)
{
@@ -236,14 +225,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -252,7 +239,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo, String authValue)
throws DirectoryException
@@ -261,14 +247,12 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
return true;
}
-
/**
* Generates an encoded password string from the given clear-text password.
* This method is primarily intended for use when it is necessary to generate a password with the server
@@ -364,5 +348,4 @@
System.arraycopy(saltBytes, 0, hashPlusSalt, digestBytes.length, NUM_SALT_BYTES);
return hashPlusSalt;
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index f927f57..771fd7d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -15,9 +15,9 @@
* Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.ExtensionMessages.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.File;
@@ -25,25 +25,24 @@
import java.io.IOException;
import java.security.KeyStore;
import java.util.List;
+
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.server.config.server.PKCS11KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.InitializationException;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a key manager provider that will access keys stored on a
* PKCS#11 device. It will use the Java PKCS#11 interface, which may need to be
@@ -55,15 +54,9 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- /**
- * The keystore type to use when accessing the PKCS#11 keystore.
- */
+ /** The keystore type to use when accessing the PKCS#11 keystore. */
public static final String PKCS11_KEYSTORE_TYPE = "PKCS11";
-
-
/** The DN of the configuration entry for this key manager provider. */
private DN configEntryDN;
@@ -73,8 +66,6 @@
/** The current configuration for this key manager provider. */
private PKCS11KeyManagerProviderCfg currentConfig;
-
-
/**
* Creates a new instance of this PKCS#11 key manager provider. The
* <CODE>initializeKeyManagerProvider</CODE> method must be called on the
@@ -85,9 +76,6 @@
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeKeyManagerProvider(
PKCS11KeyManagerProviderCfg configuration)
@@ -168,29 +156,13 @@
}
}
-
-
- /**
- * Performs any finalization that may be necessary for this key
- * manager provider.
- */
+ @Override
public void finalizeKeyManagerProvider()
{
currentConfig.removePKCS11ChangeListener(this);
}
-
-
- /**
- * Retrieves a set of <CODE>KeyManager</CODE> objects that may be used for
- * interactions requiring access to a key manager.
- *
- * @return A set of <CODE>KeyManager</CODE> objects that may be used for
- * interactions requiring access to a key manager.
- *
- * @throws DirectoryException If a problem occurs while attempting to obtain
- * the set of key managers.
- */
+ @Override
public KeyManager[] getKeyManagers()
throws DirectoryException
{
@@ -210,7 +182,6 @@
message, e);
}
-
try
{
String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
@@ -230,9 +201,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
PKCS11KeyManagerProviderCfg configuration,
@@ -241,9 +209,7 @@
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
PKCS11KeyManagerProviderCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -339,9 +305,7 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
PKCS11KeyManagerProviderCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
index 2d89b6c..e7ff89b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
@@ -79,7 +79,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(PKCS5S2PasswordStorageSchemeCfg configuration)
throws InitializationException
@@ -96,14 +95,12 @@
}
}
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_PKCS5S2;
}
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -115,7 +112,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -123,7 +119,6 @@
return ByteString.valueOfUtf8('{' + STORAGE_SCHEME_NAME_PKCS5S2 + '}' + encodePassword(plaintext));
}
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword, ByteSequence storedPassword)
{
@@ -154,21 +149,18 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
return true;
}
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_PKCS5S2;
}
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -180,7 +172,6 @@
+ ':' + Base64.encode(saltBytes) + '$' + Base64.encode(digestBytes));
}
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword, String authInfo, String authValue)
{
@@ -203,14 +194,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -219,7 +208,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo, String authValue)
throws DirectoryException
@@ -228,15 +216,12 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
return true;
}
-
-
/**
* Generates an encoded password string from the given clear-text password.
* This method is primarily intended for use when it is necessary to generate a password with the server
@@ -328,5 +313,4 @@
System.arraycopy(digestBytes, 0, hashPlusSalt, NUM_SALT_BYTES, digestBytes.length);
return hashPlusSalt;
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
index 8f4ed19..2687e27 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
@@ -51,24 +51,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
/**
* The maximum number of times to retry getting the next operation from the
* queue if an unexpected failure occurs.
*/
private static final int MAX_RETRY_COUNT = 5;
-
-
/** The set of worker threads that will be used to process this work queue. */
private ArrayList<ParallelWorkerThread> workerThreads;
- /**
- * The number of operations that have been submitted to the work queue for
- * processing.
- */
+ /** The number of operations that have been submitted to the work queue for processing. */
private AtomicLong opsSubmitted;
/**
@@ -95,10 +87,8 @@
/** The lock used to provide threadsafe access for the queue. */
private final Object queueLock = new Object();
-
private final Semaphore queueSemaphore = new Semaphore(0, false);
-
/**
* Creates a new instance of this work queue. All initialization should be
* performed in the <CODE>initializeWorkQueue</CODE> method.
@@ -108,9 +98,6 @@
// No implementation should be performed here.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeWorkQueue(ParallelWorkQueueCfg configuration)
throws ConfigException, InitializationException
@@ -140,7 +127,6 @@
workerThreads.add(t);
}
-
// Create and register a monitor provider for the work queue.
try
{
@@ -156,15 +142,11 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeWorkQueue(LocalizableMessage reason)
{
shutdownRequested = true;
-
// Send responses to any operations in the pending queue to indicate that
// they won't be processed because the server is shutting down.
CancelRequest cancelRequest = new CancelRequest(true, reason);
@@ -188,7 +170,6 @@
}
}
-
// Notify all the worker threads of the shutdown.
for (ParallelWorkerThread t : workerThreads)
{
@@ -204,8 +185,6 @@
}
}
-
-
/**
* Indicates whether this work queue has received a request to shut down.
*
@@ -217,8 +196,6 @@
return shutdownRequested;
}
-
-
/**
* Submits an operation to be processed by one of the worker threads
* associated with this work queue.
@@ -245,7 +222,6 @@
opsSubmitted.incrementAndGet();
}
- /** {@inheritDoc} */
@Override
public boolean trySubmitOperation(Operation operation)
throws DirectoryException
@@ -254,7 +230,6 @@
return true;
}
-
/**
* Retrieves the next operation that should be processed by one of the worker
* threads, blocking if necessary until a new request arrives. This method
@@ -271,8 +246,6 @@
return retryNextOperation(workerThread, 0);
}
-
-
/**
* Retrieves the next operation that should be processed by one of the worker
* threads following a previous failure attempt. A maximum of five
@@ -400,8 +373,6 @@
}
}
-
-
/**
* Attempts to remove the specified operation from this queue if it has not
* yet been picked up for processing by one of the worker threads.
@@ -416,8 +387,6 @@
return opQueue.remove(operation);
}
-
-
/**
* Retrieves the total number of operations that have been successfully
* submitted to this work queue for processing since server startup. This
@@ -432,8 +401,6 @@
return opsSubmitted.longValue();
}
-
-
/**
* Retrieves the number of pending operations in the queue that have not yet
* been picked up for processing. Note that this method is not a
@@ -448,9 +415,6 @@
return opQueue.size();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
ParallelWorkQueueCfg configuration,
@@ -459,9 +423,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
ParallelWorkQueueCfg configuration)
@@ -506,9 +467,6 @@
return new ConfigChangeResult();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isIdle()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 29899b5..232380e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -29,34 +29,25 @@
import static org.opends.messages.ExtensionMessages.*;
-/**
- * Provider for the password expiration time virtual attribute.
- */
+/** Provider for the password expiration time virtual attribute. */
public class PasswordExpirationTimeVirtualAttributeProvider
extends VirtualAttributeProvider<PasswordExpirationTimeVirtualAttributeCfg>
{
-
- /**
- * Debug tracer to log debugging information.
- */
+ /** Debug tracer to log debugging information. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Default constructor.
- */
+ /** Default constructor. */
public PasswordExpirationTimeVirtualAttributeProvider()
{
super();
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -76,7 +67,6 @@
return Attributes.empty(rule.getAttributeType());
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -85,7 +75,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -98,7 +87,6 @@
searchOperation.appendErrorMessage(message);
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
@@ -156,7 +144,6 @@
}
return pwpState.getPasswordExpirationTime();
-
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
index aa4250f..b47c395 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
@@ -123,7 +123,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/** The enumerated value for the getPasswordPolicyDN operation. */
public static final int OP_GET_PASSWORD_POLICY_DN = 0;
/** The enumerated value for the getAccountDisabledState operation. */
@@ -138,9 +137,7 @@
public static final int OP_SET_ACCOUNT_EXPIRATION_TIME = 5;
/** The enumerated value for the clearAccountExpirationTime operation. */
public static final int OP_CLEAR_ACCOUNT_EXPIRATION_TIME = 6;
- /**
- * The enumerated value for the getSecondsUntilAccountExpiration operation.
- */
+ /** The enumerated value for the getSecondsUntilAccountExpiration operation. */
public static final int OP_GET_SECONDS_UNTIL_ACCOUNT_EXPIRATION = 7;
/** The enumerated value for the getPasswordChangedTime operation. */
public static final int OP_GET_PASSWORD_CHANGED_TIME = 8;
@@ -152,18 +149,11 @@
public static final int OP_GET_PASSWORD_EXPIRATION_WARNED_TIME = 11;
/** The enumerated value for the setPasswordExpirationWarnedTime operation. */
public static final int OP_SET_PASSWORD_EXPIRATION_WARNED_TIME = 12;
- /**
- * The enumerated value for the clearPasswordExpirationWarnedTime operation.
- */
+ /** The enumerated value for the clearPasswordExpirationWarnedTime operation. */
public static final int OP_CLEAR_PASSWORD_EXPIRATION_WARNED_TIME = 13;
- /**
- * The enumerated value for the getSecondsUntilPasswordExpiration operation.
- */
+ /** The enumerated value for the getSecondsUntilPasswordExpiration operation. */
public static final int OP_GET_SECONDS_UNTIL_PASSWORD_EXPIRATION = 14;
- /**
- * The enumerated value for the getSecondsUntilPasswordExpirationWarning
- * operation.
- */
+ /** The enumerated value for the getSecondsUntilPasswordExpirationWarning operation. */
public static final int OP_GET_SECONDS_UNTIL_PASSWORD_EXPIRATION_WARNING = 15;
/** The enumerated value for the getAuthenticationFailureTimes operation. */
public static final int OP_GET_AUTHENTICATION_FAILURE_TIMES = 16;
@@ -173,16 +163,10 @@
public static final int OP_SET_AUTHENTICATION_FAILURE_TIMES = 18;
/** The enumerated value for the clearAuthenticationFailureTimes operation. */
public static final int OP_CLEAR_AUTHENTICATION_FAILURE_TIMES = 19;
- /**
- * The enumerated value for the getSecondsUntilAuthenticationFailureUnlock
- * operation.
- */
+ /** The enumerated value for the getSecondsUntilAuthenticationFailureUnlock operation. */
public static final int OP_GET_SECONDS_UNTIL_AUTHENTICATION_FAILURE_UNLOCK =
20;
- /**
- * The enumerated value for the getRemainingAuthenticationFailureCount
- * operation.
- */
+ /** The enumerated value for the getRemainingAuthenticationFailureCount operation. */
public static final int OP_GET_REMAINING_AUTHENTICATION_FAILURE_COUNT = 21;
/** The enumerated value for the getLastLoginTime operation. */
public static final int OP_GET_LAST_LOGIN_TIME = 22;
@@ -198,9 +182,7 @@
public static final int OP_SET_PASSWORD_RESET_STATE = 27;
/** The enumerated value for the clearPasswordResetState operation. */
public static final int OP_CLEAR_PASSWORD_RESET_STATE = 28;
- /**
- * The enumerated value for the getSecondsUntilPasswordResetLockout operation.
- */
+ /** The enumerated value for the getSecondsUntilPasswordResetLockout operation. */
public static final int OP_GET_SECONDS_UNTIL_PASSWORD_RESET_LOCKOUT = 29;
/** The enumerated value for the getGraceLoginUseTimes operation. */
public static final int OP_GET_GRACE_LOGIN_USE_TIMES = 30;
@@ -212,28 +194,19 @@
public static final int OP_CLEAR_GRACE_LOGIN_USE_TIMES = 33;
/** The enumerated value for the getRemainingGraceLoginCount operation. */
public static final int OP_GET_REMAINING_GRACE_LOGIN_COUNT = 34;
- /**
- * The enumerated value for the getPasswordChangedByRequiredTime operation.
- */
+ /** The enumerated value for the getPasswordChangedByRequiredTime operation. */
public static final int OP_GET_PASSWORD_CHANGED_BY_REQUIRED_TIME = 35;
- /**
- * The enumerated value for the setPasswordChangedByRequiredTime operation.
- */
+ /** The enumerated value for the setPasswordChangedByRequiredTime operation. */
public static final int OP_SET_PASSWORD_CHANGED_BY_REQUIRED_TIME = 36;
- /**
- * The enumerated value for the clearPasswordChangedByRequiredTime operation.
- */
+ /** The enumerated value for the clearPasswordChangedByRequiredTime operation. */
public static final int OP_CLEAR_PASSWORD_CHANGED_BY_REQUIRED_TIME = 37;
- /**
- * The enumerated value for the getSecondsUntilRequiredChangeTime operation.
- */
+ /** The enumerated value for the getSecondsUntilRequiredChangeTime operation. */
public static final int OP_GET_SECONDS_UNTIL_REQUIRED_CHANGE_TIME = 38;
/** The enumerated value for the getPasswordHistory operation. */
public static final int OP_GET_PASSWORD_HISTORY = 39;
/** The enumerated value for the clearPasswordHistory operation. */
public static final int OP_CLEAR_PASSWORD_HISTORY = 40;
-
/** The set of attributes to request when retrieving a user's entry. */
private LinkedHashSet<String> requestAttributes;
@@ -253,7 +226,6 @@
super();
}
-
/**
* Initializes this extended operation handler based on the information in the
* provided configuration entry. It should also register itself with the
@@ -292,7 +264,6 @@
{
operation.setResultCode(ResultCode.UNDEFINED);
-
// The user must have the password-reset privilege in order to be able to do
// anything with this extended operation.
ClientConnection clientConnection = operation.getClientConnection();
@@ -304,7 +275,6 @@
return;
}
-
// There must be a request value, and it must be a sequence. Decode it
// into its components.
ByteString requestValue = operation.getRequestValue();
@@ -334,7 +304,6 @@
return;
}
-
// Decode the DN and get the corresponding user entry.
DN targetDN;
try
@@ -456,7 +425,6 @@
}
reader.readEndSequence();
-
// If there are any modifications that need to be made to the password
// policy state, then apply them now.
List<Modification> stateMods = pwpState.getModifications();
@@ -530,7 +498,6 @@
userEntry, INFO_MODIFY_ACCOUNT_DISABLED.get(),
AccountStatusNotification.createProperties(pwpState, false, -1,
null, null));
-
}
if (isAccountSetEnabled)
{
@@ -613,8 +580,6 @@
writer.writeEndSequence();
}
-
-
/**
* Encodes the provided information in a form suitable for including in the
* response value.
@@ -1021,7 +986,6 @@
{
secondsStr =
String.valueOf((policyRequiredChangeTime-currentTime) / 1000);
-
}
}
}
@@ -1572,14 +1536,12 @@
return true;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationOID()
{
return OID_PASSWORD_POLICY_STATE_EXTOP;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationName()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index 991e81c..fba8aef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -38,10 +38,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Creates a new instance of this pwdPolicySubentry
- * virtual attribute provider.
- */
+ /** Creates a new instance of this pwdPolicySubentry virtual attribute provider. */
public PasswordPolicySubentryVirtualAttributeProvider()
{
super();
@@ -50,14 +47,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -104,7 +99,6 @@
return Attributes.empty(rule.getAttributeType());
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -113,7 +107,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 53130a5..eff15b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -64,14 +64,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /** The identity mapper that will be used to map ID strings to user entries.*/
+ /** The identity mapper that will be used to map ID strings to user entries. */
private IdentityMapper<?> identityMapper;
/** The current configuration for this SASL mechanism handler. */
private PlainSASLMechanismHandlerCfg currentConfig;
-
-
/**
* Creates a new instance of this SASL mechanism handler. No initialization
* should be done in this method, as it should all be performed in the
@@ -82,9 +80,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeSASLMechanismHandler(
PlainSASLMechanismHandlerCfg configuration)
@@ -93,18 +88,13 @@
configuration.addPlainChangeListener(this);
currentConfig = configuration;
-
// Get the identity mapper that should be used to find users.
DN identityMapperDN = configuration.getIdentityMapperDN();
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
-
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_PLAIN, this);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeSASLMechanismHandler()
{
@@ -112,10 +102,6 @@
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_PLAIN);
}
-
-
-
- /** {@inheritDoc} */
@Override
public void processSASLBind(BindOperation bindOperation)
{
@@ -151,7 +137,6 @@
authzID = credString.substring(0, nullPos1);
}
-
int nullPos2 = credString.indexOf('\u0000', nullPos1+1);
if (nullPos2 < 0)
{
@@ -183,7 +168,6 @@
authcID = credString.substring(nullPos1+1, nullPos2);
password = credString.substring(nullPos2+1);
-
// Get the user entry for the authentication ID. Allow for an
// authentication ID that is just a username (as per the SASL PLAIN spec),
// but also allow a value in the authzid form specified in RFC 2829.
@@ -259,7 +243,6 @@
}
}
-
// At this point, we should have a user entry. If we don't then fail.
if (userEntry == null)
{
@@ -274,7 +257,6 @@
bindOperation.setSASLAuthUserEntry(userEntry);
}
-
// If an authorization ID was provided, then make sure that it is
// acceptable.
Entry authZEntry = userEntry;
@@ -413,7 +395,6 @@
}
}
-
// Get the password policy for the user and use it to determine if the
// provided password was correct.
try
@@ -452,7 +433,6 @@
return;
}
-
// If we've gotten here, then the authentication was successful.
bindOperation.setResultCode(ResultCode.SUCCESS);
@@ -464,9 +444,6 @@
return;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isPasswordBased(String mechanism)
{
@@ -474,9 +451,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure(String mechanism)
{
@@ -484,9 +458,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -497,9 +468,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
PlainSASLMechanismHandlerCfg configuration,
@@ -508,9 +476,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
PlainSASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
index ff4e0bd..ba400ee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.RC4PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -36,7 +34,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a Directory Server password storage scheme that will
* encode values using the RC4 reversible encryption algorithm. This
@@ -48,16 +45,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* The reference to the Directory Server crypto manager that we will use to
* handle the encryption/decryption.
*/
private CryptoManager cryptoManager;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -68,9 +61,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
RC4PasswordStorageSchemeCfg configuration)
@@ -79,18 +69,12 @@
cryptoManager = DirectoryServer.getCryptoManager();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_RC4;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -123,9 +107,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -165,9 +146,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -187,18 +165,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -220,9 +192,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -230,9 +199,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -242,9 +208,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -253,9 +216,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -266,9 +226,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -276,4 +233,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
index ef2e150..0b61eca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -50,7 +50,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/** The current configuration for this password validator. */
private RandomPasswordGeneratorCfg currentConfig;
@@ -63,10 +62,7 @@
/** The total length of the password that will be generated. */
private int totalLength;
- /**
- * The numbers of characters of each type that should be used to generate the
- * passwords.
- */
+ /** The numbers of characters of each type that should be used to generate the passwords. */
private int[] characterCounts;
/** The character sets that should be used to generate the passwords. */
@@ -81,9 +77,6 @@
/** The character set format string for this password generator. */
private String formatString;
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordGenerator(
RandomPasswordGeneratorCfg configuration)
@@ -132,7 +125,6 @@
throw new InitializationException(message, e);
}
-
// Get the value that describes which character set(s) and how many
// characters from each should be used.
@@ -206,17 +198,12 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordGenerator()
{
currentConfig.removeRandomChangeListener(this);
}
-
-
/**
* Generates a password for the user whose account is contained in the
* specified entry.
@@ -246,9 +233,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PasswordGeneratorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -258,9 +242,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
RandomPasswordGeneratorCfg configuration,
@@ -308,7 +289,6 @@
return false;
}
-
// Get the value that describes which character set(s) and how many
// characters from each should be used.
try
@@ -351,21 +331,16 @@
return false;
}
-
// If we've gotten here, then everything looks OK.
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
RandomPasswordGeneratorCfg configuration)
{
final ConfigChangeResult ccr = new ConfigChangeResult();
-
// Get the character sets for use in generating the password. At least one
// must have been provided.
SortedSet<String> newEncodedCharacterSets = null;
@@ -408,7 +383,6 @@
ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
}
-
// Get the value that describes which character set(s) and how many
// characters from each should be used.
ArrayList<NamedCharacterSet> newSetList = new ArrayList<>();
@@ -459,7 +433,6 @@
ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
}
-
// If everything looks OK, then apply the changes.
if (ccr.getResultCode() == ResultCode.SUCCESS)
{
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 ed434cc..44aaf7f 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
@@ -12,19 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
-
package org.opends.server.extensions;
-
-
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
-
-
/**
* This class redirects read and write requests either to a child byte channel,
* or a byte channel to be redirected to.
@@ -45,21 +40,15 @@
return new RedirectingByteChannel(bc);
}
-
-
private final ByteChannel child;
private volatile ByteChannel redirect;
-
-
private RedirectingByteChannel(final ByteChannel child)
{
this.child = child;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void close() throws IOException
{
final ByteChannel tmp = redirect;
@@ -73,19 +62,13 @@
}
}
-
-
- /**
- * Disable redirection.
- */
+ /** Disable redirection. */
public final void disable()
{
redirect = null;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isOpen()
{
final ByteChannel tmp = redirect;
@@ -99,9 +82,7 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
public int read(final ByteBuffer buffer) throws IOException
{
final ByteChannel tmp = redirect;
@@ -115,8 +96,6 @@
}
}
-
-
/**
* Redirects a byte channel to a byte channel associated with the specified
* provider.
@@ -129,9 +108,7 @@
redirect = provider.getChannel();
}
-
-
- /** {@inheritDoc} */
+ @Override
public int write(final ByteBuffer buffer) throws IOException
{
final ByteChannel tmp = redirect;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 18e4535..4631c5b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -84,8 +84,6 @@
/** The replacement string to use for the pattern. */
private String replacePattern;
-
-
/**
* Creates a new instance of this regular expression identity mapper. All
* initialization should be performed in the {@code initializeIdentityMapper}
@@ -98,9 +96,6 @@
// Don't do any initialization here.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeIdentityMapper(
RegularExpressionIdentityMapperCfg configuration)
@@ -128,7 +123,6 @@
replacePattern = "";
}
-
// Get the attribute types to use for the searches. Ensure that they are
// all indexed for equality.
attributeTypes =
@@ -153,24 +147,17 @@
}
}
-
// Create the attribute list to include in search requests. We want to
// include all user and operational attributes.
requestedAttributes = newLinkedHashSet("*", "+");
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeIdentityMapper()
{
currentConfig.removeRegularExpressionChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public Entry getEntryForID(String id)
throws DirectoryException
@@ -178,13 +165,11 @@
RegularExpressionIdentityMapperCfg config = currentConfig;
AttributeType[] attributeTypes = this.attributeTypes;
-
// Run the provided identifier string through the regular expression pattern
// matcher and make the appropriate replacement.
Matcher matcher = matchPattern.matcher(id);
String processedID = matcher.replaceAll(replacePattern);
-
// Construct the search filter to use to make the determination.
SearchFilter filter;
if (attributeTypes.length == 1)
@@ -204,7 +189,6 @@
filter = SearchFilter.createORFilter(filterComps);
}
-
// Iterate through the set of search bases and process an internal search
// to find any matching entries. Since we'll only allow a single match,
// then use size and time limits to constrain costly searches resulting from
@@ -242,7 +226,6 @@
throw new DirectoryException(
ResultCode.CONSTRAINT_VIOLATION, message);
-
case TIME_LIMIT_EXCEEDED:
case ADMIN_LIMIT_EXCEEDED:
// The search criteria was too inefficient.
@@ -280,9 +263,6 @@
return matchingEntry;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -292,9 +272,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
RegularExpressionIdentityMapperCfg configuration,
@@ -336,13 +313,9 @@
configAcceptable = false;
}
-
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
RegularExpressionIdentityMapperCfg configuration)
@@ -366,11 +339,9 @@
newReplacePattern = "";
}
-
AttributeType[] newAttributeTypes =
configuration.getMatchAttribute().toArray(new AttributeType[0]);
-
if (ccr.getResultCode() == ResultCode.SUCCESS)
{
attributeTypes = newAttributeTypes;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index 7ae194f..85601cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -45,11 +45,7 @@
/** The current configuration for this password validator. */
private RepeatedCharactersPasswordValidatorCfg currentConfig;
-
-
- /**
- * Creates a new instance of this repeated characters password validator.
- */
+ /** Creates a new instance of this repeated characters password validator. */
public RepeatedCharactersPasswordValidator()
{
super();
@@ -58,9 +54,6 @@
// performed in the initializePasswordValidator() method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
RepeatedCharactersPasswordValidatorCfg configuration)
@@ -69,18 +62,12 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeRepeatedCharactersChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -97,7 +84,6 @@
return true;
}
-
// Get the password as a string. If we should use case-insensitive
// validation, then convert it to use all lowercase characters.
String passwordString = newPassword.toString();
@@ -106,13 +92,11 @@
passwordString = passwordString.toLowerCase();
}
-
// Create variables to keep track of the last character we've seen and how
// many times we have seen it.
char lastCharacter = '\u0000';
int consecutiveCount = 0;
-
// Iterate through the characters in the password. If the consecutive
// count ever gets too high, then fail.
for (int i=0; i < passwordString.length(); i++)
@@ -140,9 +124,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
RepeatedCharactersPasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -152,9 +134,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
RepeatedCharactersPasswordValidatorCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
index 59e2e6d..3071051 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -29,12 +29,9 @@
*/
public final class SASLByteChannel implements ConnectionSecurityProvider
{
-
/** Private implementation. */
private final class ByteChannelImpl implements ByteChannel
{
-
- /** {@inheritDoc} */
@Override
public void close() throws IOException
{
@@ -48,18 +45,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isOpen()
{
return saslContext != null;
}
-
-
- /** {@inheritDoc} */
@Override
public int read(final ByteBuffer unwrappedData) throws IOException
{
@@ -97,9 +88,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public int write(final ByteBuffer unwrappedData) throws IOException
{
@@ -154,8 +142,6 @@
return bytesWritten;
}
-
-
/** Attempt to read and unwrap the next SASL packet. */
private int doRecvAndUnwrap() throws IOException
{
@@ -240,8 +226,6 @@
}
}
-
-
/**
* Return a SASL byte channel instance created using the specified parameters.
*
@@ -259,8 +243,6 @@
return new SASLByteChannel(c, name, context);
}
-
-
private final String name;
private final ByteChannel channel;
private final ByteChannelImpl pimpl = new ByteChannelImpl();
@@ -279,8 +261,6 @@
private final Object readLock = new Object();
private final Object writeLock = new Object();
-
-
/**
* Create a SASL byte channel with the specified parameters that is capable of
* processing a confidentiality/integrity SASL connection.
@@ -308,49 +288,33 @@
sendWrappedBuffer = ByteBuffer.allocate(sendUnwrappedBufferSize + 64);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteChannel getChannel()
{
return pimpl;
}
-
-
- /** {@inheritDoc} */
@Override
public Certificate[] getClientCertificateChain()
{
return new Certificate[0];
}
-
-
- /** {@inheritDoc} */
@Override
public String getName()
{
return name;
}
-
-
- /** {@inheritDoc} */
@Override
public int getSSF()
{
return saslContext.getSSF();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure()
{
return true;
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index c103a27..0ac70e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
@@ -37,8 +35,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* SHA-1 algorithm defined in FIPS 180-1. This is a one-way digest algorithm
@@ -53,22 +49,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SHA1PasswordStorageScheme";
-
-
/** The message digest that will actually be used to generate the SHA-1 hashes. */
private MessageDigest messageDigest;
/** The lock used to provide threadsafe access to the message digest. */
private Object digestLock;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -79,9 +69,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SHA1PasswordStorageSchemeCfg configuration)
@@ -103,18 +90,12 @@
digestLock = new Object();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SHA_1;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -151,9 +132,6 @@
return ByteString.valueOfUtf8(Base64.encode(digestBytes));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -197,9 +175,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -247,9 +222,6 @@
return userPWDigestBytes.equals(storedPWDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -257,9 +229,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -269,9 +238,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -280,18 +246,12 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -301,9 +261,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -314,9 +271,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -324,4 +278,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index 5aeebee..db6bb48 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -87,8 +87,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/** A mapping between the notification types and the message template. */
private HashMap<AccountStatusNotificationType,
List<NotificationMessageTemplateElement>> templateMap;
@@ -99,20 +97,12 @@
/** The current configuration for this account status notification handler. */
private SMTPAccountStatusNotificationHandlerCfg currentConfig;
-
-
- /**
- * Creates a new, uninitialized instance of this account status notification
- * handler.
- */
+ /** Creates a new, uninitialized instance of this account status notification handler. */
public SMTPAccountStatusNotificationHandler()
{
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeStatusNotificationHandler(
SMTPAccountStatusNotificationHandlerCfg configuration)
@@ -143,8 +133,6 @@
}
}
-
-
/**
* Examines the provided configuration and parses the message subject
* information from it.
@@ -197,8 +185,6 @@
return map;
}
-
-
/**
* Examines the provided configuration and parses the message template
* information from it.
@@ -266,8 +252,6 @@
return map;
}
-
-
/**
* Parses the specified template file into a list of notification message
* template elements.
@@ -439,7 +423,6 @@
}
}
-
// We need to put a CRLF at the end of the line, as per the SMTP spec.
elementList.add(new TextNotificationMessageTemplateElement("\r\n"));
}
@@ -459,9 +442,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
AccountStatusNotificationHandlerCfg
@@ -473,9 +453,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public void handleStatusNotification(AccountStatusNotification notification)
{
@@ -484,7 +461,6 @@
HashMap<AccountStatusNotificationType,
List<NotificationMessageTemplateElement>> templates = templateMap;
-
// First, see if the notification type is one that we handle. If not, then
// return without doing anything.
AccountStatusNotificationType notificationType =
@@ -502,7 +478,6 @@
return;
}
-
// It is a notification that should be handled, so we can start generating
// the e-mail message. First, check to see if there are any mail attributes
// that would cause us to send a message to the end user.
@@ -553,7 +528,6 @@
}
}
-
// Next, add any explicitly-defined recipients.
if (recipientAddrs != null)
{
@@ -568,7 +542,6 @@
recipients.addAll(recipientAddrs);
}
-
// Get the message subject to use. If none is defined, then use a generic
// subject.
String subject = subjects.get(notificationType);
@@ -586,8 +559,6 @@
logger.trace("Using per-type subject of " + subject);
}
-
-
// Generate the message body.
LocalizableMessageBuilder messageBody = new LocalizableMessageBuilder();
for (NotificationMessageTemplateElement e : templateElements)
@@ -595,7 +566,6 @@
e.generateValue(messageBody, notification);
}
-
// Create and send the e-mail message.
EMailMessage message = new EMailMessage(config.getSenderAddress(),
recipients, subject);
@@ -610,7 +580,6 @@
logger.trace("Set message body of " + messageBody);
}
-
try
{
message.send();
@@ -629,9 +598,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SMTPAccountStatusNotificationHandlerCfg configuration,
@@ -639,7 +605,6 @@
{
boolean configAcceptable = true;
-
// Make sure that the Directory Server is configured with information about
// one or more mail servers.
List<Properties> propList = DirectoryServer.getMailServerPropertySets();
@@ -649,7 +614,6 @@
configAcceptable = false;
}
-
// Make sure that either an explicit recipient list or a set of email
// address attributes were provided.
Set<AttributeType> mailAttrs = configuration.getEmailAddressAttributeType();
@@ -688,9 +652,6 @@
return configAcceptable;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SMTPAccountStatusNotificationHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
index c7d8365..ba2c2bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
@@ -36,8 +36,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.util.EMailMessage;
-
-
/**
* This class implements a Directory Server alert handler that may be used to
* send administrative alerts via SMTP.
@@ -48,16 +46,10 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/** The current configuration for this alert handler. */
private SMTPAlertHandlerCfg currentConfig;
-
-
- /**
- * Creates a new instance of this SMTP alert handler.
- */
+ /** Creates a new instance of this SMTP alert handler. */
public SMTPAlertHandler()
{
super();
@@ -65,9 +57,7 @@
// All initialization should be done in the initializeAlertHandler method.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void initializeAlertHandler(SMTPAlertHandlerCfg configuration)
throws ConfigException, InitializationException
{
@@ -83,34 +73,26 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
+ @Override
public AlertHandlerCfg getAlertHandlerConfiguration()
{
return currentConfig;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationAcceptable(AlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
{
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void finalizeAlertHandler()
{
// No action is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void sendAlertNotification(AlertGenerator generator, String alertType,
LocalizableMessage alertMessage)
{
@@ -150,8 +132,6 @@
}
}
-
-
/**
* Replaces any occurrences of special tokens in the given string with the
* appropriate value. Tokens supported include:
@@ -181,9 +161,7 @@
replace("\\n", "\r\n");
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
SMTPAlertHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -191,9 +169,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
SMTPAlertHandlerCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 7e7dd34..794e991 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
@@ -38,8 +36,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* MD5 algorithm defined in RFC 1321. This is a one-way digest algorithm so
@@ -56,24 +52,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SaltedMD5PasswordStorageScheme";
-
-
- /**
- * The number of bytes of random data to use as the salt when generating the
- * hashes.
- */
+ /** The number of bytes of random data to use as the salt when generating the hashes. */
private static final int NUM_SALT_BYTES = 8;
/** The number of bytes MD5 algorithm produces. */
private static final int MD5_LENGTH = 16;
-
/** The message digest that will actually be used to generate the MD5 hashes. */
private MessageDigest messageDigest;
@@ -83,8 +71,6 @@
/** The secure random number generator to use to generate the salt values. */
private Random random;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -95,9 +81,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SaltedMD5PasswordStorageSchemeCfg configuration)
@@ -115,23 +98,16 @@
throw new InitializationException(message, e);
}
-
digestLock = new Object();
random = new Random();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SALTED_MD5;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -181,9 +157,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -239,9 +212,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -272,7 +242,6 @@
return false;
}
-
// Use the salt to generate a digest based on the provided plain-text value.
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSalt = new byte[plainBytesLength + saltLength];
@@ -303,9 +272,6 @@
return Arrays.equals(digestBytes, userDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -313,18 +279,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_SALTED_MD5;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -364,7 +324,6 @@
}
}
-
// Encode and return the value.
StringBuilder authPWValue = new StringBuilder();
authPWValue.append(AUTH_PASSWORD_SCHEME_NAME_SALTED_MD5);
@@ -376,9 +335,6 @@
return ByteString.valueOfUtf8(authPWValue);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -397,7 +353,6 @@
return false;
}
-
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSaltBytes = new byte[plainBytesLength + saltBytes.length];
plaintextPassword.copyTo(plainPlusSaltBytes);
@@ -418,18 +373,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -439,9 +388,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -452,9 +398,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -462,4 +405,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index 5ce6dd7..e9325e7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
@@ -38,8 +36,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* SHA-1 algorithm defined in FIPS 180-1. This is a one-way digest algorithm
@@ -56,24 +52,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SaltedSHA1PasswordStorageScheme";
-
-
- /**
- * The number of bytes of random data to use as the salt when generating the
- * hashes.
- */
+ /** The number of bytes of random data to use as the salt when generating the hashes. */
private static final int NUM_SALT_BYTES = 8;
/** The number of bytes SHA algorithm produces. */
private static final int SHA1_LENGTH = 20;
-
/** The message digest that will actually be used to generate the SHA-1 hashes. */
private MessageDigest messageDigest;
@@ -83,8 +71,6 @@
/** The secure random number generator to use to generate the salt values. */
private Random random;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -95,9 +81,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SaltedSHA1PasswordStorageSchemeCfg configuration)
@@ -119,18 +102,12 @@
random = new Random();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SALTED_SHA_1;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -180,9 +157,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -238,9 +212,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -271,7 +242,6 @@
return false;
}
-
// Use the salt to generate a digest based on the provided plain-text value.
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSalt = new byte[plainBytesLength + saltLength];
@@ -302,9 +272,6 @@
return Arrays.equals(digestBytes, userDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -312,18 +279,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -363,7 +324,6 @@
}
}
-
// Encode and return the value.
StringBuilder authPWValue = new StringBuilder();
authPWValue.append(AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1);
@@ -375,9 +335,6 @@
return ByteString.valueOfUtf8(authPWValue);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -396,7 +353,6 @@
return false;
}
-
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSaltBytes = new byte[plainBytesLength + saltBytes.length];
plaintextPassword.copyTo(plainPlusSaltBytes);
@@ -417,18 +373,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -438,9 +388,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -451,9 +398,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -461,8 +405,6 @@
return true;
}
-
-
/**
* Generates an encoded password string from the given clear-text password.
* This method is primarily intended for use when it is necessary to generate
@@ -500,7 +442,6 @@
throw new DirectoryException(ResultCode.OTHER, message, e);
}
-
byte[] digestBytes = messageDigest.digest(passwordPlusSalt);
byte[] digestPlusSalt = new byte[digestBytes.length + NUM_SALT_BYTES];
System.arraycopy(digestBytes, 0, digestPlusSalt, 0, digestBytes.length);
@@ -512,4 +453,3 @@
Base64.encode(digestPlusSalt);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index bf5f259..d7e89ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
@@ -38,8 +36,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* 256-bit SHA-2 algorithm defined in FIPS 180-2. This is a one-way digest
@@ -56,27 +52,17 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SaltedSHA256PasswordStorageScheme";
-
-
- /**
- * The number of bytes of random data to use as the salt when generating the
- * hashes.
- */
+ /** The number of bytes of random data to use as the salt when generating the hashes. */
private static final int NUM_SALT_BYTES = 8;
/** Size of the dgiest in bytes. */
private static final int SHA256_LENGTH = 256 / 8;
- /**
- * The message digest that will actually be used to generate the 256-bit SHA-2
- * hashes.
- */
+ /** The message digest that will actually be used to generate the 256-bit SHA-2 hashes. */
private MessageDigest messageDigest;
/** The lock used to provide threadsafe access to the message digest. */
@@ -85,8 +71,6 @@
/** The secure random number generator to use to generate the salt values. */
private Random random;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -97,9 +81,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SaltedSHA256PasswordStorageSchemeCfg configuration)
@@ -119,23 +100,16 @@
throw new InitializationException(message, e);
}
-
digestLock = new Object();
random = new Random();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SALTED_SHA_256;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -185,9 +159,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -243,9 +214,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -278,7 +246,6 @@
return false;
}
-
// Use the salt to generate a digest based on the provided plain-text value.
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSalt = new byte[plainBytesLength + saltLength];
@@ -309,9 +276,6 @@
return Arrays.equals(digestBytes, userDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -319,18 +283,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_256;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -370,7 +328,6 @@
}
}
-
// Encode and return the value.
StringBuilder authPWValue = new StringBuilder();
authPWValue.append(AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_256);
@@ -382,9 +339,6 @@
return ByteString.valueOfUtf8(authPWValue);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -403,7 +357,6 @@
return false;
}
-
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSaltBytes = new byte[plainBytesLength + saltBytes.length];
plaintextPassword.copyTo(plainPlusSaltBytes);
@@ -424,18 +377,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -445,9 +392,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -458,9 +402,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -468,4 +409,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index 0eaa0e4..50c475d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
@@ -38,8 +36,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* 384-bit SHA-2 algorithm defined in FIPS 180-2. This is a one-way digest
@@ -56,28 +52,17 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SaltedSHA384PasswordStorageScheme";
-
-
- /**
- * The number of bytes of random data to use as the salt when generating the
- * hashes.
- */
+ /** The number of bytes of random data to use as the salt when generating the hashes. */
private static final int NUM_SALT_BYTES = 8;
-
/** The size of the digest in bytes. */
private static final int SHA384_LENGTH = 384 / 8;
- /**
- * The message digest that will actually be used to generate the 384-bit SHA-2
- * hashes.
- */
+ /** The message digest that will actually be used to generate the 384-bit SHA-2 hashes. */
private MessageDigest messageDigest;
/** The lock used to provide threadsafe access to the message digest. */
@@ -86,8 +71,6 @@
/** The secure random number generator to use to generate the salt values. */
private Random random;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -98,9 +81,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SaltedSHA384PasswordStorageSchemeCfg configuration)
@@ -120,23 +100,16 @@
throw new InitializationException(message, e);
}
-
digestLock = new Object();
random = new Random();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SALTED_SHA_384;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -186,9 +159,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -244,9 +214,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -279,7 +246,6 @@
return false;
}
-
// Use the salt to generate a digest based on the provided plain-text value.
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSalt = new byte[plainBytesLength + saltLength];
@@ -310,9 +276,6 @@
return Arrays.equals(digestBytes, userDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -320,18 +283,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_384;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -371,7 +328,6 @@
}
}
-
// Encode and return the value.
StringBuilder authPWValue = new StringBuilder();
authPWValue.append(AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_384);
@@ -383,9 +339,6 @@
return ByteString.valueOfUtf8(authPWValue);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -404,7 +357,6 @@
return false;
}
-
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSaltBytes = new byte[plainBytesLength + saltBytes.length];
plaintextPassword.copyTo(plainPlusSaltBytes);
@@ -425,18 +377,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -446,9 +392,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -459,9 +402,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -469,4 +409,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 4a9a7ba..7157206 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
@@ -38,8 +36,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme based on the
* 512-bit SHA-2 algorithm defined in FIPS 180-2. This is a one-way digest
@@ -56,28 +52,17 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.extensions.SaltedSHA512PasswordStorageScheme";
-
-
- /**
- * The number of bytes of random data to use as the salt when generating the
- * hashes.
- */
+ /** The number of bytes of random data to use as the salt when generating the hashes. */
private static final int NUM_SALT_BYTES = 8;
-
/** The size of the digest in bytes. */
private static final int SHA512_LENGTH = 512 / 8;
- /**
- * The message digest that will actually be used to generate the 512-bit SHA-2
- * hashes.
- */
+ /** The message digest that will actually be used to generate the 512-bit SHA-2 hashes. */
private MessageDigest messageDigest;
/** The lock used to provide threadsafe access to the message digest. */
@@ -86,8 +71,6 @@
/** The secure random number generator to use to generate the salt values. */
private Random random;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -98,9 +81,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
SaltedSHA512PasswordStorageSchemeCfg configuration)
@@ -124,18 +104,12 @@
random = new Random();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_SALTED_SHA_512;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -185,9 +159,6 @@
return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -243,9 +214,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -278,7 +246,6 @@
return false;
}
-
// Use the salt to generate a digest based on the provided plain-text value.
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSalt = new byte[plainBytesLength + saltLength];
@@ -309,9 +276,6 @@
return Arrays.equals(digestBytes, userDigestBytes);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -319,18 +283,12 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public String getAuthPasswordSchemeName()
{
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_512;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -370,7 +328,6 @@
}
}
-
// Encode and return the value.
StringBuilder authPWValue = new StringBuilder();
authPWValue.append(AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_512);
@@ -382,9 +339,6 @@
return ByteString.valueOfUtf8(authPWValue);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -403,7 +357,6 @@
return false;
}
-
int plainBytesLength = plaintextPassword.length();
byte[] plainPlusSaltBytes = new byte[plainBytesLength + saltBytes.length];
plaintextPassword.copyTo(plainPlusSaltBytes);
@@ -424,18 +377,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -445,9 +392,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -458,9 +402,6 @@
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -468,8 +409,6 @@
return true;
}
-
-
/**
* Generates an encoded password string from the given clear-text password.
* This method is primarily intended for use when it is necessary to generate
@@ -508,7 +447,6 @@
throw new DirectoryException(ResultCode.OTHER, message, e);
}
-
byte[] digestBytes = messageDigest.digest(passwordPlusSalt);
byte[] digestPlusSalt = new byte[digestBytes.length + NUM_SALT_BYTES];
System.arraycopy(digestBytes, 0, digestPlusSalt, 0, digestBytes.length);
@@ -520,4 +458,3 @@
Base64.encode(digestPlusSalt);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index a9a1fc1..61a5d3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -40,24 +40,18 @@
PasswordValidator<SimilarityBasedPasswordValidatorCfg> implements
ConfigurationChangeListener<SimilarityBasedPasswordValidatorCfg>
{
-
/** The current configuration for this password validator. */
private SimilarityBasedPasswordValidatorCfg currentConfig;
-
- /**
- * Creates a new instance of this password validator.
- */
+ /** Creates a new instance of this password validator. */
public SimilarityBasedPasswordValidator()
{
super();
-
// All initialization must be done in the initializePasswordValidator
// method.
}
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
SimilarityBasedPasswordValidatorCfg configuration)
@@ -68,22 +62,17 @@
currentConfig = configuration;
}
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeSimilarityBasedChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
Operation operation, Entry userEntry,
LocalizableMessageBuilder invalidReason) {
-
int minDifference = currentConfig.getMinPasswordDifference();
ByteString passwd = newPassword == null
? ByteString.empty()
@@ -115,7 +104,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
SimilarityBasedPasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -123,7 +112,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
SimilarityBasedPasswordValidatorCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
index a2bbb95..e98f64d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
@@ -17,9 +17,6 @@
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
-
-
-
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import java.util.Iterator;
@@ -38,8 +35,6 @@
import static org.opends.server.extensions.StaticGroup.*;
import static org.forgerock.util.Reject.*;
-
-
/**
* This class provides an implementation of the {@code MemberList} class that
* may be used in conjunction when static groups when no additional criteria is
@@ -71,14 +66,12 @@
this.memberDNIterator = memberDNs.iterator();
}
- /** {@inheritDoc} */
@Override
public boolean hasMoreMembers()
{
return memberDNIterator.hasNext();
}
- /** {@inheritDoc} */
@Override
public DN nextMemberDN()
throws MembershipException
@@ -102,7 +95,6 @@
return dn;
}
- /** {@inheritDoc} */
@Override
public Entry nextMemberEntry() throws MembershipException
{
@@ -132,11 +124,9 @@
return null;
}
- /** {@inheritDoc} */
@Override
public void close()
{
// No implementation is required.
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
index 911f2b1..1556441 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -67,10 +67,7 @@
/** The mapping between backend+ID and their corresponding entries. */
private ConcurrentMap<String, ConcurrentMap<Long, Reference<CacheEntry>>> idMap;
- /**
- * The reference queue that will be used to notify us whenever a soft
- * reference is freed.
- */
+ /** The reference queue that will be used to notify us whenever a soft reference is freed. */
private ReferenceQueue<CacheEntry> referenceQueue;
/** Currently registered configuration object. */
@@ -79,8 +76,6 @@
private Thread cleanerThread;
private volatile boolean shutdown;
-
-
/**
* Creates a new instance of this soft reference entry cache. All
* initialization should be performed in the <CODE>initializeEntryCache</CODE>
@@ -98,7 +93,6 @@
referenceQueue = new ReferenceQueue<>();
}
- /** {@inheritDoc} */
@Override
public void initializeEntryCache(
SoftReferenceEntryCacheCfg configuration
@@ -129,7 +123,6 @@
}
}
- /** {@inheritDoc} */
@Override
public synchronized void finalizeEntryCache()
{
@@ -152,14 +145,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean containsEntry(DN entryDN)
{
return entryDN != null && dnMap.containsKey(entryDN);
}
- /** {@inheritDoc} */
@Override
public Entry getEntry(DN entryDN)
{
@@ -182,7 +173,6 @@
return cacheEntry.getEntry();
}
- /** {@inheritDoc} */
@Override
public long getEntryID(DN entryDN)
{
@@ -195,7 +185,6 @@
return -1;
}
- /** {@inheritDoc} */
@Override
public DN getEntryDN(String backendID, long entryID)
{
@@ -213,7 +202,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public void putEntry(Entry entry, String backendID, long entryID)
{
@@ -244,7 +232,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean putEntryIfAbsent(Entry entry, String backendID, long entryID)
{
@@ -254,7 +241,6 @@
return false;
}
-
// Create the cache entry based on the provided information.
CacheEntry cacheEntry = new CacheEntry(entry, backendID, entryID);
Reference<CacheEntry> ref = new SoftReference<>(cacheEntry, referenceQueue);
@@ -276,7 +262,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public void removeEntry(DN entryDN)
{
@@ -309,7 +294,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clear()
{
@@ -317,7 +301,6 @@
idMap.clear();
}
- /** {@inheritDoc} */
@Override
public void clearBackend(String backendID)
{
@@ -340,7 +323,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clearSubtree(DN baseDN)
{
@@ -356,7 +338,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void handleLowMemory()
{
@@ -365,7 +346,6 @@
// FIXME -- Do we need to do anything at all here?
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(EntryCacheCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -375,7 +355,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SoftReferenceEntryCacheCfg configuration,
@@ -393,7 +372,6 @@
return errorHandler.getIsAcceptable();
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(SoftReferenceEntryCacheCfg configuration)
{
@@ -415,8 +393,6 @@
return changeResult;
}
-
-
/**
* Parses the provided configuration and configure the entry cache.
*
@@ -555,7 +531,6 @@
return Long.valueOf(dnMap.size());
}
- /** {@inheritDoc} */
@Override
public String toVerboseString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
index dce63be..b36cfb6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -37,7 +37,6 @@
public class StartTLSExtendedOperation
extends ExtendedOperationHandler<StartTLSExtendedOperationHandlerCfg>
{
-
/**
* Create an instance of this StartTLS extended operation handler. All
* initialization should be performed in the
@@ -48,7 +47,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public void initializeExtendedOperationHandler(
StartTLSExtendedOperationHandlerCfg config)
@@ -70,7 +68,6 @@
// happen.
operation.setResponseOID(OID_START_TLS_REQUEST);
-
// Get the reference to the client connection. If there is none, then fail.
ClientConnection clientConnection = operation.getClientConnection();
if (clientConnection == null)
@@ -80,7 +77,6 @@
return;
}
-
// Make sure that the client connection is capable of enabling TLS. If not,
// then fail.
TLSCapableConnection tlsCapableConnection;
@@ -108,14 +104,12 @@
operation.setResultCode(ResultCode.SUCCESS);
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationOID()
{
return OID_START_TLS_REQUEST;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationName()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index 3652f6a..1ac6b91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -131,7 +131,6 @@
this.memberDNs = memberDNs;
}
- /** {@inheritDoc} */
@Override
public void initializeGroupImplementation(StaticGroupImplementationCfg configuration)
throws ConfigException, InitializationException
@@ -139,7 +138,6 @@
// No additional initialization is required.
}
- /** {@inheritDoc} */
@Override
public StaticGroup newInstance(ServerContext serverContext, Entry groupEntry) throws DirectoryException
{
@@ -216,7 +214,6 @@
return new StaticGroup(serverContext, groupEntry.getName(), someMemberAttributeType, someMemberDNs);
}
- /** {@inheritDoc} */
@Override
public SearchFilter getGroupDefinitionFilter()
throws DirectoryException
@@ -229,7 +226,6 @@
return SearchFilter.createFilterFromString(filterString);
}
- /** {@inheritDoc} */
@Override
public boolean isGroupDefinition(Entry entry)
{
@@ -264,28 +260,24 @@
return entry.hasObjectClass(DirectoryConfig.getObjectClass(ocName, true));
}
- /** {@inheritDoc} */
@Override
public DN getGroupDN()
{
return groupEntryDN;
}
- /** {@inheritDoc} */
@Override
public void setGroupDN(DN groupDN)
{
groupEntryDN = groupDN;
}
- /** {@inheritDoc} */
@Override
public boolean supportsNestedGroups()
{
return true;
}
- /** {@inheritDoc} */
@Override
public List<DN> getNestedGroupDNs()
{
@@ -308,7 +300,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -347,7 +338,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -386,7 +376,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isMember(DN userDN, Set<DN> examinedGroups) throws DirectoryException
{
@@ -422,7 +411,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
throws DirectoryException
@@ -486,7 +474,6 @@
}
}
- /** {@inheritDoc} */
@Override
public MemberList getMembers() throws DirectoryException
{
@@ -502,7 +489,6 @@
}
}
- /** {@inheritDoc} */
@Override
public MemberList getMembers(DN baseDN, SearchScope scope, SearchFilter filter) throws DirectoryException
{
@@ -522,14 +508,12 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean mayAlterMemberList()
{
return true;
}
- /** {@inheritDoc} */
@Override
public void updateMembers(List<Modification> modifications)
throws UnsupportedOperationException, DirectoryException
@@ -597,7 +581,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void addMember(Entry userEntry) throws UnsupportedOperationException, DirectoryException
{
@@ -633,7 +616,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void removeMember(DN userDN) throws UnsupportedOperationException, DirectoryException
{
@@ -684,7 +666,6 @@
newLinkedList(control), groupEntryDN, mods);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
@@ -717,4 +698,3 @@
return compactDn.toDn();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
index 4821a42..9ccf5ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -39,10 +39,7 @@
public class StructuralObjectClassVirtualAttributeProvider
extends VirtualAttributeProvider<StructuralObjectClassVirtualAttributeCfg>
{
- /**
- * Creates a new instance of this structuralObjectClass virtual attribute
- * provider.
- */
+ /** Creates a new instance of this structuralObjectClass virtual attribute provider. */
public StructuralObjectClassVirtualAttributeProvider()
{
super();
@@ -51,14 +48,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -66,14 +61,12 @@
.getStructuralObjectClass().getNameOrOID());
}
- /** {@inheritDoc} */
@Override
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
return entry.getStructuralObjectClass() != null;
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -85,7 +78,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -95,7 +87,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -105,7 +96,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -115,7 +105,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -126,7 +115,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -138,4 +126,3 @@
searchOperation.appendErrorMessage(message);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index af8976d..e6b4754 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -73,7 +73,6 @@
/** The set of attributes to return in search result entries. */
private LinkedHashSet<String> requestedAttributes;
-
/**
* Creates a new instance of this certificate mapper. Note that all actual
* initialization should be done in the
@@ -84,9 +83,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeCertificateMapper(
SubjectDNToUserAttributeCertificateMapperCfg
@@ -98,7 +94,6 @@
currentConfig = configuration;
configEntryDN = configuration.dn();
-
// Make sure that the subject attribute is configured for equality in all
// appropriate backends.
Set<DN> cfgBaseDNs = configuration.getUserBaseDN();
@@ -123,18 +118,12 @@
requestedAttributes = newLinkedHashSet("*", "+");
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeCertificateMapper()
{
currentConfig.removeSubjectDNToUserAttributeChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
@@ -143,7 +132,6 @@
currentConfig;
AttributeType subjectAttributeType = config.getSubjectAttribute();
-
// Make sure that a peer certificate was provided.
if (certificateChain == null || certificateChain.length == 0)
{
@@ -151,7 +139,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the first certificate in the chain. It must be an X.509 certificate.
X509Certificate peerCertificate;
try
@@ -166,7 +153,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the subject from the peer certificate and use it to create a search
// filter.
X500Principal peerPrincipal = peerCertificate.getSubjectX500Principal();
@@ -174,7 +160,6 @@
SearchFilter filter = SearchFilter.createEqualityFilter(
subjectAttributeType, ByteString.valueOfUtf8(peerName));
-
// If we have an explicit set of base DNs, then use it. Otherwise, use the
// set of public naming contexts in the server.
Collection<DN> baseDNs = config.getUserBaseDN();
@@ -183,7 +168,6 @@
baseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
-
// For each base DN, issue an internal search in an attempt to map the
// certificate.
Entry userEntry = null;
@@ -213,7 +197,6 @@
throw new DirectoryException(
ResultCode.INVALID_CREDENTIALS, message);
-
case TIME_LIMIT_EXCEEDED:
case ADMIN_LIMIT_EXCEEDED:
// The search criteria was too inefficient.
@@ -241,15 +224,11 @@
}
}
-
// If we've gotten here, then we either found exactly one user entry or we
// didn't find any. Either way, return the entry or null to the caller.
return userEntry;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -259,9 +238,6 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SubjectDNToUserAttributeCertificateMapperCfg
@@ -271,9 +247,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SubjectDNToUserAttributeCertificateMapperCfg
@@ -283,4 +256,3 @@
return new ConfigChangeResult();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index 9ed11af..579c583 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import javax.security.auth.x500.X500Principal;
@@ -54,9 +52,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeCertificateMapper(SubjectEqualsDNCertificateMapperCfg
configuration)
@@ -65,8 +60,6 @@
// No initialization is required.
}
-
-
/**
* Establishes a mapping between the information in the provided certificate
* chain to the DN of a single user in the Directory Server.
@@ -98,7 +91,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the first certificate in the chain. It must be an X.509 certificate.
X509Certificate peerCertificate;
try
@@ -113,7 +105,6 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
-
// Get the subject from the peer certificate and decode it as a DN.
X500Principal peerPrincipal = peerCertificate.getSubjectX500Principal();
DN subjectDN;
@@ -161,4 +152,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index afb6426..46a30c8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -38,10 +38,7 @@
public class SubschemaSubentryVirtualAttributeProvider
extends VirtualAttributeProvider<SubschemaSubentryVirtualAttributeCfg>
{
- /**
- * Creates a new instance of this subschemaSubentry virtual attribute
- * provider.
- */
+ /** Creates a new instance of this subschemaSubentry virtual attribute provider. */
public SubschemaSubentryVirtualAttributeProvider()
{
super();
@@ -50,14 +47,12 @@
// initializeVirtualAttributeProvider method.
}
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return false;
}
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -69,7 +64,6 @@
return Attributes.create(rule.getAttributeType(), schemaDN.toString());
}
- /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(Entry entry,
VirtualAttributeRule rule,
@@ -81,7 +75,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -91,7 +84,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -101,7 +93,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(Entry entry,
VirtualAttributeRule rule,
@@ -111,7 +102,6 @@
return ConditionResult.UNDEFINED;
}
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -122,7 +112,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -134,4 +123,3 @@
searchOperation.appendErrorMessage(message);
}
}
-
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 0cbc4ae..2116edd 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
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
@@ -36,20 +34,12 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
-/**
- * A class that provides a TLS byte channel implementation.
- */
+/** A class that provides a TLS byte channel implementation. */
public final class TLSByteChannel implements ConnectionSecurityProvider
{
- /**
- * Private implementation.
- */
+ /** Private implementation. */
private final class ByteChannelImpl implements ByteChannel
{
-
- /** {@inheritDoc} */
@Override
public void close() throws IOException
{
@@ -98,18 +88,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isOpen()
{
return !sslEngine.isOutboundDone() || !sslEngine.isInboundDone();
}
-
-
- /** {@inheritDoc} */
@Override
public int read(final ByteBuffer unwrappedData) throws IOException
{
@@ -147,9 +131,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public int write(final ByteBuffer unwrappedData) throws IOException
{
@@ -176,8 +157,6 @@
return bytesWritten;
}
-
-
/**
* It seems that the SSL engine does not remember if an error has already
* occurred so we must cache it here and rethrow. See OPENDJ-652.
@@ -190,8 +169,6 @@
}
}
-
-
private void doHandshake(final boolean isReading) throws IOException
{
// This lock is probably unnecessary since tasks can be run in parallel,
@@ -234,8 +211,6 @@
}
}
-
-
/** Attempt to read and unwrap the next SSL packet. */
private int doRecvAndUnwrap() throws IOException
{
@@ -323,8 +298,6 @@
}
}
-
-
/** Attempt to wrap and send the next SSL packet. */
private int doWrapAndSend(final ByteBuffer unwrappedData)
throws IOException
@@ -382,17 +355,12 @@
}
}
-
-
private boolean isHandshaking(final HandshakeStatus status)
{
return status != HandshakeStatus.NOT_HANDSHAKING;
}
-
}
-
-
/**
* Map of cipher phrases to effective key size (bits). Taken from the
* following RFCs: 5289, 4346, 3268,4132 and 4162 and the IANA Transport Layer
@@ -445,8 +413,6 @@
private final Object readLock = new Object();
private final Object writeLock = new Object();
-
-
/**
* Creates an TLS byte channel instance using the specified LDAP connection
* configuration, client connection, SSL context and socket channel
@@ -476,18 +442,12 @@
recvUnwrappedBuffer.flip();
}
-
-
- /** {@inheritDoc} */
@Override
public ByteChannel getChannel()
{
return pimpl;
}
-
-
- /** {@inheritDoc} */
@Override
public Certificate[] getClientCertificateChain()
{
@@ -502,18 +462,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public String getName()
{
return "TLS";
}
-
-
- /** {@inheritDoc} */
@Override
public int getSSF()
{
@@ -546,13 +500,9 @@
return null;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure()
{
return true;
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
index 0f15f58..7262d98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
@@ -12,17 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.types.AccountStatusNotification;
-
-
/**
* This class implements a notification message template element that will
* generate a value using static text.
@@ -33,8 +29,6 @@
/** The static text associated with this element. */
private final String text;
-
-
/**
* Creates a new text notification message template element from the provided
* string.
@@ -46,13 +40,10 @@
this.text = text;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
buffer.append(text);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
index 9bb9373..fa64931 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
@@ -45,8 +43,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
-
-
/**
* This class defines a data structure for storing and interacting with the
* Directory Server work queue.
@@ -112,16 +108,10 @@
/** The queue that will be used to actually hold the pending operations. */
private LinkedBlockingQueue<Operation> opQueue;
- /**
- * The lock used to provide threadsafe access for the queue, used for
- * non-config changes.
- */
+ /** The lock used to provide threadsafe access for the queue, used for non-config changes. */
private final ReadLock queueReadLock;
- /**
- * The lock used to provide threadsafe access for the queue, used for config
- * changes.
- */
+ /** The lock used to provide threadsafe access for the queue, used for config changes. */
private final WriteLock queueWriteLock;
{
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -129,8 +119,6 @@
queueWriteLock = lock.writeLock();
}
-
-
/**
* Creates a new instance of this work queue. All initialization should be
* performed in the <CODE>initializeWorkQueue</CODE> method.
@@ -140,9 +128,6 @@
// No implementation should be performed here.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeWorkQueue(TraditionalWorkQueueCfg configuration)
throws ConfigException, InitializationException
@@ -206,9 +191,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeWorkQueue(LocalizableMessage reason)
{
@@ -262,8 +244,6 @@
}
}
-
-
/**
* Indicates whether this work queue has received a request to shut down.
*
@@ -283,8 +263,6 @@
}
}
-
-
/**
* Submits an operation to be processed by one of the worker threads
* associated with this work queue.
@@ -302,7 +280,6 @@
submitOperation(operation, isBlocking);
}
- /** {@inheritDoc} */
@Override
public boolean trySubmitOperation(Operation operation)
throws DirectoryException
@@ -389,8 +366,6 @@
}
}
-
-
/**
* Retrieves the next operation that should be processed by one of the worker
* threads, blocking if necessary until a new request arrives. This method
@@ -407,8 +382,6 @@
return retryNextOperation(workerThread, 0);
}
-
-
/**
* Retrieves the next operation that should be processed by one of the worker
* threads following a previous failure attempt. A maximum of five consecutive
@@ -512,8 +485,6 @@
return retryNextOperation(workerThread, numFailures + 1);
}
-
-
/**
* Kills this worker thread if needed. This method assumes that the read lock
* is already taken and ensure that it is taken on exit.
@@ -568,8 +539,6 @@
return false;
}
-
-
/**
* Retrieves the total number of operations that have been successfully
* submitted to this work queue for processing since server startup. This does
@@ -584,8 +553,6 @@
return opsSubmitted.longValue();
}
-
-
/**
* Retrieves the total number of operations that have been rejected because
* the work queue was already at its maximum capacity.
@@ -598,8 +565,6 @@
return queueFullRejects.longValue();
}
-
-
/**
* Retrieves the number of pending operations in the queue that have not yet
* been picked up for processing. Note that this method is not a constant-time
@@ -622,9 +587,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
TraditionalWorkQueueCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -632,9 +594,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
TraditionalWorkQueueCfg configuration)
@@ -680,7 +639,6 @@
}
}
-
// Apply a change to the maximum capacity if appropriate. Since we can't
// change capacity on the fly, then we'll have to create a new queue and
// transfer any remaining items into it. Any thread that is waiting on the
@@ -753,9 +711,6 @@
return new ConfigChangeResult();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isIdle()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
index b542122..5e62d94 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.server.config.server.TripleDESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
@@ -36,8 +34,6 @@
import static org.opends.server.extensions.ExtensionsConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a Directory Server password storage scheme that will
* encode values using the triple-DES (DES/EDE) reversible encryption algorithm.
@@ -49,16 +45,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* The reference to the Directory Server crypto manager that we will use to
* handle the encryption/decryption.
*/
private CryptoManager cryptoManager;
-
-
/**
* Creates a new instance of this password storage scheme. Note that no
* initialization should be performed here, as all initialization should be
@@ -69,9 +61,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordStorageScheme(
TripleDESPasswordStorageSchemeCfg configuration)
@@ -80,18 +69,12 @@
cryptoManager = DirectoryServer.getCryptoManager();
}
-
-
- /** {@inheritDoc} */
@Override
public String getStorageSchemeName()
{
return STORAGE_SCHEME_NAME_3DES;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException
@@ -124,9 +107,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
@@ -166,9 +146,6 @@
return ByteString.valueOfUtf8(buffer);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordMatches(ByteSequence plaintextPassword,
ByteSequence storedPassword)
@@ -188,18 +165,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isReversible()
{
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getPlaintextValue(ByteSequence storedPassword)
throws DirectoryException
@@ -221,9 +192,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsAuthPasswordSyntax()
{
@@ -231,9 +199,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString encodeAuthPassword(ByteSequence plaintext)
throws DirectoryException
@@ -243,9 +208,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean authPasswordMatches(ByteSequence plaintextPassword,
String authInfo, String authValue)
@@ -254,9 +216,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public ByteString getAuthPasswordPlaintextValue(String authInfo,
String authValue)
@@ -267,9 +226,6 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isStorageSchemeSecure()
{
@@ -277,4 +233,3 @@
return true;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index ca86d6f..78c197e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -44,11 +44,7 @@
/** The current configuration for this password validator. */
private UniqueCharactersPasswordValidatorCfg currentConfig;
-
-
- /**
- * Creates a new instance of this unique characters password validator.
- */
+ /** Creates a new instance of this unique characters password validator. */
public UniqueCharactersPasswordValidator()
{
super();
@@ -57,9 +53,6 @@
// performed in the initializePasswordValidator() method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
UniqueCharactersPasswordValidatorCfg configuration)
@@ -68,18 +61,12 @@
currentConfig = configuration;
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizePasswordValidator()
{
currentConfig.removeUniqueCharactersChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
@@ -96,8 +83,6 @@
return true;
}
-
-
// Create a set that will be used to keep track of the unique characters
// contained in the proposed password.
HashSet<Character> passwordCharacters = new HashSet<>();
@@ -129,9 +114,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
UniqueCharactersPasswordValidatorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -141,9 +124,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
UniqueCharactersPasswordValidatorCfg configuration)
{
@@ -156,4 +137,3 @@
return ccr;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
index 4575dfe..fb6a614 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
@@ -12,17 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.types.AccountStatusNotification;
-
-
/**
* This class implements a notification message template element that will
* generate a value that is the string representation of the target user's DN.
@@ -30,21 +26,16 @@
public class UserDNNotificationMessageTemplateElement
extends NotificationMessageTemplateElement
{
- /**
- * Creates a new user DN notification message template element.
- */
+ /** Creates a new user DN notification message template element. */
public UserDNNotificationMessageTemplateElement()
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void generateValue(LocalizableMessageBuilder buffer,
AccountStatusNotification notification)
{
buffer.append(notification.getUserDN());
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index 3446230..18c49b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -43,11 +43,7 @@
/** The current configuration for this virtual attribute provider. */
private UserDefinedVirtualAttributeCfg currentConfig;
-
-
- /**
- * Creates a new instance of this member virtual attribute provider.
- */
+ /** Creates a new instance of this member virtual attribute provider. */
public UserDefinedVirtualAttributeProvider()
{
super();
@@ -56,9 +52,6 @@
// initializeVirtualAttributeProvider method.
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeVirtualAttributeProvider(
UserDefinedVirtualAttributeCfg configuration)
@@ -68,27 +61,18 @@
configuration.addUserDefinedChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public void finalizeVirtualAttributeProvider()
{
currentConfig.removeUserDefinedChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMultiValued()
{
return currentConfig == null || currentConfig.getValue().size() > 1;
}
-
-
- /** {@inheritDoc} */
@Override
public Attribute getValues(Entry entry, VirtualAttributeRule rule)
{
@@ -107,9 +91,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSearchable(VirtualAttributeRule rule,
SearchOperation searchOperation,
@@ -119,9 +100,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public void processSearch(VirtualAttributeRule rule,
SearchOperation searchOperation)
@@ -130,9 +108,6 @@
return;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
UserDefinedVirtualAttributeCfg configuration,
@@ -142,9 +117,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
UserDefinedVirtualAttributeCfg configuration)
@@ -155,4 +127,3 @@
return new ConfigChangeResult();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
index 618c327..f5fa0ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
@@ -62,8 +62,6 @@
/** The DN of the target group that will provide membership information. */
private DN targetGroupDN;
-
-
/**
* Creates a new, uninitialized virtual static group instance. This is
* intended for internal use only.
@@ -75,8 +73,6 @@
// No initialization is required here.
}
-
-
/**
* Creates a new virtual static group instance with the provided information.
*
@@ -96,9 +92,6 @@
this.targetGroupDN = targetGroupDN;
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeGroupImplementation(
VirtualStaticGroupImplementationCfg configuration)
@@ -107,17 +100,12 @@
// No additional initialization is required.
}
-
-
-
- /** {@inheritDoc} */
@Override
public VirtualStaticGroup newInstance(ServerContext serverContext, Entry groupEntry)
throws DirectoryException
{
ifNull(groupEntry);
-
// Get the target group DN attribute from the entry, if there is one.
DN targetDN = null;
AttributeType targetType = DirectoryServer.getAttributeType(ATTR_TARGET_GROUP_DN);
@@ -155,9 +143,6 @@
return new VirtualStaticGroup(groupEntry.getName(), targetDN);
}
-
-
- /** {@inheritDoc} */
@Override
public SearchFilter getGroupDefinitionFilter()
throws DirectoryException
@@ -168,9 +153,6 @@
OC_VIRTUAL_STATIC_GROUP + ")");
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isGroupDefinition(Entry entry)
{
@@ -183,26 +165,18 @@
return entry.hasObjectClass(virtualStaticGroupClass);
}
-
-
- /** {@inheritDoc} */
@Override
public DN getGroupDN()
{
return groupEntryDN;
}
-
-
- /** {@inheritDoc} */
@Override
public void setGroupDN(DN groupDN)
{
groupEntryDN = groupDN;
}
-
-
/**
* Retrieves the DN of the target group for this virtual static group.
*
@@ -213,9 +187,6 @@
return targetGroupDN;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean supportsNestedGroups()
{
@@ -223,9 +194,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public List<DN> getNestedGroupDNs()
{
@@ -233,9 +201,6 @@
return Collections.<DN>emptyList();
}
-
-
- /** {@inheritDoc} */
@Override
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -245,9 +210,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
@@ -257,9 +219,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMember(DN userDN, Set<DN> examinedGroups)
throws DirectoryException
@@ -287,9 +246,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
throws DirectoryException
@@ -317,9 +273,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public MemberList getMembers()
throws DirectoryException
@@ -342,9 +295,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public MemberList getMembers(DN baseDN, SearchScope scope,
SearchFilter filter)
@@ -368,16 +318,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public boolean mayAlterMemberList()
{
return false;
}
- /** {@inheritDoc} */
@Override
public void updateMembers(List<Modification> modifications)
throws UnsupportedOperationException, DirectoryException
@@ -387,7 +333,6 @@
throw new UnsupportedOperationException(message.toString());
}
- /** {@inheritDoc} */
@Override
public void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException
@@ -397,9 +342,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException
@@ -409,9 +351,6 @@
throw new UnsupportedOperationException(message.toString());
}
-
-
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
@@ -422,4 +361,3 @@
buffer.append(")");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 9627960..1de0806 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -54,7 +54,6 @@
super(newHashSet(OID_PROXIED_AUTH_V1, OID_PROXIED_AUTH_V2));
}
- /** {@inheritDoc} */
@Override
public void initializeExtendedOperationHandler(
WhoAmIExtendedOperationHandlerCfg config)
@@ -63,7 +62,6 @@
super.initializeExtendedOperationHandler(config);
}
- /** {@inheritDoc} */
@Override
public void processExtendedOperation(ExtendedOperation operation)
{
@@ -123,7 +121,6 @@
return;
}
-
// Get the authorization DN for the operation and add it to the response
// value.
String authzID;
@@ -143,14 +140,12 @@
operation.setResultCode(ResultCode.SUCCESS);
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationOID()
{
return OID_WHO_AM_I_REQUEST;
}
- /** {@inheritDoc} */
@Override
public String getExtendedOperationName()
{
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 e979639..c008fc9 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
@@ -70,9 +70,7 @@
abstract class AbstractTextAccessLogPublisher
<T extends AccessLogPublisherCfg> extends AccessLogPublisher<T>
{
- /**
- * Criteria based filter.
- */
+ /** Criteria based filter. */
static final class CriteriaFilter implements Filter
{
private final AccessLogFilteringCriteriaCfg cfg;
@@ -221,7 +219,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConnectLoggable(final ClientConnection connection)
{
@@ -230,7 +227,6 @@
- /** {@inheritDoc} */
@Override
public boolean isDisconnectLoggable(final ClientConnection connection)
{
@@ -241,7 +237,6 @@
- /** {@inheritDoc} */
@Override
public boolean isRequestLoggable(final Operation operation)
{
@@ -259,7 +254,6 @@
- /** {@inheritDoc} */
@Override
public boolean isResponseLoggable(final Operation operation)
{
@@ -627,9 +621,7 @@
- /**
- * Log message filter predicate.
- */
+ /** Log message filter predicate. */
private static interface Filter
{
/**
@@ -677,9 +669,7 @@
- /**
- * A filter which performs a logical OR over a set of sub-filters.
- */
+ /** A filter which performs a logical OR over a set of sub-filters. */
private static final class OrFilter implements Filter
{
private final Filter[] subFilters;
@@ -699,7 +689,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConnectLoggable(final ClientConnection connection)
{
@@ -716,7 +705,6 @@
- /** {@inheritDoc} */
@Override
public boolean isDisconnectLoggable(final ClientConnection connection)
{
@@ -733,7 +721,6 @@
- /** {@inheritDoc} */
@Override
public boolean isRequestLoggable(final Operation operation)
{
@@ -750,7 +737,6 @@
- /** {@inheritDoc} */
@Override
public boolean isResponseLoggable(final Operation operation)
{
@@ -806,7 +792,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConnectLoggable(final ClientConnection connection)
{
@@ -830,7 +815,6 @@
- /** {@inheritDoc} */
@Override
public boolean isDisconnectLoggable(final ClientConnection connection)
{
@@ -854,7 +838,6 @@
- /** {@inheritDoc} */
@Override
public boolean isRequestLoggable(final Operation operation)
{
@@ -878,7 +861,6 @@
- /** {@inheritDoc} */
@Override
public boolean isResponseLoggable(final Operation operation)
{
@@ -925,13 +907,10 @@
- /**
- * Configuration change listener.
- */
+ /** Configuration change listener. */
private final class ChangeListener implements
ConfigurationChangeListener<AccessLogPublisherCfg>
{
- /** {@inheritDoc} */
@Override
public final ConfigChangeResult applyConfigurationChange(
final AccessLogPublisherCfg configuration)
@@ -947,7 +926,6 @@
- /** {@inheritDoc} */
@Override
public final boolean isConfigurationChangeAcceptable(
final AccessLogPublisherCfg configuration,
@@ -959,16 +937,13 @@
- /**
- * Filter criteria configuration listener.
- */
+ /** Filter criteria configuration listener. */
private final class FilterListener implements
ConfigurationChangeListener<AccessLogFilteringCriteriaCfg>,
ConfigurationAddListener<AccessLogFilteringCriteriaCfg>,
ConfigurationDeleteListener<AccessLogFilteringCriteriaCfg>
{
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(
final AccessLogFilteringCriteriaCfg configuration)
@@ -981,7 +956,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
final AccessLogFilteringCriteriaCfg configuration)
@@ -993,7 +967,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
final AccessLogFilteringCriteriaCfg configuration)
@@ -1005,7 +978,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAddAcceptable(
final AccessLogFilteringCriteriaCfg configuration,
@@ -1016,7 +988,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
final AccessLogFilteringCriteriaCfg configuration,
@@ -1027,7 +998,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(
final AccessLogFilteringCriteriaCfg configuration,
@@ -1058,9 +1028,7 @@
- /**
- * The tracer object for the debug logger.
- */
+ /** The tracer object for the debug logger. */
protected static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private AccessLogPublisherCfg cfg;
private Filter filter;
@@ -1069,7 +1037,6 @@
- /** {@inheritDoc} */
@Override
public final void close()
{
@@ -1102,7 +1069,6 @@
- /** {@inheritDoc} */
@Override
public final DN getDN()
{
@@ -1124,9 +1090,7 @@
- /**
- * Release any resources owned by the sub-implementation.
- */
+ /** Release any resources owned by the sub-implementation. */
protected abstract void close0();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
index a989bb3..4a075a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogPublisher.java
@@ -43,7 +43,6 @@
implements LogPublisher<T>
{
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(T configuration,
List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
index 6322df3..2f506fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AccessLogger.java
@@ -44,16 +44,13 @@
/** The singleton instance of this class. */
private static final AccessLogger instance = new AccessLogger();
- /**
- * The constructor for this class.
- */
+ /** The constructor for this class. */
private AccessLogger()
{
super((Class) AccessLogPublisher.class,
ERR_CONFIG_LOGGER_INVALID_ACCESS_LOGGER_CLASS);
}
- /** {@inheritDoc} */
@Override
protected ClassPropertyDefinition getJavaClassPropertyDefinition()
{
@@ -61,7 +58,6 @@
.getJavaClassPropertyDefinition();
}
- /** {@inheritDoc} */
@Override
protected Collection<AccessLogPublisher<AccessLogPublisherCfg>> getLogPublishers()
{
@@ -490,7 +486,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final synchronized void addLogPublisher(
AccessLogPublisher<AccessLogPublisherCfg> publisher)
@@ -498,7 +493,6 @@
loggerStorage.addLogPublisher(publisher);
}
- /** {@inheritDoc} */
@Override
public final synchronized boolean removeLogPublisher(
AccessLogPublisher<AccessLogPublisherCfg> publisher)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java
index 934b02d..37ceb8d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ActionType.java
@@ -12,15 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
-
-
-/**
- * This enumeration defines the post rotation actions possible.
- */
+/** This enumeration defines the post rotation actions possible. */
enum ActionType
{
/**
@@ -28,34 +24,16 @@
* the gzip mechanism.
*/
GZIP_COMPRESS("GZIP COMPRESSION"),
-
-
-
/**
* The action type that indicates the rotated file should be compressed using
* the zip mechanism.
*/
ZIP_COMPRESS("ZIP COMPRESSION"),
-
-
-
- /**
- * The action type that indicates the rotated file should be encrypted.
- */
+ /** The action type that indicates the rotated file should be encrypted. */
ENCRYPT("ENCRYPT"),
-
-
-
- /**
- * The action type that indicates the rotated file should be digitally signed.
- */
+ /** The action type that indicates the rotated file should be digitally signed. */
SIGN("SIGN"),
-
-
-
- /**
- * An invalid rotation action type.
- */
+ /** An invalid rotation action type. */
INVALID("INVALID");
@@ -71,15 +49,9 @@
this.action = action;
}
-
- /**
- * Retrieves a string representation of this action.
- *
- * @return A string representation of this action.
- */
+ @Override
public String toString()
{
return action;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
index 962f4e6..cb97035 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -26,16 +26,11 @@
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
-/**
- * A Text Writer which writes log records asynchronously to
- * character-based stream.
- */
+/** A Text Writer which writes log records asynchronously to character-based stream. */
class AsynchronousTextWriter
implements ServerShutdownListener, TextWriter
{
- /**
- * The wrapped Text Writer.
- */
+ /** The wrapped Text Writer. */
private final TextWriter writer;
/** Queue to store unpublished records. */
@@ -169,14 +164,12 @@
}
}
- /** {@inheritDoc} */
@Override
public void flush()
{
writer.flush();
}
- /** {@inheritDoc} */
@Override
public long getBytesWritten()
{
@@ -193,14 +186,12 @@
return writer;
}
- /** {@inheritDoc} */
@Override
public String getShutdownListenerName()
{
return "AsynchronousTextWriter Thread " + name;
}
- /** {@inheritDoc} */
@Override
public void processServerShutdown(LocalizableMessage reason)
{
@@ -210,7 +201,6 @@
shutdown(false);
}
- /** {@inheritDoc} */
@Override
public void shutdown()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
index f58f889..dc2513c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
@@ -34,14 +34,10 @@
public class ConsoleDebugLogPublisher extends
DebugLogPublisher<DebugLogPublisherCfg>
{
- /**
- * The print stream where tracing will be sent.
- */
+ /** The print stream where tracing will be sent. */
private PrintStream err;
- /**
- * The format used for trace timestamps.
- */
+ /** The format used for trace timestamps. */
private DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss.SSS");
/**
@@ -54,14 +50,12 @@
this.err = err;
}
- /** {@inheritDoc} */
@Override
public void initializeLogPublisher(DebugLogPublisherCfg config, ServerContext serverContext)
throws ConfigException, InitializationException {
// This publisher is not configurable.
}
- /** {@inheritDoc} */
@Override
public void trace(TraceSettings settings,
String signature,
@@ -77,7 +71,6 @@
publish(msg, stack);
}
- /** {@inheritDoc} */
@Override
public void traceException(TraceSettings settings,
String signature,
@@ -98,7 +91,6 @@
publish(message, stack);
}
- /** {@inheritDoc} */
@Override
public void close()
{
@@ -134,7 +126,6 @@
err.print(buf);
}
- /** {@inheritDoc} */
@Override
public DN getDN()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
index 1dcb57b..1a579f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
@@ -50,10 +50,7 @@
- /**
- * Construct a default configuration where the global scope will
- * only log at the ERROR level.
- */
+ /** Construct a default configuration where the global scope will only log at the ERROR level. */
protected DebugLogPublisher()
{
classTraceSettings = null;
@@ -65,7 +62,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(T configuration,
List<LocalizableMessage> unacceptableReasons)
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 18c64ab..3977a12 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
@@ -62,16 +62,13 @@
/** The singleton instance of this class. */
static final DebugLogger instance = new DebugLogger();
- /**
- * The constructor for this class.
- */
+ /** The constructor for this class. */
private DebugLogger()
{
super((Class) DebugLogPublisher.class,
ERR_CONFIG_LOGGER_INVALID_DEBUG_LOGGER_CLASS);
}
- /** {@inheritDoc} */
@Override
protected ClassPropertyDefinition getJavaClassPropertyDefinition()
{
@@ -79,17 +76,13 @@
.getJavaClassPropertyDefinition();
}
- /** {@inheritDoc} */
@Override
protected Collection<DebugLogPublisher<DebugLogPublisherCfg>> getLogPublishers()
{
return loggerStorage.getLogPublishers();
}
- /**
- * Update all debug tracers with the settings in the registered
- * publishers.
- */
+ /** Update all debug tracers with the settings in the registered publishers. */
static void updateTracerSettings()
{
DebugLogPublisher<DebugLogPublisherCfg>[] publishers =
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
index f2b0906..dd52060 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -24,18 +24,12 @@
*/
class DebugStackTraceFormatter
{
- /**
- * The stack depth value to indicate the entire stack should be printed.
- */
+ /** The stack depth value to indicate the entire stack should be printed. */
public static final int COMPLETE_STACK = Integer.MAX_VALUE;
- /**
- * A nested frame filter that removes debug and trailing no OpenDS frames.
- */
+ /** A nested frame filter that removes debug and trailing no OpenDS frames. */
public static final FrameFilter SMART_FRAME_FILTER = new SmartFrameFilter();
- /**
- * A FrameFilter provides stack frame filtering used during formatting.
- */
+ /** A FrameFilter provides stack frame filtering used during formatting. */
interface FrameFilter
{
@@ -50,10 +44,7 @@
StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames);
}
- /**
- * A basic FrameFilter that filters out frames from the debug logging and non
- * OpenDS classes.
- */
+ /** A basic FrameFilter that filters out frames from the debug logging and non OpenDS classes. */
private static class SmartFrameFilter implements FrameFilter
{
@@ -78,6 +69,7 @@
* the frames to filter
* @return the filtered stack trace.
*/
+ @Override
public StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames)
{
StackTraceElement[] trimmedStack = null;
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 592c606..6592d1f 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
@@ -12,16 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
import java.io.File;
-/**
- * This class implements a post rotation action that encrypts
- * the log file.
- */
+/** This class implements a post rotation action that encrypts the log file. */
class EncryptAction implements PostRotationAction
{
@@ -62,12 +59,10 @@
* @return <CODE>true</CODE> if the encryption succeeded, or
* <CODE>false</CODE> if it did not.
*/
+ @Override
public boolean execute()
{
// NYI.
return true;
}
-
-
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
index 4fa9bf1..bdac212 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogPublisher.java
@@ -47,10 +47,7 @@
private static final LocalizedLogger logger = LocalizedLogger
.getLoggerForThisClass();
- /**
- * The hash map that will be used to define specific log severities for the
- * various categories.
- */
+ /** The hash map that will be used to define specific log severities for the various categories. */
protected Map<String, Set<Severity>> definedSeverities = new HashMap<>();
/**
@@ -59,7 +56,6 @@
*/
protected Set<Severity> defaultSeverities = new HashSet<>();
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(T configuration,
List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
index 1251462..0318584 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ErrorLogger.java
@@ -55,16 +55,13 @@
return instance;
}
- /**
- * The constructor for this class.
- */
+ /** The constructor for this class. */
private ErrorLogger()
{
super((Class) ErrorLogPublisher.class,
ERR_CONFIG_LOGGER_INVALID_ERROR_LOGGER_CLASS);
}
- /** {@inheritDoc} */
@Override
protected ClassPropertyDefinition getJavaClassPropertyDefinition()
{
@@ -72,7 +69,6 @@
.getJavaClassPropertyDefinition();
}
- /** {@inheritDoc} */
@Override
protected Collection<ErrorLogPublisher<ErrorLogPublisherCfg>> getLogPublishers()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java
index 87d767f..334015a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileComparator.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -39,6 +39,7 @@
* zero if there is no discernible difference between the last modify
* times.
*/
+ @Override
public int compare(File o1, File o2)
{
if(o1 == o2)
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 32008f4..ded109f 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
@@ -42,7 +42,7 @@
private int numFiles;
private FileCountLogRetentionPolicyCfg config;
- /** {@inheritDoc} */
+ @Override
public void initializeLogRetentionPolicy(
FileCountLogRetentionPolicyCfg config)
{
@@ -52,7 +52,7 @@
config.addFileCountChangeListener(this);
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
FileCountLogRetentionPolicyCfg config,
List<LocalizableMessage> unacceptableReasons)
@@ -61,7 +61,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
FileCountLogRetentionPolicyCfg config)
{
@@ -70,7 +70,7 @@
return new ConfigChangeResult();
}
- /** {@inheritDoc} */
+ @Override
public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
throws DirectoryException
{
@@ -97,7 +97,7 @@
return filesToDelete.toArray(new File[0]);
}
- /** {@inheritDoc} */
+ @Override
public String toString()
{
return "Free Number Retention Policy " + config.dn();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 4a0d85c..f26d248 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -26,9 +26,7 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.util.TimeThread;
-/**
- * This class implements a rotation policy based on fixed day/time of day.
- */
+/** This class implements a rotation policy based on fixed day/time of day. */
public class FixedTimeRotationPolicy implements
RotationPolicy<FixedTimeLogRotationPolicyCfg>,
ConfigurationChangeListener<FixedTimeLogRotationPolicyCfg>
@@ -38,7 +36,7 @@
/** The scheduled rotation times as ms offsets from the beginning of the day. */
private int[] rotationTimes;
- /** {@inheritDoc} */
+ @Override
public void initializeLogRotationPolicy(FixedTimeLogRotationPolicyCfg config)
{
rotationTimes = new int[config.getTimeOfDay().size()];
@@ -54,7 +52,7 @@
config.addFixedTimeChangeListener(this);
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
FixedTimeLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
{
@@ -62,7 +60,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
FixedTimeLogRotationPolicyCfg config)
{
@@ -81,7 +79,7 @@
return ccr;
}
- /** {@inheritDoc} */
+ @Override
public boolean rotateFile(RotatableLogFile writer)
{
Calendar lastRotationTime = writer.getLastRotationTime();
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 d169d89..203bd31 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
@@ -45,7 +45,6 @@
private long freeDiskSpace;
private FreeDiskSpaceLogRetentionPolicyCfg config;
- /** {@inheritDoc} */
@Override
public void initializeLogRetentionPolicy(
FreeDiskSpaceLogRetentionPolicyCfg config)
@@ -56,7 +55,6 @@
config.addFreeDiskSpaceChangeListener(this);
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
FreeDiskSpaceLogRetentionPolicyCfg config,
@@ -66,7 +64,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
FreeDiskSpaceLogRetentionPolicyCfg config)
@@ -77,7 +74,6 @@
return new ConfigChangeResult();
}
- /** {@inheritDoc} */
@Override
public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
throws DirectoryException
@@ -137,7 +133,6 @@
return filesToDelete.toArray(new File[filesToDelete.size()]);
}
- /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java
index 3ab95b4..b49d7a1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/GZIPAction.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -61,6 +61,7 @@
* @return <CODE>true</CODE> if the compression succeeded, or
* <CODE>false</CODE> if it did not.
*/
+ @Override
public boolean execute()
{
FileInputStream fis = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
index c616e07..f9da0c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
@@ -37,7 +37,6 @@
<T extends HTTPAccessLogPublisherCfg> implements LogPublisher<T>
{
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(T configuration,
List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
index 330ed77..fdd2726 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
@@ -38,16 +38,13 @@
/** The singleton instance of this class for configuration purposes. */
private static final HTTPAccessLogger instance = new HTTPAccessLogger();
- /**
- * The constructor for this class.
- */
+ /** The constructor for this class. */
private HTTPAccessLogger()
{
super((Class) HTTPAccessLogPublisher.class,
ERR_CONFIG_LOGGER_INVALID_HTTP_ACCESS_LOGGER_CLASS);
}
- /** {@inheritDoc} */
@Override
protected ClassPropertyDefinition getJavaClassPropertyDefinition()
{
@@ -55,7 +52,6 @@
.getJavaClassPropertyDefinition();
}
- /** {@inheritDoc} */
@Override
protected Collection<HTTPAccessLogPublisher<HTTPAccessLogPublisherCfg>> getLogPublishers()
{
@@ -97,7 +93,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final synchronized void addLogPublisher(
HTTPAccessLogPublisher<HTTPAccessLogPublisherCfg> publisher)
@@ -105,7 +100,6 @@
loggerStorage.addLogPublisher(publisher);
}
- /** {@inheritDoc} */
@Override
public final synchronized boolean removeLogPublisher(
HTTPAccessLogPublisher<HTTPAccessLogPublisherCfg> publisher)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java
index e51d838..5fbb17a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLogging.java
@@ -25,17 +25,13 @@
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
-/**
- * Utility class for java.util.logging support.
- */
+/** Utility class for java.util.logging support. */
public class JDKLogging
{
/** Root packages that contains all OpenDJ related classes. */
private static final String[] LOGGING_ROOTS = new String[] { "org.opends", "org.forgerock.opendj"};
- /**
- * Disable java.util.logging.
- */
+ /** Disable java.util.logging. */
public static void disableLogging()
{
LogManager.getLogManager().reset();
@@ -101,9 +97,7 @@
}
}
- /**
- * Custom handler to log to either stdout or stderr depending on the log level
- */
+ /** Custom handler to log to either stdout or stderr depending on the log level. */
private static final class OpenDJHandler extends Handler
{
private final PrintStream out;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java
index 9d92854..bf529a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/JDKLoggingFormater.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -44,7 +44,6 @@
}
};
- /** {@inheritDoc} */
@Override
public String format(LogRecord record)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java
index aec3bcf..9a83255 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LogFileFilter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -20,9 +20,7 @@
import java.io.FilenameFilter;
-/**
- * This class defines a filename filter that will be used for log files.
- */
+/** This class defines a filename filter that will be used for log files. */
class LogFileFilter implements FilenameFilter
{
private String prefix;
@@ -46,6 +44,7 @@
* @return <CODE>true</CODE> if the given filename matches the filter, or
* <CODE>false</CODE> if it does not.
*/
+ @Override
public boolean accept(File dir, String name)
{
if(new File(dir, name).isDirectory())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java
index 2750979..7329846 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MeteredStream.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -42,41 +42,21 @@
this.written = written;
}
- /**
- * Write the specified byte to the stream.
- *
- * @param b The value to be written to the stream.
- *
- * @exception IOException if the write failed.
- */
+ @Override
public void write(int b) throws IOException
{
out.write(b);
written++;
}
- /**
- * Write the specified buffer to the stream.
- *
- * @param buff The value to be written to the stream.
- *
- * @exception IOException if the write failed.
- */
+ @Override
public void write(byte buff[]) throws IOException
{
out.write(buff);
written += buff.length;
}
- /**
- * Write the specified buffer to the stream.
- *
- * @param buff The value to be written to the stream.
- * @param off The offset to write from.
- * @param len The length of the buffer to write.
- *
- * @exception IOException if the write failed.
- */
+ @Override
public void write(byte buff[], int off, int len) throws IOException
{
out.write(buff,off,len);
@@ -88,6 +68,7 @@
*
* @exception IOException if the flush failed.
*/
+ @Override
public void flush() throws IOException
{
out.flush();
@@ -98,6 +79,7 @@
*
* @exception IOException if the close failed.
*/
+ @Override
public void close() throws IOException
{
out.close();
@@ -113,4 +95,3 @@
return written;
}
}
-
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 1358b88..f9dad7c 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
@@ -229,9 +229,7 @@
this.retentionPolicies.add(policy);
}
- /**
- * Removes all the rotation policies currently enforced by this writer.
- */
+ /** Removes all the rotation policies currently enforced by this writer. */
public void removeAllRotationPolicies()
{
for(RotationPolicy policy : rotationPolicies)
@@ -249,9 +247,7 @@
this.rotationPolicies.clear();
}
- /**
- * Removes all retention policies being enforced by this writer.
- */
+ /** Removes all retention policies being enforced by this writer. */
public void removeAllRetentionPolicies()
{
this.retentionPolicies.clear();
@@ -334,7 +330,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SizeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -343,7 +338,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SizeLimitLogRotationPolicyCfg config)
@@ -377,9 +371,7 @@
private class RotaterThread extends DirectoryThread
{
MultifileTextWriter writer;
- /**
- * Create a new rotater thread.
- */
+ /** Create a new rotater thread. */
public RotaterThread(MultifileTextWriter writer)
{
super(name);
@@ -501,9 +493,7 @@
return stopRequested;
}
- /**
- * Shutdown the text writer.
- */
+ /** Shutdown the text writer. */
@Override
public void shutdown()
{
@@ -575,7 +565,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void flush()
{
@@ -642,7 +631,6 @@
this.actions = actions;
}
- /** {@inheritDoc} */
@Override
public long getBytesWritten()
{
@@ -671,7 +659,6 @@
return lastCleanCount;
}
- /** {@inheritDoc} */
@Override
public Calendar getLastRotationTime()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
index 5ff9bbf..b14de6f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationActionThread.java
@@ -55,9 +55,7 @@
this.configEntry = configEntry;
}
- /**
- * The run method of the thread.
- */
+ @Override
public void run()
{
try
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 1b87909..e51763c 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
@@ -45,7 +45,6 @@
private FileComparator comparator;
private SizeLimitLogRetentionPolicyCfg config;
- /** {@inheritDoc} */
@Override
public void initializeLogRetentionPolicy(
SizeLimitLogRetentionPolicyCfg config)
@@ -57,7 +56,6 @@
config.addSizeLimitChangeListener(this);
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
SizeLimitLogRetentionPolicyCfg config,
@@ -67,7 +65,6 @@
return true;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
SizeLimitLogRetentionPolicyCfg config)
@@ -78,7 +75,6 @@
return new ConfigChangeResult();
}
- /** {@inheritDoc} */
@Override
public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
throws DirectoryException
@@ -124,7 +120,6 @@
return filesToDelete;
}
- /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
index 206e0dd..d970548 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -26,9 +26,7 @@
import java.util.List;
-/**
- * This class implements a rotation policy based on the size of the file.
- */
+/** This class implements a rotation policy based on the size of the file. */
public class SizeBasedRotationPolicy implements
RotationPolicy<SizeLimitLogRotationPolicyCfg>,
ConfigurationChangeListener<SizeLimitLogRotationPolicyCfg>
@@ -37,7 +35,7 @@
SizeLimitLogRotationPolicyCfg currentConfig;
- /** {@inheritDoc} */
+ @Override
public void initializeLogRotationPolicy(SizeLimitLogRotationPolicyCfg config)
throws ConfigException, InitializationException
{
@@ -47,7 +45,7 @@
currentConfig = config;
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
SizeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
{
@@ -55,7 +53,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
SizeLimitLogRotationPolicyCfg config)
{
@@ -72,6 +70,7 @@
* @param writer The multi file text writer writing the log file.
* @return true if the file needs to be rotated, false otherwise.
*/
+ @Override
public boolean rotateFile(RotatableLogFile writer)
{
long fileSize = writer.getBytesWritten();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
index ce1341e..fd268ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -32,14 +32,10 @@
*/
void writeRecord(String record);
- /**
- * Flushes any buffered contents of the output stream.
- */
+ /** Flushes any buffered contents of the output stream. */
void flush();
- /**
- * Releases any resources held by the writer.
- */
+ /** Releases any resources held by the writer. */
void shutdown();
/**
@@ -49,75 +45,69 @@
*/
long getBytesWritten();
- /**
- * A TextWriter implementation which writes to standard out.
- */
+ /** A TextWriter implementation which writes to standard out. */
public static class STDOUT implements TextWriter
{
private MeteredStream stream = new MeteredStream(System.out, 0);
private PrintWriter writer = new PrintWriter(stream, true);
- /** {@inheritDoc} */
+ @Override
public void writeRecord(String record)
{
writer.println(record);
}
- /** {@inheritDoc} */
+ @Override
public void flush()
{
writer.flush();
}
- /** {@inheritDoc} */
+ @Override
public void shutdown()
{
// Should never close the system out stream.
}
- /** {@inheritDoc} */
+ @Override
public long getBytesWritten()
{
return stream.written;
}
}
- /**
- * A TextWriter implementation which writes to standard error.
- */
+ /** A TextWriter implementation which writes to standard error. */
public static class STDERR implements TextWriter
{
private MeteredStream stream = new MeteredStream(System.err, 0);
private PrintWriter writer = new PrintWriter(stream, true);
- /** {@inheritDoc} */
+ @Override
public void writeRecord(String record)
{
writer.println(record);
}
- /** {@inheritDoc} */
+ @Override
public void flush()
{
writer.flush();
}
- /** {@inheritDoc} */
+ @Override
public void shutdown()
{
// Should never close the system error stream.
}
- /** {@inheritDoc} */
+ @Override
public long getBytesWritten()
{
return stream.written;
}
}
- /**
- * A TextWriter implementation which writes to a given output stream.
- */
+ /** A TextWriter implementation which writes to a given output stream. */
public class STREAM implements TextWriter
{
private MeteredStream stream;
@@ -134,25 +124,25 @@
writer = new PrintWriter(stream, true);
}
- /** {@inheritDoc} */
+ @Override
public void writeRecord(String record)
{
writer.println(record);
}
- /** {@inheritDoc} */
+ @Override
public void flush()
{
writer.flush();
}
- /** {@inheritDoc} */
+ @Override
public void shutdown()
{
// Should never close the system error stream.
}
- /** {@inheritDoc} */
+ @Override
public long getBytesWritten()
{
return stream.written;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
index e6ad197..64a5db7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
@@ -51,7 +51,6 @@
this.writer = writer;
}
- /** {@inheritDoc} */
@Override
public void initializeLogPublisher(ErrorLogPublisherCfg config, ServerContext serverContext)
throws ConfigException, InitializationException
@@ -60,14 +59,12 @@
// configurable via the admin framework.
}
- /** {@inheritDoc} */
@Override
public void close()
{
writer.shutdown();
}
- /** {@inheritDoc} */
@Override
public void log(String category, Severity severity,
LocalizableMessage message, Throwable exception)
@@ -96,7 +93,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isEnabledFor(String category, Severity severity)
{
@@ -105,7 +101,6 @@
|| this.thread.getThreadGroup().equals(currentThread.getThreadGroup());
}
- /** {@inheritDoc} */
@Override
public DN getDN()
{
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 369738e..37a8215 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
@@ -33,7 +33,7 @@
{
private long timeInterval;
- /** {@inheritDoc} */
+ @Override
public void initializeLogRotationPolicy(TimeLimitLogRotationPolicyCfg config)
{
timeInterval = config.getRotationInterval();
@@ -41,7 +41,7 @@
config.addTimeLimitChangeListener(this);
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
TimeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
{
@@ -49,7 +49,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
TimeLimitLogRotationPolicyCfg config)
{
@@ -65,6 +65,7 @@
* @param writer The multi file text writer written the log file.
* @return true if the file should be rotated, false otherwise.
*/
+ @Override
public boolean rotateFile(RotatableLogFile writer)
{
long currInterval = TimeThread.getTime() -
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
index 9cb1982..3ef9a1b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -22,9 +22,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.TimeThread;
-/**
- * A file name policy that names files suffixed by the time it was created.
- */
+/** A file name policy that names files suffixed by the time it was created. */
public class TimeStampNaming implements FileNamingPolicy
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -47,6 +45,7 @@
* @return <CODE>true</CODE> if the given filename matches the filter, or
* <CODE>false</CODE> if it does not.
*/
+ @Override
public boolean accept(File dir, String name)
{
if(new File(dir, name).isDirectory())
@@ -107,25 +106,25 @@
this.filter = new TimeStampNamingFilter();
}
- /** {@inheritDoc} */
+ @Override
public File getInitialName()
{
return file;
}
- /** {@inheritDoc} */
+ @Override
public File getNextName()
{
return new File(file + "." + TimeThread.getGMTTime());
}
- /** {@inheritDoc} */
+ @Override
public FilenameFilter getFilenameFilter()
{
return filter;
}
- /** {@inheritDoc} */
+ @Override
public File[] listFiles()
{
File directory = file.getParentFile();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
index cf6d144..c0fc9f6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ZIPAction.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -25,10 +25,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
-/**
- * This class implements a post rotation action that compresses
- * the file using ZIP compression.
- */
+/** This class implements a post rotation action that compresses the file using ZIP compression. */
class ZIPAction implements PostRotationAction
{
@@ -61,6 +58,7 @@
* @return <CODE>true</CODE> if the compression was successful, or
* <CODE>false</CODE> if it was not.
*/
+ @Override
public boolean execute()
{
FileInputStream fis = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java
index 986a79d..978e884 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/slf4j/OpenDJLoggerFactory.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014-2015 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.loggers.slf4j;
@@ -21,11 +21,8 @@
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
-/**
- * Factory to retrieve an openDJ implementation of SLF4J Logger.
- */
+/** Factory to retrieve an openDJ implementation of SLF4J Logger. */
public final class OpenDJLoggerFactory implements ILoggerFactory {
-
private final ConcurrentMap<String, Logger> loggerMap;
/** Create the factory. */
@@ -33,7 +30,7 @@
loggerMap = new ConcurrentHashMap<>();
}
- /** {@inheritDoc} */
+ @Override
public Logger getLogger(String name) {
if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME)) {
name = "org.forgerock";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
index a88a393..7c4892a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -57,24 +57,16 @@
ConfigurationChangeListener<AttributeCleanupPluginCfg>
{
- /**
- * Plugin configuration.
- */
+ /** Plugin configuration. */
private AttributeCleanupPluginCfg config;
- /**
- * Debug tracer.
- */
+ /** Debug tracer. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * A table of attributes to be renamed.
- */
+ /** A table of attributes to be renamed. */
private Map<String, String> attributesToRename;
- /**
- * The set of attributes to be removed.
- */
+ /** The set of attributes to be removed. */
private Set<String> attributesToRemove;
/**
@@ -87,9 +79,7 @@
- /**
- * Default constructor.
- */
+ /** Default constructor. */
public AttributeCleanupPlugin()
{
super();
@@ -97,7 +87,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
final AttributeCleanupPluginCfg config)
@@ -134,7 +123,6 @@
- /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(
final PreParseAddOperation addOperation)
@@ -142,9 +130,7 @@
sharedLock.lock();
try
{
- /*
- * First strip the listed attributes, then rename the ones that remain.
- */
+ /* First strip the listed attributes, then rename the ones that remain. */
processInboundRemove(addOperation);
processInboundRename(addOperation);
@@ -158,7 +144,6 @@
- /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(
final PreParseModifyOperation modifyOperation)
@@ -166,9 +151,7 @@
sharedLock.lock();
try
{
- /*
- * First strip the listed attributes, then rename the ones that remain.
- */
+ /* First strip the listed attributes, then rename the ones that remain. */
processInboundRemove(modifyOperation);
processInboundRename(modifyOperation);
@@ -196,7 +179,6 @@
- /** {@inheritDoc} */
@Override
public void finalizePlugin()
{
@@ -218,16 +200,12 @@
- /** {@inheritDoc} */
@Override
public void initializePlugin(final Set<PluginType> pluginTypes,
final AttributeCleanupPluginCfg configuration) throws ConfigException,
InitializationException
{
- /*
- * The plugin should be invoked only for pre-parse ADD and MODIFY
- * operations.
- */
+ /* The plugin should be invoked only for pre-parse ADD and MODIFY operations. */
for (final PluginType t : pluginTypes)
{
switch (t)
@@ -257,7 +235,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(final PluginCfg configuration,
final List<LocalizableMessage> unacceptableReasons)
@@ -269,15 +246,11 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
final AttributeCleanupPluginCfg config, final List<LocalizableMessage> messages)
{
- /*
- * The admin framework will ensure that there are no duplicate attributes to
- * be removed.
- */
+ /* The admin framework will ensure that there are no duplicate attributes to be removed. */
boolean isValid = true;
/*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
index 29518ca..be02eb4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -74,13 +74,7 @@
this.csn = csn;
}
- /**
- * Writes this control's value to an ASN.1 writer. The value (if any) must
- * be written as an ASN1OctetString.
- *
- * @param writer The ASN.1 writer to use.
- * @throws IOException If a problem occurs while writing to the stream.
- */
+ @Override
protected void writeValue(ASN1Writer writer) throws IOException {
writer.writeOctetString(csn.toString());
}
@@ -107,7 +101,6 @@
super();
}
- /** {@inheritDoc} */
@Override
public final void initializePlugin(Set<PluginType> pluginTypes,
ChangeNumberControlPluginCfg configuration)
@@ -160,17 +153,12 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public final void finalizePlugin()
{
currentConfig.removeChangeNumberControlChangeListener(this);
}
-
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationAddOperation addOperation)
@@ -181,7 +169,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationDeleteOperation deleteOperation)
@@ -192,7 +179,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -203,7 +189,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
@@ -214,9 +199,6 @@
return PluginResult.PostOperation.continueOperationProcessing();
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -226,9 +208,7 @@
return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
ChangeNumberControlPluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -258,7 +238,7 @@
return configAcceptable;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
ChangeNumberControlPluginCfg configuration)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index bf1e680..c207273 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -151,7 +151,6 @@
- /** {@inheritDoc} */
@Override
public final void initializePlugin(Set<PluginType> pluginTypes,
LDAPAttributeDescriptionListPluginCfg configuration)
@@ -183,7 +182,6 @@
- /** {@inheritDoc} */
@Override
public final void finalizePlugin()
{
@@ -192,7 +190,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreParse doPreParse(
PreParseSearchOperation searchOperation)
@@ -204,7 +201,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -216,7 +212,7 @@
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
LDAPAttributeDescriptionListPluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -244,7 +240,7 @@
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
LDAPAttributeDescriptionListPluginCfg
configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
index 266c2ec..7279244 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
@@ -89,7 +89,6 @@
- /** {@inheritDoc} */
@Override
public final void initializePlugin(Set<PluginType> pluginTypes,
LastModPluginCfg configuration)
@@ -117,7 +116,6 @@
- /** {@inheritDoc} */
@Override
public final void finalizePlugin()
{
@@ -126,7 +124,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -159,7 +156,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -218,7 +214,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -255,7 +250,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -266,7 +260,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(LastModPluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -297,7 +290,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
LastModPluginCfg configuration)
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 9e86496..8d473ed 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
@@ -150,10 +150,7 @@
*/
public static final String DELETE_DNS="deleteDNs";
- /**
- * The buffered reader that is used to read the log file by the background
- * thread.
- */
+ /** The buffered reader that is used to read the log file by the background thread. */
private BufferedReader reader;
/**
@@ -343,8 +340,7 @@
unacceptableReasons.add(ERR_PLUGIN_REFERENT_ATTR_NOT_LISTED.get(attr));
}
- /* Verify the filter.
- */
+ /* Verify the filter. */
try
{
SearchFilter.createFilterFromString(filtStr);
@@ -524,7 +520,6 @@
* @param log Set to <code>true</code> if the map should be written to a log
* file so that the background thread can process the changes at
* a later time.
- *
*/
private void processModifyDN(Map<DN, DN> modDNMap, boolean log)
{
@@ -563,7 +558,6 @@
* @param log Set to <code>true</code> if the DN should be written to a log
* file so that the background thread can process the change at
* a later time.
- *
*/
private void processDelete(Set<DN> deleteDNset, boolean log)
{
@@ -589,7 +583,6 @@
* @param oldEntryDN The entry DN before the modify DN operation.
*
* @param newEntryDN The entry DN after the modify DN operation.
- *
*/
private void processModifyDN(DN oldEntryDN, DN newEntryDN)
{
@@ -605,7 +598,6 @@
* are used.
*
* @return A set of DNs to use in the reference searches.
- *
*/
private Set<DN> getBaseDNsToSearch()
{
@@ -628,7 +620,6 @@
*
* @param newEntryDN The new entry DN that needs to be added. May be null
* if the original operation was a delete.
- *
*/
private void searchBaseDN(DN baseDN, DN oldEntryDN, DN newEntryDN)
{
@@ -674,7 +665,6 @@
* @param baseDN The DN to base the search at.
*
* @param modifyDNmap The map containing the modify DN old and new entry DNs.
- *
*/
private void doBaseDN(DN baseDN, Map<DN,DN> modifyDNmap)
{
@@ -692,7 +682,6 @@
* @param baseDN The DN to base the search at.
*
* @param deleteDNset The set containing the delete DNs.
- *
*/
private void doBaseDN(DN baseDN, Set<DN> deleteDNset)
{
@@ -715,7 +704,6 @@
*
* @param newEntryDN The new entry DN to add a reference to, if it is not
* null.
- *
*/
private void deleteAddAttributesEntry(Entry e, DN oldEntryDN, DN newEntryDN)
{
@@ -760,7 +748,6 @@
* @param logFileName The name of the file to use, may be absolute.
*
* @throws ConfigException If a new file cannot be created if needed.
- *
*/
private void setUpLogFile(String logFileName)
throws ConfigException
@@ -787,7 +774,6 @@
* with.
*
* @throws IOException If a new file writer cannot be created.
- *
*/
private void setupWriter() throws IOException {
writer=new BufferedWriter(new FileWriter(logFile, true));
@@ -799,7 +785,6 @@
* update records with.
*
* @throws IOException If a new file reader cannot be created.
- *
*/
private void setupReader() throws IOException {
reader=new BufferedReader(new FileReader(logFile));
@@ -813,7 +798,6 @@
* modify DN operation.
*
* @param modDNmap The map of old entry and new entry DNs.
- *
*/
private void writeLog(Map<DN,DN> modDNmap) {
synchronized(logFile)
@@ -841,7 +825,6 @@
* These entry DNs are related to a delete operation.
*
* @param deletedEntryDN The DN of the deleted entry.
- *
*/
private void writeLog(Set<DN> deleteDNset) {
synchronized(logFile)
@@ -872,7 +855,6 @@
* integrity processing as though the operation was just processed. After
* all of the records in log file have been processed, the log file is
* cleared so that new records can be added.
- *
*/
private void processLog() {
synchronized(logFile) {
@@ -914,7 +896,6 @@
* Return the listener name.
*
* @return The name of the listener.
- *
*/
@Override
public String getShutdownListenerName() {
@@ -935,7 +916,6 @@
* to be interrupted so it can read the stop request variable and exit.
*
* @param reason The reason message for the shutdown.
- *
*/
@Override
public void processServerShutdown(LocalizableMessage reason)
@@ -970,7 +950,6 @@
/**
* Sets up background processing of referential integrity by creating a
* new background thread to process updates.
- *
*/
private void setUpBackGroundProcessing() {
if(backGroundThread == null) {
@@ -986,7 +965,6 @@
* Used by the background thread to determine if it should exit.
*
* @return Returns <code>true</code> if the background thread should exit.
- *
*/
private boolean isShuttingDown() {
return stopRequested;
@@ -996,21 +974,16 @@
* The background referential integrity processing thread. Wakes up after
* sleeping for a configurable interval and checks the log file for update
* records.
- *
*/
private class BackGroundThread extends DirectoryThread {
- /**
- * Constructor for the background thread.
- */
+ /** Constructor for the background thread. */
public
BackGroundThread() {
super(name);
}
- /**
- * Run method for the background thread.
- */
+ /** Run method for the background thread. */
@Override
public void run() {
while(!isShuttingDown()) {
@@ -1030,8 +1003,7 @@
public PluginResult.PreOperation doPreOperation(
PreOperationModifyOperation modifyOperation)
{
- /* Skip the integrity checks if the enforcing is not enabled
- */
+ /* Skip the integrity checks if the enforcing is not enabled */
if (!currentConfiguration.isCheckReferences())
{
@@ -1041,9 +1013,7 @@
final List<Modification> mods = modifyOperation.getModifications();
final Entry entry = modifyOperation.getModifiedEntry();
- /* Make sure the entry belongs to one of the configured naming
- * contexts.
- */
+ /* Make sure the entry belongs to one of the configured naming contexts. */
DN entryDN = entry.getName();
DN entryBaseDN = getEntryBaseDN(entryDN);
if (entryBaseDN == null)
@@ -1055,8 +1025,7 @@
{
final ModificationType modType = mod.getModificationType();
- /* Process only ADD and REPLACE modification types.
- */
+ /* Process only ADD and REPLACE modification types. */
if (modType != ModificationType.ADD
&& modType != ModificationType.REPLACE)
{
@@ -1075,8 +1044,7 @@
}
}
- /* At this point, everything is fine.
- */
+ /* At this point, everything is fine. */
return PluginResult.PreOperation.continueOperationProcessing();
}
@@ -1198,9 +1166,7 @@
*/
private DN getEntryBaseDN(DN dn)
{
- /* Verify that the entry belongs to one of the configured naming
- * contexts.
- */
+ /* Verify that the entry belongs to one of the configured naming contexts. */
DN namingContext = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
index 2828199..701eeba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -128,9 +128,7 @@
- /**
- * Creates a new MD4 message digest algorithm.
- */
+ /** Creates a new MD4 message digest algorithm. */
MD4MessageDigest()
{
super("MD4");
@@ -139,7 +137,6 @@
- /** {@inheritDoc} */
@Override
public byte[] engineDigest()
{
@@ -155,7 +152,6 @@
- /** {@inheritDoc} */
@Override
public void engineReset()
{
@@ -179,7 +175,6 @@
- /** {@inheritDoc} */
@Override
public void engineUpdate(final byte input)
{
@@ -194,7 +189,6 @@
- /** {@inheritDoc} */
@Override
public void engineUpdate(final byte[] in, int inOff, int len)
{
@@ -387,9 +381,7 @@
- /*
- * rotate int x left n bits.
- */
+ /** Rotate int x left n bits. */
private int rotateLeft(final int x, final int n)
{
return (x << n) | (x >>> 32 - n);
@@ -408,9 +400,7 @@
- /**
- * Plugin configuration object.
- */
+ /** Plugin configuration object. */
private SambaPasswordPluginCfg config;
/** The name of the Samba LanMan password attribute. */
@@ -608,9 +598,7 @@
- /**
- * Default constructor.
- */
+ /** Default constructor. */
public SambaPasswordPlugin()
{
super();
@@ -618,7 +606,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
final SambaPasswordPluginCfg newConfig)
@@ -632,23 +619,17 @@
- /** {@inheritDoc} */
@Override
public PluginResult.PostOperation doPostOperation(
final PostOperationExtendedOperation extendedOperation)
{
- /*
- * If the operation is not Password Modify Extended Operation then skip this
- * operation.
- */
+ /* If the operation is not Password Modify Extended Operation then skip this operation. */
if (!extendedOperation.getRequestOID().equals(PWMOD_EXTOP_OID))
{
return PluginResult.PostOperation.continueOperationProcessing();
}
- /*
- * If the operation has not been successful then ignore the operation.
- */
+ /* If the operation has not been successful then ignore the operation. */
if (extendedOperation.getResultCode() != ResultCode.SUCCESS)
{
return PluginResult.PostOperation.continueOperationProcessing();
@@ -765,7 +746,6 @@
- /** {@inheritDoc} */
@Override
public PluginResult.PreOperation doPreOperation(
final PreOperationModifyOperation modifyOperation)
@@ -842,7 +822,6 @@
- /** {@inheritDoc} */
@Override
public void initializePlugin(final Set<PluginType> pluginTypes,
final SambaPasswordPluginCfg configuration) throws ConfigException,
@@ -888,7 +867,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
final SambaPasswordPluginCfg newConfig, final List<LocalizableMessage> messages)
@@ -1011,9 +989,7 @@
}
}
- /**
- * Timestamp provider interface. Intended primarily for testing purposes.
- */
+ /** Timestamp provider interface. Intended primarily for testing purposes. */
static interface TimeStampProvider
{
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
index 32ed0ac..4f43d0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -89,9 +89,7 @@
implements ConfigurationChangeListener<UniqueAttributePluginCfg>,
AlertGenerator
{
- /**
- * The debug log tracer that will be used for this plugin.
- */
+ /** The debug log tracer that will be used for this plugin. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -121,7 +119,6 @@
- /** {@inheritDoc} */
@Override
public final void initializePlugin(Set<PluginType> pluginTypes,
UniqueAttributePluginCfg configuration)
@@ -176,7 +173,6 @@
- /** {@inheritDoc} */
@Override
public final void finalizePlugin()
{
@@ -186,7 +182,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -223,7 +218,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -341,7 +335,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public final PluginResult.PreOperation doPreOperation(
PreOperationModifyDNOperation modifyDNOperation)
@@ -412,7 +405,6 @@
- /** {@inheritDoc} */
@Override
public final void doPostSynchronization(
PostSynchronizationModifyOperation modifyOperation)
@@ -470,7 +462,6 @@
- /** {@inheritDoc} */
@Override
public final void doPostSynchronization(
PostSynchronizationModifyDNOperation modifyDNOperation)
@@ -650,7 +641,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(PluginCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -661,7 +651,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
UniqueAttributePluginCfg configuration,
@@ -716,7 +705,6 @@
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
UniqueAttributePluginCfg newConfiguration)
@@ -727,7 +715,6 @@
- /** {@inheritDoc} */
@Override
public DN getComponentEntryDN()
{
@@ -736,7 +723,6 @@
- /** {@inheritDoc} */
@Override
public String getClassName()
{
@@ -745,7 +731,6 @@
- /** {@inheritDoc} */
@Override
public Map<String,String> getAlerts()
{
@@ -761,7 +746,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationAddOperation addOperation)
@@ -794,7 +778,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -852,7 +835,6 @@
- /** {@inheritDoc} */
@Override
public final PluginResult.PostOperation
doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
index 8fb394c..70129c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.plugins.profiler;
@@ -216,6 +216,7 @@
*
* @return The hash code for this profile stack.
*/
+ @Override
public int hashCode()
{
if (numFrames != 0)
@@ -236,6 +237,7 @@
* with the same set of class names, method names, and line numbers
* as this profile stack, or <CODE>false</CODE> if not.
*/
+ @Override
public boolean equals(Object o)
{
if (o == null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
index 814baa4..e8ecda8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.plugins.profiler;
@@ -92,6 +92,7 @@
* Runs in a loop, periodically capturing a list of the stack traces for all
* active threads.
*/
+ @Override
public void run()
{
captureThread = currentThread();
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 cfe8729..771f625 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
@@ -111,7 +111,6 @@
- /** {@inheritDoc} */
@Override
public void initializeConnectionHandler(ServerContext serverContext, LDIFConnectionHandlerCfg
configuration)
@@ -152,7 +151,6 @@
- /** {@inheritDoc} */
@Override
public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
{
@@ -184,7 +182,6 @@
- /** {@inheritDoc} */
@Override
public String getConnectionHandlerName()
{
@@ -193,7 +190,6 @@
- /** {@inheritDoc} */
@Override
public String getProtocol()
{
@@ -202,7 +198,6 @@
- /** {@inheritDoc} */
@Override
public Collection<HostPort> getListeners()
{
@@ -212,7 +207,6 @@
- /** {@inheritDoc} */
@Override
public Collection<ClientConnection> getClientConnections()
{
@@ -222,7 +216,6 @@
- /** {@inheritDoc} */
@Override
public void run()
{
@@ -539,7 +532,6 @@
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer)
{
@@ -552,7 +544,6 @@
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -563,7 +554,7 @@
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
LDIFConnectionHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -574,7 +565,7 @@
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
LDIFConnectionHandlerCfg configuration)
{
@@ -588,7 +579,6 @@
- /** {@inheritDoc} */
@Override
public DN getComponentEntryDN()
{
@@ -597,7 +587,7 @@
- /** {@inheritDoc} */
+ @Override
public String getClassName()
{
return LDIFConnectionHandler.class.getName();
@@ -605,7 +595,7 @@
- /** {@inheritDoc} */
+ @Override
public LinkedHashMap<String,String> getAlerts()
{
LinkedHashMap<String,String> alerts = new LinkedHashMap<>();
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 df5831d..f4af019 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.jmx;
@@ -41,17 +41,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The SSL socket factory associated with the connector.
- */
+ /** The SSL socket factory associated with the connector. */
private SSLSocketFactory sslSocketFactory;
- /**
- * Indicate if we required the client authentication via SSL.
- */
+ /** Indicate if we required the client authentication via SSL. */
private final boolean needClientCertificate;
-
/**
* Constructs a new <code>DirectoryRMIServerSocketFactory</code> with the
* specified SSL socket configuration.
@@ -100,6 +95,7 @@
* @throws IOException
* if the socket cannot be created
*/
+ @Override
public ServerSocket createServerSocket(int port) throws IOException
{
return new ServerSocket(port, 0, InetAddress.getByName("0.0.0.0"))
@@ -124,7 +120,6 @@
return sslSocket;
}
};
-
}
/**
@@ -147,6 +142,7 @@
* @return <code>true</code> if this object is the same as the obj
* argument <code>false</code> otherwise.
*/
+ @Override
public boolean equals(Object obj)
{
if (obj == this)
@@ -180,6 +176,7 @@
* @return a hash code value for this
* <code>CacaoRMIServerSocketFactory</code>.
*/
+ @Override
public int hashCode()
{
return getClass().hashCode()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
index 005515d..b9ae11b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
@@ -12,21 +12,18 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.protocols.jmx;
import java.security.Principal;
-/**
- * Represents a Ldap authentication ID used for JMX connection authentication.
- */
+/** Represents a Ldap authentication ID used for JMX connection authentication. */
public class OpendsJmxPrincipal implements Principal
{
/** The authentication ID. */
private String authID;
-
/**
* Create a new OpendsJmxPrincipal object.
*
@@ -38,29 +35,25 @@
this.authID = authID;
}
-
- /** {@inheritDoc} */
@Override
public boolean equals(Object another)
{
return authID.equals(another);
}
- /** {@inheritDoc} */
@Override
public int hashCode()
{
return authID.hashCode() ;
}
- /** {@inheritDoc} */
@Override
public String toString()
{
return authID;
}
- /** {@inheritDoc} */
+ @Override
public String getName()
{
return authID;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
index 0f7e97c..90db0e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ASN1ByteChannelReader.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -70,10 +70,7 @@
/** The wrapped ASN.1 reader. */
private final ASN1Reader reader;
- /**
- * The NIO ByteStringBuilder that stores any immediate data read off the
- * channel.
- */
+ /** The NIO ByteStringBuilder that stores any immediate data read off the channel. */
private final ByteBuffer byteBuffer;
/**
@@ -104,7 +101,6 @@
*/
private final class CombinedBufferInputStream extends InputStream
{
- /** {@inheritDoc} */
@Override
public int available()
{
@@ -234,7 +230,6 @@
return bytesCopied;
}
- /** {@inheritDoc} */
@Override
public long skip(long length)
{
@@ -374,171 +369,143 @@
return saveBufferReader.remaining() != 0 || byteBuffer.remaining() != 0;
}
- /** {@inheritDoc} */
@Override
public int peekLength() throws IOException {
return reader.peekLength();
}
- /** {@inheritDoc} */
@Override
public byte peekType() throws IOException {
return reader.peekType();
}
- /** {@inheritDoc} */
@Override
public boolean readBoolean() throws IOException {
return reader.readBoolean();
}
- /** {@inheritDoc} */
@Override
public boolean readBoolean(byte type) throws IOException {
return reader.readBoolean(type);
}
- /** {@inheritDoc} */
@Override
public void readEndExplicitTag() throws IOException {
reader.readEndExplicitTag();
}
- /** {@inheritDoc} */
@Override
public void readEndSequence() throws IOException {
reader.readEndSequence();
}
- /** {@inheritDoc} */
@Override
public void readEndSet() throws IOException {
reader.readEndSet();
}
- /** {@inheritDoc} */
@Override
public int readEnumerated() throws IOException {
return reader.readEnumerated();
}
- /** {@inheritDoc} */
@Override
public int readEnumerated(byte type) throws IOException {
return reader.readEnumerated(type);
}
- /** {@inheritDoc} */
@Override
public long readInteger() throws IOException {
return reader.readInteger();
}
- /** {@inheritDoc} */
@Override
public long readInteger(byte type) throws IOException {
return reader.readInteger(type);
}
- /** {@inheritDoc} */
@Override
public void readNull() throws IOException {
reader.readNull();
}
- /** {@inheritDoc} */
@Override
public void readNull(byte type) throws IOException {
reader.readNull(type);
}
- /** {@inheritDoc} */
@Override
public ByteString readOctetString() throws IOException {
return reader.readOctetString();
}
- /** {@inheritDoc} */
@Override
public ByteString readOctetString(byte type) throws IOException {
return readOctetString(type);
}
- /** {@inheritDoc} */
@Override
public ByteStringBuilder readOctetString(ByteStringBuilder buffer) throws IOException {
return reader.readOctetString(buffer);
}
- /** {@inheritDoc} */
@Override
public ByteStringBuilder readOctetString(byte type, ByteStringBuilder builder) throws IOException {
return readOctetString(type, builder);
}
- /** {@inheritDoc} */
@Override
public String readOctetStringAsString() throws IOException {
return reader.readOctetStringAsString();
}
- /** {@inheritDoc} */
@Override
public String readOctetStringAsString(byte type) throws IOException {
return readOctetStringAsString(type);
}
- /** {@inheritDoc} */
@Override
public void readStartExplicitTag() throws IOException {
reader.readStartExplicitTag();
}
- /** {@inheritDoc} */
@Override
public void readStartExplicitTag(byte type) throws IOException {
reader.readStartExplicitTag(type);
}
- /** {@inheritDoc} */
@Override
public void readStartSequence() throws IOException {
reader.readStartSequence();
}
- /** {@inheritDoc} */
@Override
public void readStartSequence(byte type) throws IOException {
reader.readStartSequence(type);
}
- /** {@inheritDoc} */
@Override
public void readStartSet() throws IOException {
reader.readStartSet();
}
- /** {@inheritDoc} */
@Override
public void readStartSet(byte type) throws IOException {
reader.readStartSet(type);
}
- /** {@inheritDoc} */
@Override
public void close() throws IOException {
reader.close();
byteChannel.close();
}
- /** {@inheritDoc} */
@Override
public ASN1Reader skipElement() throws IOException {
reader.skipElement();
return this;
}
- /** {@inheritDoc} */
@Override
public ASN1Reader skipElement(byte type) throws DecodeException, IOException
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
index ed473f4..1619e91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -72,6 +72,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_ABANDON_REQUEST;
@@ -84,6 +85,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Abandon Request";
@@ -95,6 +97,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeInteger(OP_TYPE_ABANDON_REQUEST, idToAbandon);
@@ -107,6 +110,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("AbandonRequest(idToAbandon=");
@@ -124,6 +128,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
index 666dd5f..56c9571 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -177,6 +177,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_BIND_REQUEST;
@@ -189,6 +190,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Bind Request";
@@ -200,6 +202,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_BIND_REQUEST);
@@ -231,6 +234,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("BindRequest(version=").append(protocolVersion);
@@ -267,6 +271,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index fda3fc9..bfd37e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -106,6 +106,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_COMPARE_REQUEST;
@@ -118,6 +119,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Compare Request";
@@ -129,6 +131,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_COMPARE_REQUEST);
@@ -150,6 +153,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("CompareRequest(dn=");
@@ -171,6 +175,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 4440128..64569b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -70,6 +70,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeOctetString(OP_TYPE_DELETE_REQUEST, dn);
@@ -82,6 +83,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_DELETE_REQUEST;
@@ -94,6 +96,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Delete Request";
@@ -106,6 +109,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("DeleteRequest(dn=");
@@ -123,6 +127,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
index b044dd0..1ed4e9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
@@ -38,7 +38,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/** The matched DN for this response. */
private DN matchedDN;
/** The result code for this response. */
@@ -48,8 +47,6 @@
/** The error message for this response. */
private LocalizableMessage errorMessage;
-
-
/**
* Creates a new delete response protocol op with the provided result code.
*
@@ -60,8 +57,6 @@
this.resultCode = resultCode;
}
-
-
/**
* Creates a new delete response protocol op with the provided result code and
* error message.
@@ -75,8 +70,6 @@
this.errorMessage = errorMessage;
}
-
-
/**
* Creates a new delete response protocol op with the provided information.
*
@@ -94,8 +87,6 @@
this.referralURLs = referralURLs;
}
-
-
/**
* Retrieves the result code for this response.
*
@@ -106,8 +97,6 @@
return resultCode;
}
-
-
/**
* Retrieves the error message for this response.
*
@@ -119,8 +108,6 @@
return errorMessage;
}
-
-
/**
* Retrieves the matched DN for this response.
*
@@ -132,8 +119,6 @@
return matchedDN;
}
-
-
/**
* Retrieves the set of referral URLs for this response.
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index b1a7c4a..9d31a5b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -103,6 +103,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_EXTENDED_REQUEST;
@@ -115,6 +116,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Extended Request";
@@ -126,6 +128,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_EXTENDED_REQUEST);
@@ -147,6 +150,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("ExtendedRequest(oid=");
@@ -171,6 +175,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index c0058af..6cc5f75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -104,6 +104,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_INTERMEDIATE_RESPONSE;
@@ -116,6 +117,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Intermediate Response";
@@ -127,6 +129,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_INTERMEDIATE_RESPONSE);
@@ -152,6 +155,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("IntermediateResponse(oid=").append(oid);
@@ -172,6 +176,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
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 6f019b0..02380e0 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
@@ -71,7 +71,6 @@
public final class LDAPClientConnection extends ClientConnection implements
TLSCapableConnection
{
-
/**
* A runnable whose task is to close down all IO related channels
* associated with a client connection after a small delay.
@@ -92,9 +91,6 @@
this.socketChannel = socketChannel;
}
-
-
- /** {@inheritDoc} */
@Override
public void run()
{
@@ -163,8 +159,6 @@
clientChannel.close();
}
-
-
@Override
public int write(ByteBuffer byteBuffer) throws IOException
{
@@ -288,13 +282,10 @@
}
}
-
/** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Thread local ASN1Writer and buffer.
- */
+ /** Thread local ASN1Writer and buffer. */
private static final class ASN1WriterHolder implements Closeable
{
private final ASN1Writer writer;
@@ -308,7 +299,6 @@
this.writer = ASN1.getWriter(buffer, maxBufferSize);
}
- /** {@inheritDoc} */
@Override
public void close() throws IOException
{
@@ -317,13 +307,10 @@
}
}
- /**
- * Cached ASN1 writer: a thread can only write to one connection at a time.
- */
+ /** Cached ASN1 writer: a thread can only write to one connection at a time. */
private static final ThreadLocal<ASN1WriterHolder> ASN1_WRITER_CACHE =
new ThreadLocal<ASN1WriterHolder>()
{
- /** {@inheritDoc} */
@Override
protected ASN1WriterHolder initialValue()
{
@@ -345,10 +332,8 @@
/** The time that the last operation was completed. */
private final AtomicLong lastCompletionTime;
-
/** The next operation ID that should be used for this connection. */
private final AtomicLong nextOperationID;
-
/** The selector that may be used for write operations. */
private final AtomicReference<Selector> writeSelector;
@@ -381,55 +366,35 @@
/** The port on the client from which this connection originated. */
private final int clientPort;
-
- /**
- * The LDAP version that the client is using to communicate with the server.
- */
+ /** The LDAP version that the client is using to communicate with the server. */
private int ldapVersion;
-
/** The port on the server to which this client has connected. */
private final int serverPort;
/** The reference to the connection handler that accepted this connection. */
private final LDAPConnectionHandler connectionHandler;
-
/** The statistics tracker associated with this client connection. */
private final LDAPStatistics statTracker;
private boolean useNanoTime;
-
/** The connection ID assigned to this connection. */
private final long connectionID;
- /**
- * The lock used to provide threadsafe access to the set of operations in
- * progress.
- */
+ /** The lock used to provide threadsafe access to the set of operations in progress. */
private final Object opsInProgressLock;
/** The socket channel with which this client connection is associated. */
private final SocketChannel clientChannel;
-
/** The byte channel used for blocking writes with time out. */
private final ByteChannel timeoutClientChannel;
/** The string representation of the address of the client. */
private final String clientAddress;
-
- /**
- * The name of the protocol that the client is using to communicate with the
- * server.
- */
+ /** The name of the protocol that the client is using to communicate with the server. */
private final String protocol;
-
- /**
- * The string representation of the address of the server to which the client
- * has connected.
- */
+ /** The string representation of the address of the server to which the client has connected. */
private final String serverAddress;
-
-
private ASN1ByteChannelReader asn1Reader;
private final int bufferSize;
private final RedirectingByteChannel saslChannel;
@@ -439,7 +404,6 @@
private volatile ConnectionSecurityProvider saslPendingProvider;
private volatile ConnectionSecurityProvider tlsPendingProvider;
-
/**
* Creates a new LDAP client connection with the provided information.
*
@@ -511,8 +475,6 @@
return connectionID;
}
-
-
/**
* Retrieves the connection handler that accepted this client
* connection.
@@ -526,8 +488,6 @@
return connectionHandler;
}
-
-
/**
* Retrieves the socket channel that can be used to communicate with
* the client.
@@ -541,8 +501,6 @@
return clientChannel;
}
-
-
/**
* Retrieves the protocol that the client is using to communicate with
* the Directory Server.
@@ -556,8 +514,6 @@
return protocol;
}
-
-
/**
* Retrieves a string representation of the address of the client.
*
@@ -569,8 +525,6 @@
return clientAddress;
}
-
-
/**
* Retrieves the port number for this connection on the client system.
*
@@ -582,8 +536,6 @@
return clientPort;
}
-
-
/**
* Retrieves a string representation of the address on the server to
* which the client connected.
@@ -597,8 +549,6 @@
return serverAddress;
}
-
-
/**
* Retrieves the port number for this connection on the server system.
*
@@ -610,8 +560,6 @@
return serverPort;
}
-
-
/**
* Retrieves the <CODE>java.net.InetAddress</CODE> associated with the
* remote client system.
@@ -626,8 +574,6 @@
return clientChannel.socket().getInetAddress();
}
-
-
/**
* Retrieves the <CODE>java.net.InetAddress</CODE> for the Directory
* Server system to which the client has established the connection.
@@ -643,7 +589,6 @@
return clientChannel.socket().getLocalAddress();
}
- /** {@inheritDoc} */
@Override
public boolean isConnectionValid()
{
@@ -677,8 +622,6 @@
return secure;
}
-
-
/**
* Sends a response to the client based on the information in the
* provided operation.
@@ -721,8 +664,6 @@
}
}
-
-
/**
* Retrieves an LDAPMessage containing a response generated from the
* provided operation.
@@ -860,8 +801,6 @@
controls);
}
-
-
/**
* Sends the provided search result entry to the client.
*
@@ -881,8 +820,6 @@
protocolOp, searchEntry.getControls()));
}
-
-
/**
* Sends the provided search result reference to the client.
*
@@ -919,8 +856,6 @@
return true;
}
-
-
/**
* Sends the provided intermediate response message to the client.
*
@@ -949,8 +884,6 @@
return connectionValid;
}
-
-
/**
* Sends the provided LDAP message to the client.
*
@@ -999,8 +932,6 @@
}
}
-
-
/**
* Closes the connection to the client, optionally sending it a
* message indicating the reason for the closure. Note that the
@@ -1154,8 +1085,6 @@
}
}
-
-
/**
* Retrieves the set of operations in progress for this client
* connection. This list must not be altered by any caller.
@@ -1169,8 +1098,6 @@
return operationsInProgress.values();
}
-
-
/**
* Retrieves the operation in progress with the specified message ID.
*
@@ -1185,8 +1112,6 @@
return operationsInProgress.get(messageID);
}
-
-
/**
* Adds the provided operation to the set of operations in progress
* for this client connection.
@@ -1261,8 +1186,6 @@
}
}
-
-
/**
* Removes the provided operation from the set of operations in
* progress for this client connection. Note that this does not make
@@ -1296,8 +1219,6 @@
return true;
}
-
-
/**
* Attempts to cancel the specified operation.
*
@@ -1337,8 +1258,6 @@
}
}
-
-
/**
* Attempts to cancel all operations in progress on this connection.
*
@@ -1392,8 +1311,6 @@
}
}
-
-
/**
* Attempts to cancel all operations in progress on this connection
* except the operation with the specified message ID.
@@ -1462,9 +1379,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public Selector getWriteSelector()
{
@@ -1489,17 +1403,12 @@
return selector;
}
-
-
- /** {@inheritDoc} */
@Override
public long getMaxBlockedWriteTimeLimit()
{
return connectionHandler.getMaxBlockedWriteTimeLimit();
}
-
-
/**
* Returns the total number of operations initiated on this
* connection.
@@ -1512,8 +1421,6 @@
return operationsPerformed.get();
}
-
-
/**
* Returns the ASN1 reader for this connection.
*
@@ -1524,8 +1431,6 @@
return asn1Reader;
}
-
-
/**
* Process data read.
*
@@ -1578,8 +1483,6 @@
}
}
-
-
/**
* Processes the provided LDAP message read from the client and takes
* whatever action is appropriate. For most requests, this will
@@ -1707,8 +1610,6 @@
}
}
-
-
/**
* Processes the provided LDAP message as an abandon request.
*
@@ -1756,8 +1657,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as an add request.
*
@@ -1813,8 +1712,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a bind request.
*
@@ -1944,8 +1841,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a compare request.
*
@@ -2003,8 +1898,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a delete request.
*
@@ -2061,8 +1954,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as an extended request.
*
@@ -2125,8 +2016,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a modify request.
*
@@ -2183,8 +2072,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a modify DN request.
*
@@ -2242,8 +2129,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as a search request.
*
@@ -2303,8 +2188,6 @@
return connectionValid;
}
-
-
/**
* Processes the provided LDAP message as an unbind request.
*
@@ -2331,9 +2214,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public String getMonitorSummary()
{
@@ -2395,8 +2275,6 @@
return buffer.toString();
}
-
-
/**
* Appends a string representation of this client connection to the
* provided buffer.
@@ -2417,9 +2295,6 @@
buffer.append(serverPort);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean prepareTLS(LocalizableMessageBuilder unavailableReason)
{
@@ -2452,8 +2327,6 @@
return true;
}
-
-
/**
* Retrieves the length of time in milliseconds that this client
* connection has been idle. <BR>
@@ -2480,8 +2353,6 @@
}
}
-
-
/**
* Set the connection provider that is not in use yet. Used in TLS
* negotiation when a clear response is needed before the connection
@@ -2495,8 +2366,6 @@
tlsPendingProvider = provider;
}
-
-
/**
* Set the connection provider that is not in use. Used in SASL
* negotiation when a clear response is needed before the connection
@@ -2510,11 +2379,7 @@
saslPendingProvider = provider;
}
-
-
- /**
- * Enable the provider that is inactive.
- */
+ /** Enable the provider that is inactive. */
private void enableTLS()
{
tlsActiveProvider = tlsPendingProvider;
@@ -2522,8 +2387,6 @@
tlsPendingProvider = null;
}
-
-
/**
* Set the security provider to the specified provider.
*
@@ -2536,11 +2399,7 @@
tlsChannel.redirect(sslProvider);
}
-
-
- /**
- * Enable the SASL provider that is currently inactive or pending.
- */
+ /** Enable the SASL provider that is currently inactive or pending. */
private void enableSASL()
{
saslActiveProvider = saslPendingProvider;
@@ -2548,8 +2407,6 @@
saslPendingProvider = null;
}
-
-
/**
* Return the certificate chain array associated with a connection.
*
@@ -2568,8 +2425,6 @@
return new Certificate[0];
}
-
-
/**
* Retrieves the TLS redirecting byte channel used in a LDAP client
* connection.
@@ -2581,9 +2436,6 @@
return this.tlsChannel;
}
-
-
- /** {@inheritDoc} */
@Override
public int getSSF()
{
@@ -2592,9 +2444,6 @@
return Math.max(tlsSSF, saslSSF);
}
-
-
- /** {@inheritDoc} */
@Override
public void finishBind()
{
@@ -2606,9 +2455,6 @@
super.finishBind();
}
-
-
- /** {@inheritDoc} */
@Override
public void finishStartTLS()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 94bb43f..a48be4c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -74,10 +74,7 @@
ConfigurationChangeListener<LDAPConnectionHandlerCfg>,
ServerShutdownListener, AlertGenerator
{
-
- /**
- * Task run periodically by the connection finalizer.
- */
+ /** Task run periodically by the connection finalizer. */
private final class ConnectionFinalizerRunnable implements Runnable
{
@Override
@@ -99,14 +96,11 @@
connectionFinalizerActiveJobQueue = connectionFinalizerPendingJobQueue;
connectionFinalizerPendingJobQueue = tmp;
}
-
}
}
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * Default friendly name for the LDAP connection handler.
- */
+ /** Default friendly name for the LDAP connection handler. */
private static final String DEFAULT_FRIENDLY_NAME = "LDAP Connection Handler";
/** SSL instance name used in context creation. */
@@ -132,15 +126,10 @@
/** Indicates whether to allow the reuse address socket option. */
private boolean allowReuseAddress;
- /**
- * The number of request handlers that should be used for this connection
- * handler.
- */
+ /** The number of request handlers that should be used for this connection handler. */
private int numRequestHandlers;
- /**
- * Indicates whether the Directory Server is in the process of shutting down.
- */
+ /** Indicates whether the Directory Server is in the process of shutting down. */
private volatile boolean shutdownRequested;
/* Internal LDAP connection handler state */
@@ -151,9 +140,7 @@
/** The set of clients that are explicitly allowed access to the server. */
private Collection<AddressMask> allowedClients;
- /**
- * The set of clients that have been explicitly denied access to the server.
- */
+ /** The set of clients that have been explicitly denied access to the server. */
private Collection<AddressMask> deniedClients;
/**
@@ -165,19 +152,13 @@
/** The set of listeners for this connection handler. */
private List<HostPort> listeners;
- /**
- * The set of request handlers that are associated with this connection
- * handler.
- */
+ /** The set of request handlers that are associated with this connection handler. */
private LDAPRequestHandler[] requestHandlers;
/** The set of statistics collected for this connection handler. */
private LDAPStatistics statTracker;
- /**
- * The client connection monitor provider associated with this connection
- * handler.
- */
+ /** The client connection monitor provider associated with this connection handler. */
private ClientConnectionMonitorProvider connMonitor;
/**
@@ -227,8 +208,6 @@
private List<Runnable> connectionFinalizerActiveJobQueue;
private List<Runnable> connectionFinalizerPendingJobQueue;
-
-
/**
* Creates a new instance of this LDAP connection handler. It must be
* initialized before it may be used.
@@ -238,8 +217,6 @@
this(new WorkQueueStrategy(), null); // Use name from configuration.
}
-
-
/**
* Creates a new instance of this LDAP connection handler, using a queueing
* strategy. It must be initialized before it may be used.
@@ -262,8 +239,6 @@
// initializeConnectionHandler method.
}
-
-
/**
* Indicates whether this connection handler should allow interaction with
* LDAPv2 clients.
@@ -276,8 +251,6 @@
return currentConfig.isAllowLDAPV2();
}
-
-
/**
* Indicates whether this connection handler should allow the use of the
* StartTLS extended operation.
@@ -290,9 +263,6 @@
return currentConfig.isAllowStartTLS() && !currentConfig.isUseSSL();
}
-
-
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
LDAPConnectionHandlerCfg config)
@@ -300,7 +270,6 @@
final ConfigChangeResult ccr = new ConfigChangeResult();
// Note that the following properties cannot be modified:
- //
// * listen port and addresses
// * use ssl
// * ssl policy
@@ -363,8 +332,6 @@
}
}
-
- /** {@inheritDoc} */
@Override
public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
{
@@ -411,8 +378,6 @@
}
}
-
-
/**
* Retrieves information about the set of alerts that this generator may
* produce. The map returned should be between the notification type for a
@@ -436,8 +401,6 @@
return alerts;
}
-
-
/**
* Retrieves the fully-qualified name of the Java class for this alert
* generator implementation.
@@ -451,8 +414,6 @@
return LDAPConnectionHandler.class.getName();
}
-
-
/**
* Retrieves the set of active client connections that have been established
* through this connection handler.
@@ -471,8 +432,6 @@
return connectionList;
}
-
-
/**
* Retrieves the DN of the configuration entry with which this alert generator
* is associated.
@@ -486,18 +445,12 @@
return currentConfig.dn();
}
-
-
- /** {@inheritDoc} */
@Override
public String getConnectionHandlerName()
{
return handlerName;
}
-
-
- /** {@inheritDoc} */
@Override
public Collection<String> getEnabledSSLCipherSuites()
{
@@ -509,9 +462,6 @@
return super.getEnabledSSLCipherSuites();
}
-
-
- /** {@inheritDoc} */
@Override
public Collection<String> getEnabledSSLProtocols()
{
@@ -523,17 +473,12 @@
return super.getEnabledSSLProtocols();
}
-
-
- /** {@inheritDoc} */
@Override
public Collection<HostPort> getListeners()
{
return listeners;
}
-
-
/**
* Retrieves the port on which this connection handler is listening for client
* connections.
@@ -546,8 +491,6 @@
return listenPort;
}
-
-
/**
* Retrieves the maximum length of time in milliseconds that attempts to write
* to LDAP client connections should be allowed to block.
@@ -561,8 +504,6 @@
return currentConfig.getMaxBlockedWriteTimeLimit();
}
-
-
/**
* Retrieves the maximum ASN.1 element value length that will be allowed by
* this connection handler.
@@ -575,8 +516,6 @@
return (int) currentConfig.getMaxRequestSize();
}
-
-
/**
* Retrieves the size in bytes of the LDAP response message write buffer
* defined for this connection handler.
@@ -588,26 +527,18 @@
return (int) currentConfig.getBufferSize();
}
-
-
- /** {@inheritDoc} */
@Override
public String getProtocol()
{
return protocol;
}
-
-
- /** {@inheritDoc} */
@Override
public String getShutdownListenerName()
{
return handlerName;
}
-
-
/**
* Retrieves the SSL client authentication policy for this connection handler.
*
@@ -618,8 +549,6 @@
return sslClientAuthPolicy;
}
-
-
/**
* Retrieves the set of statistics maintained by this connection handler.
*
@@ -630,9 +559,6 @@
return statTracker;
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeConnectionHandler(ServerContext serverContext, LDAPConnectionHandlerCfg config)
throws ConfigException, InitializationException
@@ -755,9 +681,6 @@
config.addLDAPChangeListener(this);
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -837,8 +760,6 @@
return null;
}
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
LDAPConnectionHandlerCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -846,8 +767,6 @@
return isConfigurationAcceptable(config, unacceptableReasons);
}
-
-
/**
* Indicates whether this connection handler should maintain usage statistics.
*
@@ -859,9 +778,6 @@
return currentConfig.isKeepStats();
}
-
-
- /** {@inheritDoc} */
@Override
public void processServerShutdown(LocalizableMessage reason)
{
@@ -885,9 +801,6 @@
}
}
-
-
- /** {@inheritDoc} */
@Override
public void start()
{
@@ -911,8 +824,6 @@
}
}
-
-
/**
* Operates in a loop, accepting new connections and ensuring that requests on
* those connections are handled properly.
@@ -1036,7 +947,6 @@
listening = false;
enabled = false;
}
-
}
catch (Exception e)
{
@@ -1059,7 +969,6 @@
}
}
-
/**
* Serves the incoming connections.
*
@@ -1103,7 +1012,6 @@
}
}
-
/**
* Open channels for each listen address and register them against this
* ConnectionHandler's {@link Selector}.
@@ -1138,8 +1046,6 @@
return numRegistered;
}
-
-
private void acceptConnection(SocketChannel clientChannel)
throws DirectoryException
{
@@ -1234,8 +1140,6 @@
}
}
-
-
/**
* Appends a string representation of this connection handler to the provided
* buffer.
@@ -1249,8 +1153,6 @@
buffer.append(handlerName);
}
-
-
/**
* Indicates whether this connection handler should use SSL to communicate
* with clients.
@@ -1263,8 +1165,6 @@
return currentConfig.isUseSSL();
}
-
-
/**
* Cleans up the contents of the selector, closing any server socket channels
* that might be associated with it. Any connections that might have been
@@ -1301,8 +1201,6 @@
}
}
-
-
/**
* Get the queueing strategy.
*
@@ -1313,8 +1211,6 @@
return queueingStrategy;
}
-
-
/**
* Creates a TLS Byte Channel instance using the specified socket channel.
*
@@ -1331,8 +1227,6 @@
return new TLSByteChannel(channel, sslEngine);
}
-
-
private SSLEngine createSSLEngine(LDAPConnectionHandlerCfg config,
SSLContext sslContext) throws DirectoryException
{
@@ -1382,8 +1276,6 @@
}
}
-
-
private void disableAndWarnIfUseSSL(LDAPConnectionHandlerCfg config)
{
if (config.isUseSSL())
@@ -1483,5 +1375,4 @@
}
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java
index 6ea1da5..25987b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConstants.java
@@ -12,507 +12,186 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
-
-
-/**
- * This class defines a number of constants used in the LDAP protocol.
- */
+/** This class defines a number of constants used in the LDAP protocol. */
public class LDAPConstants
{
- /**
- * The protocol op type for bind requests.
- */
+ /** The protocol op type for bind requests. */
public static final byte OP_TYPE_BIND_REQUEST = 0x60;
-
-
-
- /**
- * The protocol op type for bind responses.
- */
+ /** The protocol op type for bind responses. */
public static final byte OP_TYPE_BIND_RESPONSE = 0x61;
-
-
-
- /**
- * The protocol op type for unbind requests.
- */
+ /** The protocol op type for unbind requests. */
public static final byte OP_TYPE_UNBIND_REQUEST = 0x42;
-
-
-
- /**
- * The protocol op type for search requests.
- */
+ /** The protocol op type for search requests. */
public static final byte OP_TYPE_SEARCH_REQUEST = 0x63;
-
-
-
- /**
- * The protocol op type for search result entries.
- */
+ /** The protocol op type for search result entries. */
public static final byte OP_TYPE_SEARCH_RESULT_ENTRY = 0x64;
-
-
-
- /**
- * The protocol op type for search result references.
- */
+ /** The protocol op type for search result references. */
public static final byte OP_TYPE_SEARCH_RESULT_REFERENCE = 0x73;
-
-
-
- /**
- * The protocol op type for search result done elements.
- */
+ /** The protocol op type for search result done elements. */
public static final byte OP_TYPE_SEARCH_RESULT_DONE = 0x65;
-
-
-
- /**
- * The protocol op type for modify requests.
- */
+ /** The protocol op type for modify requests. */
public static final byte OP_TYPE_MODIFY_REQUEST = 0x66;
-
-
-
- /**
- * The protocol op type for modify responses.
- */
+ /** The protocol op type for modify responses. */
public static final byte OP_TYPE_MODIFY_RESPONSE = 0x67;
-
-
-
- /**
- * The protocol op type for add requests.
- */
+ /** The protocol op type for add requests. */
public static final byte OP_TYPE_ADD_REQUEST = 0x68;
-
-
-
- /**
- * The protocol op type for add responses.
- */
+ /** The protocol op type for add responses. */
public static final byte OP_TYPE_ADD_RESPONSE = 0x69;
-
-
-
- /**
- * The protocol op type for delete requests.
- */
+ /** The protocol op type for delete requests. */
public static final byte OP_TYPE_DELETE_REQUEST = 0x4A;
-
-
-
- /**
- * The protocol op type for delete responses.
- */
+ /** The protocol op type for delete responses. */
public static final byte OP_TYPE_DELETE_RESPONSE = 0x6B;
-
-
-
- /**
- * The protocol op type for modify DN requests.
- */
+ /** The protocol op type for modify DN requests. */
public static final byte OP_TYPE_MODIFY_DN_REQUEST = 0x6C;
-
-
-
- /**
- * The protocol op type for modify DN responses.
- */
+ /** The protocol op type for modify DN responses. */
public static final byte OP_TYPE_MODIFY_DN_RESPONSE = 0x6D;
-
-
-
- /**
- * The protocol op type for compare requests.
- */
+ /** The protocol op type for compare requests. */
public static final byte OP_TYPE_COMPARE_REQUEST = 0x6E;
-
-
-
- /**
- * The protocol op type for compare responses.
- */
+ /** The protocol op type for compare responses. */
public static final byte OP_TYPE_COMPARE_RESPONSE = 0x6F;
-
-
-
- /**
- * The protocol op type for abandon requests.
- */
+ /** The protocol op type for abandon requests. */
public static final byte OP_TYPE_ABANDON_REQUEST = 0x50;
-
-
-
- /**
- * The protocol op type for extended requests.
- */
+ /** The protocol op type for extended requests. */
public static final byte OP_TYPE_EXTENDED_REQUEST = 0x77;
-
-
-
- /**
- * The protocol op type for extended responses.
- */
+ /** The protocol op type for extended responses. */
public static final byte OP_TYPE_EXTENDED_RESPONSE = 0x78;
-
-
-
- /**
- * The protocol op type for intermediate responses.
- */
+ /** The protocol op type for intermediate responses. */
public static final byte OP_TYPE_INTERMEDIATE_RESPONSE = 0x79;
-
-
- /**
- * The BER type to use for encoding the sequence of controls in an LDAP
- * message.
- */
+ /** The BER type to use for encoding the sequence of controls in an LDAP message. */
public static final byte TYPE_CONTROL_SEQUENCE = (byte) 0xA0;
-
-
-
- /**
- * The BER type to use for encoding the sequence of referral URLs in an
- * LDAPResult element.
- */
+ /** The BER type to use for encoding the sequence of referral URLs in an LDAPResult element. */
public static final byte TYPE_REFERRAL_SEQUENCE = (byte) 0xA3;
-
-
-
/**
* The BER type to use for the AuthenticationChoice element in a bind request
* when simple authentication is to be used.
*/
public static final byte TYPE_AUTHENTICATION_SIMPLE = (byte) 0x80;
-
-
-
/**
* The BER type to use for the AuthenticationChoice element in a bind request
* when SASL authentication is to be used.
*/
public static final byte TYPE_AUTHENTICATION_SASL = (byte) 0xA3;
-
-
-
- /**
- * The BER type to use for the server SASL credentials in a bind response.
- */
+ /** The BER type to use for the server SASL credentials in a bind response. */
public static final byte TYPE_SERVER_SASL_CREDENTIALS = (byte) 0x87;
-
-
-
- /**
- * The BER type to use for AND filter components.
- */
+ /** The BER type to use for AND filter components. */
public static final byte TYPE_FILTER_AND = (byte) 0xA0;
-
-
-
- /**
- * The BER type to use for OR filter components.
- */
+ /** The BER type to use for OR filter components. */
public static final byte TYPE_FILTER_OR = (byte) 0xA1;
-
-
-
- /**
- * The BER type to use for NOT filter components.
- */
+ /** The BER type to use for NOT filter components. */
public static final byte TYPE_FILTER_NOT = (byte) 0xA2;
-
-
-
- /**
- * The BER type to use for equality filter components.
- */
+ /** The BER type to use for equality filter components. */
public static final byte TYPE_FILTER_EQUALITY = (byte) 0xA3;
-
-
-
- /**
- * The BER type to use for substring filter components.
- */
+ /** The BER type to use for substring filter components. */
public static final byte TYPE_FILTER_SUBSTRING = (byte) 0xA4;
-
-
-
- /**
- * The BER type to use for greater than or equal to filter components.
- */
+ /** The BER type to use for greater than or equal to filter components. */
public static final byte TYPE_FILTER_GREATER_OR_EQUAL = (byte) 0xA5;
-
-
-
- /**
- * The BER type to use for less than or equal to filter components.
- */
+ /** The BER type to use for less than or equal to filter components. */
public static final byte TYPE_FILTER_LESS_OR_EQUAL = (byte) 0xA6;
-
-
-
- /**
- * The BER type to use for presence filter components.
- */
+ /** The BER type to use for presence filter components. */
public static final byte TYPE_FILTER_PRESENCE = (byte) 0x87;
-
-
-
- /**
- * The BER type to use for approximate filter components.
- */
+ /** The BER type to use for approximate filter components. */
public static final byte TYPE_FILTER_APPROXIMATE = (byte) 0xA8;
-
-
-
- /**
- * The BER type to use for extensible matching filter components.
- */
+ /** The BER type to use for extensible matching filter components. */
public static final byte TYPE_FILTER_EXTENSIBLE_MATCH = (byte) 0xA9;
-
-
-
- /**
- * The BER type to use for the subInitial component of a substring filter.
- */
+ /** The BER type to use for the subInitial component of a substring filter. */
public static final byte TYPE_SUBINITIAL = (byte) 0x80;
-
-
-
- /**
- * The BER type to use for the subAny component(s) of a substring filter.
- */
+ /** The BER type to use for the subAny component(s) of a substring filter. */
public static final byte TYPE_SUBANY = (byte) 0x81;
-
-
-
- /**
- * The BER type to use for the subFinal components of a substring filter.
- */
+ /** The BER type to use for the subFinal components of a substring filter. */
public static final byte TYPE_SUBFINAL = (byte) 0x82;
-
-
-
- /**
- * The BER type to use for the matching rule OID in a matching rule assertion.
- */
+ /** The BER type to use for the matching rule OID in a matching rule assertion. */
public static final byte TYPE_MATCHING_RULE_ID = (byte) 0x81;
-
-
-
- /**
- * The BER type to use for the attribute type in a matching rule assertion.
- */
+ /** The BER type to use for the attribute type in a matching rule assertion. */
public static final byte TYPE_MATCHING_RULE_TYPE = (byte) 0x82;
-
-
-
- /**
- * The BER type to use for the assertion value in a matching rule assertion.
- */
+ /** The BER type to use for the assertion value in a matching rule assertion. */
public static final byte TYPE_MATCHING_RULE_VALUE = (byte) 0x83;
-
-
-
- /**
- * The BER type to use for the DN attributes flag in a matching rule
- * assertion.
- */
+ /** The BER type to use for the DN attributes flag in a matching rule assertion. */
public static final byte TYPE_MATCHING_RULE_DN_ATTRIBUTES = (byte) 0x84;
-
-
-
- /**
- * The BER type to use for the newSuperior component of a modify DN request.
- */
+ /** The BER type to use for the newSuperior component of a modify DN request. */
public static final byte TYPE_MODIFY_DN_NEW_SUPERIOR = (byte) 0x80;
-
-
-
- /**
- * The BER type to use for the OID of an extended request.
- */
+ /** The BER type to use for the OID of an extended request. */
public static final byte TYPE_EXTENDED_REQUEST_OID = (byte) 0x80;
-
-
-
- /**
- * The BER type to use for the value of an extended request.
- */
+ /** The BER type to use for the value of an extended request. */
public static final byte TYPE_EXTENDED_REQUEST_VALUE = (byte) 0x81;
-
-
-
- /**
- * The BER type to use for the OID of an extended response.
- */
+ /** The BER type to use for the OID of an extended response. */
public static final byte TYPE_EXTENDED_RESPONSE_OID = (byte) 0x8A;
-
-
-
- /**
- * The BER type to use for the value of an extended response.
- */
+ /** The BER type to use for the value of an extended response. */
public static final byte TYPE_EXTENDED_RESPONSE_VALUE = (byte) 0x8B;
-
-
-
- /**
- * The BER type to use for the OID of an intermediate response message.
- */
+ /** The BER type to use for the OID of an intermediate response message. */
public static final byte TYPE_INTERMEDIATE_RESPONSE_OID = (byte) 0x80;
-
-
-
- /**
- * The BER type to use for the value of an intermediate response message.
- */
+ /** The BER type to use for the value of an intermediate response message. */
public static final byte TYPE_INTERMEDIATE_RESPONSE_VALUE = (byte) 0x81;
-
-
- /**
- * The enumerated type for modify operations that add one or more values for
- * an attribute.
- */
+ /** The enumerated type for modify operations that add one or more values for an attribute. */
public static final int MOD_TYPE_ADD = 0;
-
-
-
- /**
- * The enumerated type for modify operations that remove one or more values
- * from an attribute.
- */
+ /** The enumerated type for modify operations that remove one or more values from an attribute. */
public static final int MOD_TYPE_DELETE = 1;
-
-
-
- /**
- * The enumerated type for modify operations that replace the set of values
- * for an attribute.
- */
+ /** The enumerated type for modify operations that replace the set of values for an attribute. */
public static final int MOD_TYPE_REPLACE = 2;
-
-
-
- /**
- * The enumerated type for modify operations that increment the value for an
- * attribute.
- */
+ /** The enumerated type for modify operations that increment the value for an attribute. */
public static final int MOD_TYPE_INCREMENT = 3;
-
-
- /**
- * The search scope value that will be used for base-level searches.
- */
+ /** The search scope value that will be used for base-level searches. */
public static final int SCOPE_BASE_OBJECT = 0;
-
-
-
- /**
- * The search scope value that will be used for single-level searches.
- */
+ /** The search scope value that will be used for single-level searches. */
public static final int SCOPE_SINGLE_LEVEL = 1;
-
-
-
- /**
- * The search scope value that will be used for whole subtree searches.
- */
+ /** The search scope value that will be used for whole subtree searches. */
public static final int SCOPE_WHOLE_SUBTREE = 2;
-
-
-
- /**
- * The search scope value that will be used for subordinate subtree searches.
- */
+ /** The search scope value that will be used for subordinate subtree searches. */
public static final int SCOPE_SUBORDINATE_SUBTREE = 3;
-
-
/**
* The alias dereferencing policy value that will be used for cases in which
* aliases are never to be dereferenced.
*/
public static final int DEREF_NEVER = 0;
-
-
-
/**
* The alias dereferencing policy value that will be used for cases in which
* any aliases encountered while finding matching entries should be
* dereferenced.
*/
public static final int DEREF_IN_SEARCHING = 1;
-
-
-
/**
* The alias dereferencing policy value that will be used for cases in which
* the search base should be dereferenced if it is an alias.
*/
public static final int DEREF_FINDING_BASE = 2;
-
-
-
/**
* The alias dereferencing policy value that will be used for cases in which
* all aliases encountered should be dereferenced.
*/
public static final int DEREF_ALWAYS = 3;
-
-
- /**
- * The OID for the Kerberos V GSSAPI mechanism.
- */
+ /** The OID for the Kerberos V GSSAPI mechanism. */
public static final String OID_GSSAPI_KERBEROS_V = "1.2.840.113554.1.2.2";
-
-
- /**
- * The OID for the LDAP notice of disconnection extended operation.
- */
+ /** The OID for the LDAP notice of disconnection extended operation. */
public static final String OID_NOTICE_OF_DISCONNECTION =
"1.3.6.1.4.1.1466.20036";
-
-
/**
* The ASN.1 element decoding state that indicates that the next byte read
* should be the BER type for a new element.
*/
public static final int ELEMENT_READ_STATE_NEED_TYPE = 0;
-
-
-
/**
* The ASN.1 element decoding state that indicates that the next byte read
* should be the first byte for the element length.
*/
public static final int ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE = 1;
-
-
-
/**
* The ASN.1 element decoding state that indicates that the next byte read
* should be additional bytes of a multi-byte length.
*/
public static final int ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES = 2;
-
-
-
/**
* The ASN.1 element decoding state that indicates that the next byte read
* should be applied to the value of the element.
*/
public static final int ELEMENT_READ_STATE_NEED_VALUE_BYTES = 3;
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
index d085a6f..964032f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
@@ -12,11 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
-
import java.io.IOException;
import org.forgerock.opendj.io.*;
@@ -25,7 +24,6 @@
import static org.opends.server.util.ServerConstants.*;
-
/**
* This class defines the data structures and methods to use when interacting
* with a generic LDAP control.
@@ -35,8 +33,6 @@
/** The control value. */
private ByteString value;
-
-
/**
* Creates a new LDAP control with the specified OID. It will not be
* critical, and will not have a value.
@@ -48,8 +44,6 @@
super(oid, false);
}
-
-
/**
* Creates a new LDAP control with the specified OID and criticality. It will
* not have a value.
@@ -63,8 +57,6 @@
super(oid, isCritical);
}
-
-
/**
* Creates a new LDAP control with the specified OID, criticality, and value.
*
@@ -79,7 +71,6 @@
this.value = value;
}
-
/**
* Retrieves the value for this control.
*
@@ -91,8 +82,6 @@
return value;
}
-
-
/**
* Indicates whether this control has a value.
*
@@ -104,7 +93,7 @@
return value != null;
}
- /** {@inheritDoc} */
+ @Override
public void writeValue(ASN1Writer stream) throws IOException
{
if (value != null)
@@ -113,14 +102,13 @@
}
}
-
-
/**
* Appends a string representation of this LDAP control to the provided
* buffer.
*
* @param buffer The buffer to which the information should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("LDAPControl(oid=");
@@ -137,8 +125,6 @@
buffer.append(")");
}
-
-
/**
* Appends a multi-line string representation of this LDAP control to the
* provided buffer.
@@ -176,4 +162,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
index bdcb931..7f1257b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -538,6 +538,7 @@
*
* @return The name of the protocol associated with this protocol element.
*/
+ @Override
public String getProtocolElementName()
{
return "LDAP";
@@ -567,6 +568,7 @@
* @param buffer The buffer into which the string representation should be
* written.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("LDAPMessage(msgID=");
@@ -608,6 +610,7 @@
* @param indent The number of spaces that should be used to indent the
* resulting string representation.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
index 6177150..ffc8fc7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -60,6 +60,7 @@
*
* @return The modification type for this modification.
*/
+ @Override
public ModificationType getModificationType()
{
return modificationType;
@@ -72,6 +73,7 @@
*
* @param modificationType The modification type for this modification.
*/
+ @Override
public void setModificationType(ModificationType modificationType)
{
this.modificationType = modificationType;
@@ -84,6 +86,7 @@
*
* @return The attribute for this modification.
*/
+ @Override
public RawAttribute getAttribute()
{
return attribute;
@@ -96,6 +99,7 @@
*
* @param attribute The attribute for this modification.
*/
+ @Override
public void setAttribute(RawAttribute attribute)
{
this.attribute = attribute;
@@ -112,6 +116,7 @@
* @throws LDAPException If a problem occurs while trying to convert the
* LDAP attribute to a core <CODE>Attribute</CODE>.
*/
+ @Override
public Modification toModification()
throws LDAPException
{
@@ -125,6 +130,7 @@
*
* @return A string representation of this modification.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
@@ -140,6 +146,7 @@
*
* @param buffer The buffer to which the information should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("LDAPModification(type=").append(modificationType);
@@ -158,6 +165,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
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 63d9392..53e9def 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -466,6 +466,7 @@
*
* @return The human-readable name for this shutdown listener.
*/
+ @Override
public String getShutdownListenerName()
{
return handlerName;
@@ -493,6 +494,7 @@
*
* @param reason The human-readable reason for the shutdown.
*/
+ @Override
public void processServerShutdown(LocalizableMessage reason)
{
shutdownRequested = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java
index 5a45bb5..4f379a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPResultCode.java
@@ -12,13 +12,11 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
-
-
import static org.opends.messages.CoreMessages.*;
/**
* This class defines a set of constants that correspond to the result codes
@@ -29,193 +27,105 @@
*/
public class LDAPResultCode
{
- /**
- * The LDAP result code for successful operations.
- */
+ /** The LDAP result code for successful operations. */
public static final int SUCCESS = 0;
-
-
- /**
- * The LDAP result code for operations that fail due to an operations error.
- */
+ /** The LDAP result code for operations that fail due to an operations error. */
public static final int OPERATIONS_ERROR = 1;
-
-
- /**
- * The LDAP result code for operations that fail due to a protocol error.
- */
+ /** The LDAP result code for operations that fail due to a protocol error. */
public static final int PROTOCOL_ERROR = 2;
-
-
- /**
- * The LDAP result code for operations that fail as a result of exceeding a
- * time limit.
- */
+ /** The LDAP result code for operations that fail as a result of exceeding a time limit. */
public static final int TIME_LIMIT_EXCEEDED = 3;
-
-
- /**
- * The LDAP result code for operations that fail as a result of exceeding a
- * size limit.
- */
+ /** The LDAP result code for operations that fail as a result of exceeding a size limit. */
public static final int SIZE_LIMIT_EXCEEDED = 4;
-
-
- /**
- * The LDAP result code for compare operations in which the assertion is
- * false.
- */
+ /** The LDAP result code for compare operations in which the assertion is false. */
public static final int COMPARE_FALSE = 5;
-
-
- /**
- * The LDAP result code for compare operations in which the assertion is true.
- */
+ /** The LDAP result code for compare operations in which the assertion is true. */
public static final int COMPARE_TRUE = 6;
-
-
/**
* The LDAP result code for operations that fail because the requested
* authentication method is not supported.
*/
public static final int AUTH_METHOD_NOT_SUPPORTED = 7;
-
-
- /**
- * The LDAP result code for operations that fail because strong authentication
- * is required.
- */
+ /** The LDAP result code for operations that fail because strong authentication is required. */
public static final int STRONG_AUTH_REQUIRED = 8;
-
-
- /**
- * The LDAP result code for operations that encountered a referral.
- */
+ /** The LDAP result code for operations that encountered a referral. */
public static final int REFERRAL = 10;
-
-
/**
* The LDAP result code for operations that fail as a result of exceeding an
* administrative limit.
*/
public static final int ADMIN_LIMIT_EXCEEDED = 11;
-
-
/**
* The LDAP result code for operations that fail because they contain an
* unavailable critical extension.
*/
public static final int UNAVAILABLE_CRITICAL_EXTENSION = 12;
-
-
- /**
- * The LDAP result code for operations that fail because confidentiality is
- * required.
- */
+ /** The LDAP result code for operations that fail because confidentiality is required. */
public static final int CONFIDENTIALITY_REQUIRED = 13;
-
-
- /**
- * The LDAP result code used for multi-stage SASL bind operations that are not
- * yet complete.
- */
+ /** The LDAP result code used for multi-stage SASL bind operations that are not yet complete. */
public static final int SASL_BIND_IN_PROGRESS = 14;
-
-
- /**
- * The LDAP result code for operations that fail because a specified attribute
- * does not exist.
- */
+ /** The LDAP result code for operations that fail because a specified attribute does not exist. */
public static final int NO_SUCH_ATTRIBUTE = 16;
-
-
/**
* The LDAP result code for operations that fail because a specified attribute
* type is not defined in the server schema.
*/
public static final int UNDEFINED_ATTRIBUTE_TYPE = 17;
-
-
/**
* The LDAP result code for operations that fail as a result of attempting an
* inappropriate form of matching on an attribute.
*/
public static final int INAPPROPRIATE_MATCHING = 18;
-
-
/**
* The LDAP result code for operations that fail because a defined constraint
* has been violated.
*/
public static final int CONSTRAINT_VIOLATION = 19;
-
-
/**
* The LDAP result code for operations that fail because of a conflict with an
* existing attribute or value.
*/
public static final int ATTRIBUTE_OR_VALUE_EXISTS = 20;
-
-
- /**
- * The LDAP result code for operations that fail because of an invalid
- * attribute syntax.
- */
+ /** The LDAP result code for operations that fail because of an invalid attribute syntax. */
public static final int INVALID_ATTRIBUTE_SYNTAX = 21;
-
-
- /**
- * The LDAP result code for operations that fail because a targeted entry does
- * not exist.
- */
+ /** The LDAP result code for operations that fail because a targeted entry does not exist. */
public static final int NO_SUCH_OBJECT = 32;
-
-
/**
* The LDAP result code for operations that fail because the an alias was
* encountered in an illegal context.
*/
public static final int ALIAS_PROBLEM = 33;
-
-
- /**
- * The LDAP result code for operations that fail because the request included
- * a malformed DN.
- */
+ /** The LDAP result code for operations that fail because the request included a malformed DN. */
public static final int INVALID_DN_SYNTAX = 34;
-
-
/**
* The LDAP result code for operations that fail because a problem occurred
* while attempting to dereference an alias.
*/
public static final int ALIAS_DEREFERENCING_PROBLEM = 36;
-
-
/**
* The LDAP result code for operations that fail because the user attempted to
* perform a type of authentication that was inappropriate for the targeted
@@ -223,103 +133,72 @@
*/
public static final int INAPPROPRIATE_AUTHENTICATION = 48;
-
-
/**
* The LDAP result code for operations that fail because the user supplied
* invalid credentials for an authentication attempt.
*/
public static final int INVALID_CREDENTIALS = 49;
-
-
/**
* The LDAP result code for operations that fail because the client does not
* have permission to perform the requested operation.
*/
public static final int INSUFFICIENT_ACCESS_RIGHTS = 50;
-
-
- /**
- * The LDAP result code for operations that fail because the server was too
- * busy to process it.
- */
+ /** The LDAP result code for operations that fail because the server was too busy to process it. */
public static final int BUSY = 51;
-
-
/**
* The LDAP result code for operations that fail because the server or a
* required resource was unavailable.
*/
public static final int UNAVAILABLE = 52;
-
-
/**
* The LDAP result code for operations that fail because the server was
* unwilling to perform the requested operation.
*/
public static final int UNWILLING_TO_PERFORM = 53;
-
-
/**
* The LDAP result code for operations that fail because a referral or
* chaining loop was detected.
*/
public static final int LOOP_DETECT = 54;
-
-
/**
* The LDAP result code for operations that fail because the request included
* a VLV request control without a server-side sort control.
*/
public static final int SORT_CONTROL_MISSING = 60;
-
-
/**
* The LDAP result code for operations that fail because the request included
* a VLV request control with an invalid offset.
*/
public static final int OFFSET_RANGE_ERROR = 61;
-
-
- /**
- * The LDAP result code for operations that fail due to a naming violation.
- */
+ /** The LDAP result code for operations that fail due to a naming violation. */
public static final int NAMING_VIOLATION = 64;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation would have resulted in an entry that violates the server schema.
*/
public static final int OBJECTCLASS_VIOLATION = 65;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation is not allowed on non-leaf entries.
*/
public static final int NOT_ALLOWED_ON_NONLEAF = 66;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation is not allowed on an RDN attribute.
*/
public static final int NOT_ALLOWED_ON_RDN = 67;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation would have resulted in an entry that conflicts with one that
@@ -327,40 +206,30 @@
*/
public static final int ENTRY_ALREADY_EXISTS = 68;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation attempted to modify objectclass values in an illegal manner.
*/
public static final int OBJECTCLASS_MODS_PROHIBITED = 69;
-
-
/**
* The LDAP result code for operations that fail because the requested
* operation would have required interaction with multiple DSAs.
*/
public static final int AFFECTS_MULTIPLE_DSAS = 71;
-
-
/**
* The LDAP result code for operations that fail due to an error in
* virtual list view processing.
*/
public static final int VIRTUAL_LIST_VIEW_ERROR = 76;
-
-
/**
* The LDAP result code for use in cases in which none of the other defined
* result codes are appropriate.
*/
public static final int OTHER = 80;
-
-
/**
* The client-side result code that indicates that a previously-established
* connection to the server was lost. This is for client-side use only and
@@ -368,8 +237,6 @@
*/
public static final int CLIENT_SIDE_SERVER_DOWN = 81;
-
-
/**
* The client-side result code that indicates that a local error occurred that
* had nothing to do with interaction with the server. This is for
@@ -377,8 +244,6 @@
*/
public static final int CLIENT_SIDE_LOCAL_ERROR = 82;
-
-
/**
* The client-side result code that indicates that an error occurred while
* encoding a request to send to the server. This is for client-side use only
@@ -386,8 +251,6 @@
*/
public static final int CLIENT_SIDE_ENCODING_ERROR = 83;
-
-
/**
* The client-side result code that indicates that an error occurred while
* decoding a response from the server. This is for client-side use only and
@@ -395,8 +258,6 @@
*/
public static final int CLIENT_SIDE_DECODING_ERROR = 84;
-
-
/**
* The client-side result code that indicates that the client did not receive
* an expected response in a timely manner. This is for client-side use only
@@ -404,8 +265,6 @@
*/
public static final int CLIENT_SIDE_TIMEOUT = 85;
-
-
/**
* The client-side result code that indicates that the user requested an
* unknown or unsupported authentication mechanism. This is for client-side
@@ -413,8 +272,6 @@
*/
public static final int CLIENT_SIDE_AUTH_UNKNOWN = 86;
-
-
/**
* The client-side result code that indicates that the filter provided by the
* user was malformed and could not be parsed. This is for client-side use
@@ -422,8 +279,6 @@
*/
public static final int CLIENT_SIDE_FILTER_ERROR = 87;
-
-
/**
* The client-side result code that indicates that the user cancelled an
* operation. This is for client-side use only and should never be
@@ -431,8 +286,6 @@
*/
public static final int CLIENT_SIDE_USER_CANCELLED = 88;
-
-
/**
* The client-side result code that indicates that there was a problem with
* one or more of the parameters provided by the user. This is for
@@ -440,8 +293,6 @@
*/
public static final int CLIENT_SIDE_PARAM_ERROR = 89;
-
-
/**
* The client-side result code that indicates that the client application was
* not able to allocate enough memory for the requested operation. This is
@@ -449,8 +300,6 @@
*/
public static final int CLIENT_SIDE_NO_MEMORY = 90;
-
-
/**
* The client-side result code that indicates that the client was not able to
* establish a connection to the server. This is for client-side use only and
@@ -458,8 +307,6 @@
*/
public static final int CLIENT_SIDE_CONNECT_ERROR = 91;
-
-
/**
* The client-side result code that indicates that the user requested an
* operation that is not supported. This is for client-side use only and
@@ -467,8 +314,6 @@
*/
public static final int CLIENT_SIDE_NOT_SUPPORTED = 92;
-
-
/**
* The client-side result code that indicates that the client expected a
* control to be present in the response from the server but it was not
@@ -477,8 +322,6 @@
*/
public static final int CLIENT_SIDE_CONTROL_NOT_FOUND = 93;
-
-
/**
* The client-side result code that indicates that the server did not return
* any results for a search operation that was expected to match at least one
@@ -487,8 +330,6 @@
*/
public static final int CLIENT_SIDE_NO_RESULTS_RETURNED = 94;
-
-
/**
* The client-side result code that indicates that the server has returned
* more matching entries for a search operation than have been processed so
@@ -497,8 +338,6 @@
*/
public static final int CLIENT_SIDE_MORE_RESULTS_TO_RETURN = 95;
-
-
/**
* The client-side result code that indicates that the client detected a
* referral loop caused by servers referencing each other in a circular
@@ -507,8 +346,6 @@
*/
public static final int CLIENT_SIDE_CLIENT_LOOP = 96;
-
-
/**
* The client-side result code that indicates that the client reached the
* maximum number of hops allowed when attempting to follow a referral (i.e.,
@@ -518,56 +355,42 @@
*/
public static final int CLIENT_SIDE_REFERRAL_LIMIT_EXCEEDED = 97;
-
-
/**
* The LDAP result code for cancel operations that are successful, or for
* operations that are canceled.
*/
public static final int CANCELED = 118;
-
-
/**
* The LDAP result code for cancel operations that fail because the specified
* operation could not be found.
*/
public static final int NO_SUCH_OPERATION = 119;
-
-
/**
* The LDAP result code for cancel operations that fail because the specified
* operation has already progressed too far to be canceled.
*/
public static final int TOO_LATE = 120;
-
-
/**
* The LDAP result code for cancel operations that fail because the specified
* operation cannot be canceled.
*/
public static final int CANNOT_CANCEL = 121;
-
-
/**
* The LDAP result code for operations that are rejected because the
* filter in the LDAP assertion control did not match the target entry.
*/
public static final int ASSERTION_FAILED = 122;
-
-
/**
* The LDAP result code for operations that fail because the server refused
* the client's requested authorization.
*/
public static final int AUTHORIZATION_DENIED = 123;
-
-
/**
* The LDAP result code for operations in which no action is taken because the
* request include the LDAP no-op control.
@@ -581,8 +404,6 @@
*/
public static final int NO_OPERATION = 16654;
-
-
/**
* Retrieves a string representation of the provided LDAP result code.
*
@@ -593,211 +414,145 @@
*/
public static String toString(int resultCode)
{
- LocalizableMessage message;
+ return toLocalizableMessage(resultCode).toString();
+ }
+ private static LocalizableMessage toLocalizableMessage(int resultCode)
+ {
switch (resultCode)
{
case SUCCESS:
- message = INFO_RESULT_SUCCESS.get();
- break;
+ return INFO_RESULT_SUCCESS.get();
case OPERATIONS_ERROR:
- message = INFO_RESULT_OPERATIONS_ERROR.get();
- break;
+ return INFO_RESULT_OPERATIONS_ERROR.get();
case PROTOCOL_ERROR:
- message = INFO_RESULT_PROTOCOL_ERROR.get();
- break;
+ return INFO_RESULT_PROTOCOL_ERROR.get();
case TIME_LIMIT_EXCEEDED:
- message = INFO_RESULT_TIME_LIMIT_EXCEEDED.get();
- break;
+ return INFO_RESULT_TIME_LIMIT_EXCEEDED.get();
case SIZE_LIMIT_EXCEEDED:
- message = INFO_RESULT_SIZE_LIMIT_EXCEEDED.get();
- break;
+ return INFO_RESULT_SIZE_LIMIT_EXCEEDED.get();
case COMPARE_FALSE:
- message = INFO_RESULT_COMPARE_FALSE.get();
- break;
+ return INFO_RESULT_COMPARE_FALSE.get();
case COMPARE_TRUE:
- message = INFO_RESULT_COMPARE_TRUE.get();
- break;
+ return INFO_RESULT_COMPARE_TRUE.get();
case AUTH_METHOD_NOT_SUPPORTED:
- message = INFO_RESULT_AUTH_METHOD_NOT_SUPPORTED.get();
- break;
+ return INFO_RESULT_AUTH_METHOD_NOT_SUPPORTED.get();
case STRONG_AUTH_REQUIRED:
- message = INFO_RESULT_STRONG_AUTH_REQUIRED.get();
- break;
+ return INFO_RESULT_STRONG_AUTH_REQUIRED.get();
case REFERRAL:
- message = INFO_RESULT_REFERRAL.get();
- break;
+ return INFO_RESULT_REFERRAL.get();
case ADMIN_LIMIT_EXCEEDED:
- message = INFO_RESULT_ADMIN_LIMIT_EXCEEDED.get();
- break;
+ return INFO_RESULT_ADMIN_LIMIT_EXCEEDED.get();
case UNAVAILABLE_CRITICAL_EXTENSION:
- message = INFO_RESULT_UNAVAILABLE_CRITICAL_EXTENSION.get();
- break;
+ return INFO_RESULT_UNAVAILABLE_CRITICAL_EXTENSION.get();
case CONFIDENTIALITY_REQUIRED:
- message = INFO_RESULT_CONFIDENTIALITY_REQUIRED.get();
- break;
+ return INFO_RESULT_CONFIDENTIALITY_REQUIRED.get();
case SASL_BIND_IN_PROGRESS:
- message = INFO_RESULT_SASL_BIND_IN_PROGRESS.get();
- break;
+ return INFO_RESULT_SASL_BIND_IN_PROGRESS.get();
case NO_SUCH_ATTRIBUTE:
- message = INFO_RESULT_NO_SUCH_ATTRIBUTE.get();
- break;
+ return INFO_RESULT_NO_SUCH_ATTRIBUTE.get();
case UNDEFINED_ATTRIBUTE_TYPE:
- message = INFO_RESULT_UNDEFINED_ATTRIBUTE_TYPE.get();
- break;
+ return INFO_RESULT_UNDEFINED_ATTRIBUTE_TYPE.get();
case INAPPROPRIATE_MATCHING:
- message = INFO_RESULT_INAPPROPRIATE_MATCHING.get();
- break;
+ return INFO_RESULT_INAPPROPRIATE_MATCHING.get();
case CONSTRAINT_VIOLATION:
- message = INFO_RESULT_CONSTRAINT_VIOLATION.get();
- break;
+ return INFO_RESULT_CONSTRAINT_VIOLATION.get();
case ATTRIBUTE_OR_VALUE_EXISTS:
- message = INFO_RESULT_ATTRIBUTE_OR_VALUE_EXISTS.get();
- break;
+ return INFO_RESULT_ATTRIBUTE_OR_VALUE_EXISTS.get();
case INVALID_ATTRIBUTE_SYNTAX:
- message = INFO_RESULT_INVALID_ATTRIBUTE_SYNTAX.get();
- break;
+ return INFO_RESULT_INVALID_ATTRIBUTE_SYNTAX.get();
case NO_SUCH_OBJECT:
- message = INFO_RESULT_NO_SUCH_OBJECT.get();
- break;
+ return INFO_RESULT_NO_SUCH_OBJECT.get();
case ALIAS_PROBLEM:
- message = INFO_RESULT_ALIAS_PROBLEM.get();
- break;
+ return INFO_RESULT_ALIAS_PROBLEM.get();
case INVALID_DN_SYNTAX:
- message = INFO_RESULT_INVALID_DN_SYNTAX.get();
- break;
+ return INFO_RESULT_INVALID_DN_SYNTAX.get();
case ALIAS_DEREFERENCING_PROBLEM:
- message = INFO_RESULT_ALIAS_DEREFERENCING_PROBLEM.get();
- break;
+ return INFO_RESULT_ALIAS_DEREFERENCING_PROBLEM.get();
case INAPPROPRIATE_AUTHENTICATION:
- message = INFO_RESULT_INAPPROPRIATE_AUTHENTICATION.get();
- break;
+ return INFO_RESULT_INAPPROPRIATE_AUTHENTICATION.get();
case INVALID_CREDENTIALS:
- message = INFO_RESULT_INVALID_CREDENTIALS.get();
- break;
+ return INFO_RESULT_INVALID_CREDENTIALS.get();
case INSUFFICIENT_ACCESS_RIGHTS:
- message = INFO_RESULT_INSUFFICIENT_ACCESS_RIGHTS.get();
- break;
+ return INFO_RESULT_INSUFFICIENT_ACCESS_RIGHTS.get();
case BUSY:
- message = INFO_RESULT_BUSY.get();
- break;
+ return INFO_RESULT_BUSY.get();
case UNAVAILABLE:
- message = INFO_RESULT_UNAVAILABLE.get();
- break;
+ return INFO_RESULT_UNAVAILABLE.get();
case UNWILLING_TO_PERFORM:
- message = INFO_RESULT_UNWILLING_TO_PERFORM.get();
- break;
+ return INFO_RESULT_UNWILLING_TO_PERFORM.get();
case LOOP_DETECT:
- message = INFO_RESULT_LOOP_DETECT.get();
- break;
+ return INFO_RESULT_LOOP_DETECT.get();
case SORT_CONTROL_MISSING:
- message = INFO_RESULT_SORT_CONTROL_MISSING.get();
- break;
+ return INFO_RESULT_SORT_CONTROL_MISSING.get();
case OFFSET_RANGE_ERROR:
- message = INFO_RESULT_OFFSET_RANGE_ERROR.get();
- break;
+ return INFO_RESULT_OFFSET_RANGE_ERROR.get();
case NAMING_VIOLATION:
- message = INFO_RESULT_NAMING_VIOLATION.get();
- break;
+ return INFO_RESULT_NAMING_VIOLATION.get();
case OBJECTCLASS_VIOLATION:
- message = INFO_RESULT_OBJECTCLASS_VIOLATION.get();
- break;
+ return INFO_RESULT_OBJECTCLASS_VIOLATION.get();
case NOT_ALLOWED_ON_NONLEAF:
- message = INFO_RESULT_NOT_ALLOWED_ON_NONLEAF.get();
- break;
+ return INFO_RESULT_NOT_ALLOWED_ON_NONLEAF.get();
case NOT_ALLOWED_ON_RDN:
- message = INFO_RESULT_NOT_ALLOWED_ON_RDN.get();
- break;
+ return INFO_RESULT_NOT_ALLOWED_ON_RDN.get();
case ENTRY_ALREADY_EXISTS:
- message = INFO_RESULT_ENTRY_ALREADY_EXISTS.get();
- break;
+ return INFO_RESULT_ENTRY_ALREADY_EXISTS.get();
case OBJECTCLASS_MODS_PROHIBITED:
- message = INFO_RESULT_OBJECTCLASS_MODS_PROHIBITED.get();
- break;
+ return INFO_RESULT_OBJECTCLASS_MODS_PROHIBITED.get();
case AFFECTS_MULTIPLE_DSAS:
- message = INFO_RESULT_AFFECTS_MULTIPLE_DSAS.get();
- break;
+ return INFO_RESULT_AFFECTS_MULTIPLE_DSAS.get();
case VIRTUAL_LIST_VIEW_ERROR:
- message = INFO_RESULT_VIRTUAL_LIST_VIEW_ERROR.get();
- break;
+ return INFO_RESULT_VIRTUAL_LIST_VIEW_ERROR.get();
case CLIENT_SIDE_SERVER_DOWN:
- message = INFO_RESULT_CLIENT_SIDE_SERVER_DOWN.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_SERVER_DOWN.get();
case CLIENT_SIDE_LOCAL_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_LOCAL_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_LOCAL_ERROR.get();
case CLIENT_SIDE_ENCODING_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
case CLIENT_SIDE_DECODING_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_DECODING_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_DECODING_ERROR.get();
case CLIENT_SIDE_TIMEOUT:
- message = INFO_RESULT_CLIENT_SIDE_TIMEOUT.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_TIMEOUT.get();
case CLIENT_SIDE_AUTH_UNKNOWN:
- message = INFO_RESULT_CLIENT_SIDE_AUTH_UNKNOWN.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_AUTH_UNKNOWN.get();
case CLIENT_SIDE_FILTER_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_FILTER_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_FILTER_ERROR.get();
case CLIENT_SIDE_USER_CANCELLED:
- message = INFO_RESULT_CLIENT_SIDE_USER_CANCELLED.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_USER_CANCELLED.get();
case CLIENT_SIDE_PARAM_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_PARAM_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_PARAM_ERROR.get();
case CLIENT_SIDE_NO_MEMORY:
- message = INFO_RESULT_CLIENT_SIDE_NO_MEMORY.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_NO_MEMORY.get();
case CLIENT_SIDE_CONNECT_ERROR:
- message = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
case CLIENT_SIDE_NOT_SUPPORTED:
- message = INFO_RESULT_CLIENT_SIDE_NOT_SUPPORTED.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_NOT_SUPPORTED.get();
case CLIENT_SIDE_CONTROL_NOT_FOUND:
- message = INFO_RESULT_CLIENT_SIDE_CONTROL_NOT_FOUND.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_CONTROL_NOT_FOUND.get();
case CLIENT_SIDE_NO_RESULTS_RETURNED:
- message = INFO_RESULT_CLIENT_SIDE_NO_RESULTS_RETURNED.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_NO_RESULTS_RETURNED.get();
case CLIENT_SIDE_MORE_RESULTS_TO_RETURN:
- message = INFO_RESULT_CLIENT_SIDE_MORE_RESULTS_TO_RETURN.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_MORE_RESULTS_TO_RETURN.get();
case CLIENT_SIDE_CLIENT_LOOP:
- message = INFO_RESULT_CLIENT_SIDE_CLIENT_LOOP.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_CLIENT_LOOP.get();
case CLIENT_SIDE_REFERRAL_LIMIT_EXCEEDED:
- message = INFO_RESULT_CLIENT_SIDE_REFERRAL_LIMIT_EXCEEDED.get();
- break;
+ return INFO_RESULT_CLIENT_SIDE_REFERRAL_LIMIT_EXCEEDED.get();
case CANCELED:
- message = INFO_RESULT_CANCELED.get();
- break;
+ return INFO_RESULT_CANCELED.get();
case NO_SUCH_OPERATION:
- message = INFO_RESULT_NO_SUCH_OPERATION.get();
- break;
+ return INFO_RESULT_NO_SUCH_OPERATION.get();
case TOO_LATE:
- message = INFO_RESULT_TOO_LATE.get();
- break;
+ return INFO_RESULT_TOO_LATE.get();
case CANNOT_CANCEL:
- message = INFO_RESULT_CANNOT_CANCEL.get();
- break;
+ return INFO_RESULT_CANNOT_CANCEL.get();
case ASSERTION_FAILED:
- message = INFO_RESULT_ASSERTION_FAILED.get();
- break;
+ return INFO_RESULT_ASSERTION_FAILED.get();
case AUTHORIZATION_DENIED:
- message = INFO_RESULT_AUTHORIZATION_DENIED.get();
- break;
+ return INFO_RESULT_AUTHORIZATION_DENIED.get();
case NO_OPERATION:
- message = INFO_RESULT_NO_OPERATION.get();
- break;
+ return INFO_RESULT_NO_OPERATION.get();
default:
- message = INFO_RESULT_OTHER.get();
- break;
+ return INFO_RESULT_OTHER.get();
}
-
- return message.toString();
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
index 17adf1d..0f47d08 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -116,7 +116,6 @@
private AtomicLong extOperationCount = new AtomicLong(0);
private AtomicLong extOperationTime = new AtomicLong(0);
-
/**
* Creates a new instance of this class with the specified parent.
*
@@ -128,9 +127,6 @@
this.instanceName = instanceName;
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeMonitorProvider(MonitorProviderCfg configuration)
throws ConfigException
@@ -144,8 +140,6 @@
throw new ConfigException(message);
}
-
-
/**
* Retrieves the name of this monitor provider. It should be unique
* among all monitor providers, including all instances of the same
@@ -159,8 +153,6 @@
return instanceName;
}
-
- /** {@inheritDoc} */
@Override
public ObjectClass getMonitorObjectClass()
{
@@ -251,10 +243,7 @@
return attrs;
}
-
- /**
- * Clears any statistical information collected to this point.
- */
+ /** Clears any statistical information collected to this point. */
public void clearStatistics()
{
abandonRequests.set(0);
@@ -311,9 +300,6 @@
extOperationTime.set(0);
}
-
-
-
/**
* Updates the appropriate set of counters to indicate that a new
* connection has been established.
@@ -323,19 +309,12 @@
connectionsEstablished.getAndIncrement();
}
-
-
- /**
- * Updates the appropriate set of counters to indicate that a
- * connection has been closed.
- */
+ /** Updates the appropriate set of counters to indicate that a connection has been closed. */
public void updateDisconnect()
{
connectionsClosed.getAndIncrement();
}
-
-
/**
* Updates the appropriate set of counters to indicate that the
* specified number of bytes have been read by the client.
@@ -348,8 +327,6 @@
this.bytesRead.getAndAdd(bytesRead);
}
-
-
/**
* Updates the appropriate set of counters to indicate that the
* specified number of bytes have been written to the client.
@@ -362,8 +339,6 @@
this.bytesWritten.getAndAdd(bytesWritten);
}
-
-
/**
* Updates the appropriate set of counters based on the provided
* message that has been read from the client.
@@ -428,8 +403,6 @@
}
}
-
-
/**
* Updates the appropriate set of counters based on the provided
* message that has been written to the client.
@@ -490,8 +463,6 @@
}
}
-
-
/**
* Updates the appropriate set of counters to indicate that an
* operation was abandoned without sending a response to the client.
@@ -513,8 +484,6 @@
return connectionsEstablished.get();
}
-
-
/**
* Retrieves the number of client connections that have been closed.
*
@@ -525,8 +494,6 @@
return connectionsClosed.get();
}
-
-
/**
* Retrieves the number of bytes that have been received from clients.
*
@@ -537,8 +504,6 @@
return bytesRead.get();
}
-
-
/**
* Retrieves the number of bytes that have been written to clients.
*
@@ -549,8 +514,6 @@
return bytesWritten.get();
}
-
-
/**
* Retrieves the number of LDAP messages that have been received from
* clients.
@@ -563,8 +526,6 @@
return messagesRead.get();
}
-
-
/**
* Retrieves the number of LDAP messages that have been written to
* clients.
@@ -577,8 +538,6 @@
return messagesWritten.get();
}
-
-
/**
* Retrieves the number of operations that have been initiated by
* clients.
@@ -591,8 +550,6 @@
return operationsInitiated.get();
}
-
-
/**
* Retrieves the number of operations for which the server has
* completed processing.
@@ -605,8 +562,6 @@
return operationsCompleted.get();
}
-
-
/**
* Retrieves the number of operations that have been abandoned by
* clients.
@@ -619,8 +574,6 @@
return operationsAbandoned.get();
}
-
-
/**
* Retrieves the number of abandon requests that have been received.
*
@@ -631,8 +584,6 @@
return abandonRequests.get();
}
-
-
/**
* Retrieves the number of add requests that have been received.
*
@@ -643,8 +594,6 @@
return addRequests.get();
}
-
-
/**
* Retrieves the number of add responses that have been sent.
*
@@ -655,8 +604,6 @@
return addResponses.get();
}
-
-
/**
* Retrieves the number of bind requests that have been received.
*
@@ -667,8 +614,6 @@
return bindRequests.get();
}
-
-
/**
* Retrieves the number of bind responses that have been sent.
*
@@ -679,8 +624,6 @@
return bindResponses.get();
}
-
-
/**
* Retrieves the number of compare requests that have been received.
*
@@ -691,8 +634,6 @@
return compareRequests.get();
}
-
-
/**
* Retrieves the number of compare responses that have been sent.
*
@@ -703,8 +644,6 @@
return compareResponses.get();
}
-
-
/**
* Retrieves the number of delete requests that have been received.
*
@@ -715,8 +654,6 @@
return deleteRequests.get();
}
-
-
/**
* Retrieves the number of delete responses that have been sent.
*
@@ -727,8 +664,6 @@
return deleteResponses.get();
}
-
-
/**
* Retrieves the number of extended requests that have been received.
*
@@ -739,8 +674,6 @@
return extendedRequests.get();
}
-
-
/**
* Retrieves the number of extended responses that have been sent.
*
@@ -751,8 +684,6 @@
return extendedResponses.get();
}
-
-
/**
* Retrieves the number of modify requests that have been received.
*
@@ -763,8 +694,6 @@
return modifyRequests.get();
}
-
-
/**
* Retrieves the number of modify responses that have been sent.
*
@@ -775,8 +704,6 @@
return modifyResponses.get();
}
-
-
/**
* Retrieves the number of modify DN requests that have been received.
*
@@ -787,8 +714,6 @@
return modifyDNRequests.get();
}
-
-
/**
* Retrieves the number of modify DN responses that have been sent.
*
@@ -799,8 +724,6 @@
return modifyDNResponses.get();
}
-
-
/**
* Retrieves the number of search requests that have been received.
*
@@ -811,8 +734,6 @@
return searchRequests.get();
}
-
-
/**
* Retrieves the number of one-level search requests that have been received.
*
@@ -823,8 +744,6 @@
return searchOneRequests.get();
}
-
-
/**
* Retrieves the number of subtree search requests that have been received.
*
@@ -835,8 +754,6 @@
return searchSubRequests.get();
}
-
-
/**
* Retrieves the number of search result entries that have been sent.
*
@@ -847,8 +764,6 @@
return searchResultEntries.get();
}
-
-
/**
* Retrieves the number of search result references that have been
* sent.
@@ -860,8 +775,6 @@
return searchResultReferences.get();
}
-
-
/**
* Retrieves the number of search result done messages that have been
* sent.
@@ -874,8 +787,6 @@
return searchResultsDone.get();
}
-
-
/**
* Retrieves the number of unbind requests that have been received.
*
@@ -934,5 +845,4 @@
moddnOperationTime.getAndAdd(time);
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index 1919678..4fb6db7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -144,6 +144,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_MODIFY_DN_REQUEST;
@@ -156,6 +157,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Modify DN Request";
@@ -167,6 +169,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_MODIFY_DN_REQUEST);
@@ -190,6 +193,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("ModifyDNRequest(dn=").append(entryDN);
@@ -214,6 +218,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java
index 68185f5..597e819 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -59,6 +59,7 @@
*
* @return A string representation of this LDAP protocol op.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
index e03bb5e..98523c3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -102,6 +102,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_SEARCH_RESULT_REFERENCE;
@@ -114,6 +115,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Search Result Reference";
@@ -125,6 +127,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeStartSequence(OP_TYPE_SEARCH_RESULT_REFERENCE);
@@ -143,6 +146,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("SearchReference(referralURLs={");
@@ -172,6 +176,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
index 6626ab7..9847872 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -51,6 +51,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_UNBIND_REQUEST;
@@ -63,6 +64,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Unbind Request";
@@ -74,6 +76,7 @@
* @param stream The ASN.1 output stream to write to.
* @throws IOException If a problem occurs while writing to the stream.
*/
+ @Override
public void write(ASN1Writer stream) throws IOException
{
stream.writeNull(OP_TYPE_UNBIND_REQUEST);
@@ -87,6 +90,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("UnbindRequest()");
@@ -102,6 +106,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
for (int i=0; i < indent; i++)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
index 32aa0f6..d2665dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.replication.common;
@@ -127,6 +127,7 @@
* for monitoring purpose).
* @return A user readable string representing this status.
*/
+ @Override
public String toString()
{
switch (value)
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 8deceb3..d3120ca 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -49,13 +49,13 @@
}
}
- /** {@inheritDoc} */
+ @Override
public void update(int b)
{
updateWithOneByte((byte) b);
}
- /** {@inheritDoc} */
+ @Override
public void update(byte[] b, int off, int len)
{
for (int i = off; i < off + len; i++)
@@ -64,7 +64,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public long getValue()
{
if (checksum != 0L)
@@ -83,7 +83,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public void reset()
{
checksum = 0L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
index f7a87a8..213a977 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -50,7 +50,7 @@
this.numEntries = numEntries;
}
- /** {@inheritDoc} */
+ @Override
public void write(int i) throws IOException
{
throw new IOException("Invalid call");
@@ -65,7 +65,7 @@
return checkSum.getValue();
}
- /** {@inheritDoc} */
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
int endOfEntryIndex;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
index 9e9adae..b392a32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
@@ -12,19 +12,17 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
-
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.Control;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.controls.ControlDecoder;
-import org.forgerock.opendj.io.ASN1Writer;
-
import java.io.IOException;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.controls.ControlDecoder;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
/**
* This class implements the Sun-defined replication repair control.
@@ -36,13 +34,11 @@
*/
public class ReplicationRepairRequestControl extends Control
{
- /**
- * ControlDecoder implementation to decode this control from a ByteString.
- */
+ /** ControlDecoder implementation to decode this control from a ByteString. */
private static final class Decoder
implements ControlDecoder<ReplicationRepairRequestControl>
{
- /** {@inheritDoc} */
+ @Override
public ReplicationRepairRequestControl decode(boolean isCritical,
ByteString value)
throws DirectoryException
@@ -50,34 +46,25 @@
return new ReplicationRepairRequestControl(isCritical);
}
- /** {@inheritDoc} */
+ @Override
public String getOID()
{
return OID_REPLICATION_REPAIR_CONTROL;
}
-
}
- /**
- * The Control Decoder that can be used to decode this control.
- */
+ /** The Control Decoder that can be used to decode this control. */
public static final ControlDecoder<ReplicationRepairRequestControl> DECODER =
new Decoder();
- /**
- * The OID of the Replication repair Control.
- */
+ /** The OID of the Replication repair Control. */
public static final String
OID_REPLICATION_REPAIR_CONTROL = "1.3.6.1.4.1.26027.1.5.2";
- /**
- * Creates a new instance of the replication repair request control with the
- * default settings.
- */
+ /** Creates a new instance of the replication repair request control with the default settings. */
public ReplicationRepairRequestControl()
{
super(OID_REPLICATION_REPAIR_CONTROL, false);
-
}
/**
@@ -90,7 +77,6 @@
public ReplicationRepairRequestControl(boolean isCritical)
{
super(OID_REPLICATION_REPAIR_CONTROL, isCritical);
-
}
/**
@@ -105,16 +91,9 @@
// No value element
}
- /**
- * Appends a string representation of this replication repair request control
- * to the provided buffer.
- *
- * @param buffer The buffer to which the information should be appended.
- */
@Override
public void toString(StringBuilder buffer)
{
buffer.append("ReplicationRepairRequestControl()");
}
}
-
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 bd9c8f2..8faa2a3 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
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -58,19 +58,18 @@
* Get the PDU message.
* @return The PDU message.
*/
+ @Override
public String getMessage()
{
return msg;
}
- /** {@inheritDoc} */
@Override
public String getLocalizedMessage()
{
return getMessage();
}
- /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
index 50bb9a4..2466a7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
-
-
/**
* This is an abstract class of messages of the replication protocol for message
* that needs to contain information about the server that send them and the
@@ -30,19 +28,11 @@
*/
public abstract class RoutableMsg extends ReplicationMsg
{
+ /* Special values for the server ids fields contained in the routable messages. */
- /**
- * Special values for the server ids fields contained in the routable
- * messages.
- **/
-
- /**
- * Specifies that no server is identified.
- */
+ /** Specifies that no server is identified. */
public static final int UNKNOWN_SERVER = -1;
- /**
- * Specifies all servers in the replication domain.
- */
+ /** Specifies all servers in the replication domain. */
public static final int ALL_SERVERS = -2;
/**
* Inside a topology of servers in the same domain, it specifies
@@ -50,13 +40,9 @@
*/
public static final int THE_CLOSEST_SERVER = -3;
- /**
- * The destination server or servers of this message.
- */
+ /** The destination server or servers of this message. */
protected int destination = UNKNOWN_SERVER;
- /**
- * The serverID of the server that sends this message.
- */
+ /** The serverID of the server that sends this message. */
protected int senderID = UNKNOWN_SERVER;
/**
@@ -70,9 +56,7 @@
this.destination = destination;
}
- /**
- * Creates a routable message.
- */
+ /** Creates a routable message. */
public RoutableMsg()
{
}
@@ -101,6 +85,7 @@
*
* @return the string representation of this message.
*/
+ @Override
public String toString()
{
return "[" + getClass().getCanonicalName() +
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java
index fc8bdd3..7321bf2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java
@@ -15,21 +15,20 @@
* Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.TaskMessages.*;
import java.net.InetAddress;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
-import static org.opends.messages.TaskMessages.*;
-
-
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Operation;
+import org.opends.server.types.Privilege;
/**
* This class provides an implementation of a Directory Server task that can be
@@ -38,13 +37,11 @@
public class EnterLockdownModeTask
extends Task
{
-
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage getDisplayName() {
return INFO_TASK_ENTER_LOCKDOWN_MODE_NAME.get();
}
- /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -71,13 +68,10 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
protected TaskState runTask()
{
DirectoryServer.setLockdownMode(true);
return TaskState.COMPLETED_SUCCESSFULLY;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java
index 7d997c4..cef8c78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java
@@ -15,21 +15,20 @@
* Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.TaskMessages.*;
import java.net.InetAddress;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
-import static org.opends.messages.TaskMessages.*;
-
-
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Operation;
+import org.opends.server.types.Privilege;
/**
* This class provides an implementation of a Directory Server task that can be
@@ -38,13 +37,11 @@
public class LeaveLockdownModeTask
extends Task
{
-
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage getDisplayName() {
return INFO_TASK_LEAVE_LOCKDOWN_MODE_NAME.get();
}
- /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -71,9 +68,7 @@
}
}
-
-
- /** {@inheritDoc} */
+ @Override
protected TaskState runTask()
{
DirectoryServer.setLockdownMode(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java
index 8b32916..8a3f0e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
@@ -70,6 +70,7 @@
/**
* Invokes the Directory Server shutdown process.
*/
+ @Override
public void run()
{
DirectoryServer.restart(CLASS_NAME, shutdownMessage);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java
index 00aada1..bc2a206 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.tasks;
-
-
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -25,19 +23,17 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.forgerock.opendj.ldap.ResultCode;
-
-
/**
* This class provides an implementation of a Directory Server task that can be
@@ -46,20 +42,13 @@
public class ShutdownTask
extends Task
{
-
-
-
- /**
- * Indicates whether to use an exit code that indicates the server should be
- * restarted.
- */
+ /** Indicates whether to use an exit code that indicates the server should be restarted. */
private boolean restart;
/** The shutdown message that will be used. */
private LocalizableMessage shutdownMessage;
-
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage getDisplayName() {
return INFO_TASK_SHUTDOWN_NAME.get();
}
@@ -74,6 +63,7 @@
* @throws DirectoryException If a problem occurs during initialization that
* should be returned to the client.
*/
+ @Override
public void initializeTask()
throws DirectoryException
{
@@ -96,7 +86,6 @@
}
}
-
attrType = DirectoryServer.getAttributeType(ATTR_RESTART_SERVER);
attrList = taskEntry.getAttribute(attrType);
if (!attrList.isEmpty())
@@ -151,6 +140,7 @@
*
* @return The final state to use for the task.
*/
+ @Override
public TaskState runTask()
{
// This is a unique case in that the shutdown cannot finish until this task
@@ -166,6 +156,7 @@
ShutdownTaskThread shutdownThread =
new ShutdownTaskThread(shutdownMessage)
{
+ @Override
public void run()
{
org.opends.server.tools.StopWindowsService.main(new String[]{});
@@ -190,4 +181,3 @@
return TaskState.COMPLETED_SUCCESSFULLY;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java
index 28c80c1..d50e9d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java
@@ -12,19 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
-
-
-
import org.opends.server.api.DirectoryThread;
import org.opends.server.core.DirectoryServer;
-
-
-
/**
* This class defines a thread that will be spawned to invoke the Directory
* Server shutdown process. This needs to be a separate thread because the task
@@ -33,19 +27,13 @@
public class ShutdownTaskThread
extends DirectoryThread
{
- /**
- * The fully-qualified name of this class.
- */
+ /** The fully-qualified name of this class. */
private static final String CLASS_NAME =
"org.opends.server.tasks.ShutdownTaskThread";
-
-
/** The shutdown message that will be used. */
private LocalizableMessage shutdownMessage;
-
-
/**
* Creates a new instance of this shutdown task thread with the provided
* message.
@@ -56,20 +44,15 @@
{
super("Shutdown Task Thread");
-
this.shutdownMessage = shutdownMessage;
setDaemon(true);
}
-
-
- /**
- * Invokes the Directory Server shutdown process.
- */
+ /** Invokes the Directory Server shutdown process. */
+ @Override
public void run()
{
DirectoryServer.shutDown(CLASS_NAME, shutdownMessage);
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java
index ee46405..6a7e2c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java
@@ -12,25 +12,23 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
import static org.opends.messages.ToolMessages.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.forgerock.i18n.LocalizableMessage;
/**
* This class provides an implementation of an X.509 trust manager which will
@@ -44,25 +42,16 @@
public class PromptTrustManager
implements X509TrustManager
{
-
-
-
/** The singleton trust manager array for this class. */
private static TrustManager[] trustManagerArray =
new TrustManager[] { new PromptTrustManager() };
-
-
- /**
- * Creates a new instance of this prompt trust manager.
- */
+ /** Creates a new instance of this prompt trust manager. */
private PromptTrustManager()
{
// No implementation is required.
}
-
-
/**
* Retrieves the trust manager array that should be used to initialize an SSL
* context in cases where the user should be interactively prompted about
@@ -77,8 +66,6 @@
return trustManagerArray;
}
-
-
/**
* Determines whether an SSL client with the provided certificate chain should
* be trusted. This implementation is not intended for server-side use, and
@@ -90,6 +77,7 @@
* @throws CertificateException To indicate that the provided client
* certificate is not trusted.
*/
+ @Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
@@ -97,8 +85,6 @@
throw new CertificateException(message.toString());
}
-
-
/**
* Determines whether an SSL server with the provided certificate chain should
* be trusted. In this case, the user will be interactively prompted as to
@@ -109,6 +95,7 @@
*
* @throws CertificateException If the user rejects the certificate.
*/
+ @Override
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
@@ -138,7 +125,6 @@
notAfterDate));
}
-
LocalizableMessage prompt = INFO_PROMPTTM_YESNO_PROMPT.get();
BufferedReader reader =
new BufferedReader(new InputStreamReader(System.in));
@@ -171,8 +157,6 @@
}
}
-
-
/**
* Retrieves the set of certificate authority certificates which are trusted
* for authenticating peers.
@@ -180,9 +164,9 @@
* @return An empty array, since we don't care what certificates are
* presented because we will always prompt the user.
*/
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
return new X509Certificate[0];
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
index 3e9e7c5..a9322ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.dsreplication;
@@ -29,7 +29,7 @@
/**
* This is a simple adaptor to create a task schedule information object
* using the data provided by the user. It is used to be able to share some
- * code with the {@link TaskTool} class.
+ * code with the {@link org.opends.server.tools.tasks.TaskTool} class.
*/
public class PurgeHistoricalScheduleInformation
implements TaskScheduleInformation
@@ -52,7 +52,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public void addTaskAttributes(List<RawAttribute> attributes)
{
attributes.add(new LDAPAttribute(
@@ -62,55 +62,55 @@
Long.toString(uData.getMaximumDuration())));
}
- /** {@inheritDoc} */
+ @Override
public List<String> getDependencyIds()
{
return taskSchedule.getDependencyIds();
}
- /** {@inheritDoc} */
+ @Override
public FailedDependencyAction getFailedDependencyAction()
{
return taskSchedule.getFailedDependencyAction();
}
- /** {@inheritDoc} */
+ @Override
public List<String> getNotifyUponCompletionEmailAddresses()
{
return taskSchedule.getNotifyUponCompletionEmailAddresses();
}
- /** {@inheritDoc} */
+ @Override
public List<String> getNotifyUponErrorEmailAddresses()
{
return taskSchedule.getNotifyUponErrorEmailAddresses();
}
- /** {@inheritDoc} */
+ @Override
public String getRecurringDateTime()
{
return taskSchedule.getRecurringDateTime();
}
- /** {@inheritDoc} */
+ @Override
public Date getStartDateTime()
{
return taskSchedule.getStartDate();
}
- /** {@inheritDoc} */
+ @Override
public Class<?> getTaskClass()
{
return org.opends.server.tasks.PurgeConflictsHistoricalTask.class;
}
- /** {@inheritDoc} */
+ @Override
public String getTaskId()
{
return null;
}
- /** {@inheritDoc} */
+ @Override
public String getTaskObjectclass()
{
return "ds-task-purge-conflicts-historical";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java
index ae3f2d6..863eafe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java
@@ -40,58 +40,26 @@
- /**
- * Creates a new instance of this attribute value tag.
- */
+ /** Creates a new instance of this attribute value tag. */
public AttributeValueTag()
{
attributeType = null;
numCharacters = 0;
}
-
-
- /**
- * Retrieves the name for this tag.
- *
- * @return The name for this tag.
- */
+ @Override
public String getName()
{
return "AttributeValue";
}
-
-
- /**
- * Indicates whether this tag is allowed for use in the extra lines for
- * branches.
- *
- * @return <CODE>true</CODE> if this tag may be used in branch definitions,
- * or <CODE>false</CODE> if not.
- */
+ @Override
public boolean allowedInBranch()
{
return true;
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a branch definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param branch The branch in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -137,23 +105,7 @@
}
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a template definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param template The template in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -199,17 +151,7 @@
}
}
-
-
- /**
- * Generates the content for this tag by appending it to the provided tag.
- *
- * @param templateEntry The entry for which this tag is being generated.
- * @param templateValue The template value to which the generated content
- * should be appended.
- *
- * @return The result of generating content for this tag.
- */
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
@@ -240,4 +182,3 @@
return TagResult.SUCCESS_RESULT;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java
index 7af2210..2a94929 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java
@@ -12,24 +12,20 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Random;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.InitializationException;
import static org.opends.messages.ToolMessages.*;
-
-
/**
* This class defines a tag that is used provide values from a text file. The
* file should have one value per line. Access to the values may be either at
@@ -53,11 +49,7 @@
/** The array of lines read from the file. */
private String[] fileLines;
-
-
- /**
- * Creates a new instance of this file tag.
- */
+ /** Creates a new instance of this file tag. */
public FileTag()
{
sequential = false;
@@ -67,49 +59,19 @@
fileLines = null;
}
-
-
- /**
- * Retrieves the name for this tag.
- *
- * @return The name for this tag.
- */
+ @Override
public String getName()
{
return "File";
}
-
-
- /**
- * Indicates whether this tag is allowed for use in the extra lines for
- * branches.
- *
- * @return <CODE>true</CODE> if this tag may be used in branch definitions,
- * or <CODE>false</CODE> if not.
- */
+ @Override
public boolean allowedInBranch()
{
return true;
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a branch definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param branch The branch in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -118,23 +80,7 @@
initializeInternal(templateFile, arguments, lineNumber, warnings);
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a template definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param template The template in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -143,21 +89,6 @@
initializeInternal(templateFile, arguments, lineNumber, warnings);
}
-
-
- /**
- * Performs any initialization for this tag that may be needed.
- *
- * @param templateFile The template file in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
private void initializeInternal(TemplateFile templateFile, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
throws InitializationException
@@ -223,17 +154,7 @@
}
}
-
-
- /**
- * Generates the content for this tag by appending it to the provided tag.
- *
- * @param templateEntry The entry for which this tag is being generated.
- * @param templateValue The template value to which the generated content
- * should be appended.
- *
- * @return The result of generating content for this tag.
- */
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
@@ -253,4 +174,3 @@
return TagResult.SUCCESS_RESULT;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java
index f8aeccc..c58f841 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java
@@ -12,84 +12,43 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.InitializationException;
import static org.opends.messages.ToolMessages.*;
-
-
-/**
- * This class defines a tag that is used to include a first name in the
- * attribute value.
- */
+/** This class defines a tag that is used to include a first name in the attribute value. */
public class FirstNameTag
extends Tag
{
/** The template file with which this tag is associated. */
private TemplateFile templateFile;
-
-
- /**
- * Creates a new instance of this first name tag.
- */
+ /** Creates a new instance of this first name tag. */
public FirstNameTag()
{
// No implementation required.
}
-
-
- /**
- * Retrieves the name for this tag.
- *
- * @return The name for this tag.
- */
+ @Override
public String getName()
{
return "First";
}
-
-
- /**
- * Indicates whether this tag is allowed for use in the extra lines for
- * branches.
- *
- * @return <CODE>true</CODE> if this tag may be used in branch definitions,
- * or <CODE>false</CODE> if not.
- */
+ @Override
public boolean allowedInBranch()
{
return false;
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a template definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param template The template in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -105,17 +64,7 @@
}
}
-
-
- /**
- * Generates the content for this tag by appending it to the provided tag.
- *
- * @param templateEntry The entry for which this tag is being generated.
- * @param templateValue The template value to which the generated content
- * should be appended.
- *
- * @return The result of generating content for this tag.
- */
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
@@ -123,4 +72,3 @@
return TagResult.SUCCESS_RESULT;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java
index 3a7a0a4..63252b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/GUIDTag.java
@@ -12,80 +12,41 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.List;
import java.util.UUID;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.InitializationException;
import static org.opends.messages.ToolMessages.*;
-
-
-/**
- * This class defines a tag that is used to include a GUID in the attribute
- * value.
- */
+/** This class defines a tag that is used to include a GUID in the attribute value. */
public class GUIDTag
extends Tag
{
- /**
- * Creates a new instance of this GUID tag.
- */
+ /** Creates a new instance of this GUID tag. */
public GUIDTag()
{
// No implementation required.
}
-
-
- /**
- * Retrieves the name for this tag.
- *
- * @return The name for this tag.
- */
+ @Override
public String getName()
{
return "GUID";
}
-
-
- /**
- * Indicates whether this tag is allowed for use in the extra lines for
- * branches.
- *
- * @return <CODE>true</CODE> if this tag may be used in branch definitions,
- * or <CODE>false</CODE> if not.
- */
+ @Override
public boolean allowedInBranch()
{
return true;
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a branch definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param branch The branch in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -99,23 +60,7 @@
}
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a template definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param template The template in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -129,17 +74,7 @@
}
}
-
-
- /**
- * Generates the content for this tag by appending it to the provided tag.
- *
- * @param templateEntry The entry for which this tag is being generated.
- * @param templateValue The template value to which the generated content
- * should be appended.
- *
- * @return The result of generating content for this tag.
- */
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
@@ -147,4 +82,3 @@
return TagResult.SUCCESS_RESULT;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java
index 6de853a..612709d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java
@@ -40,58 +40,26 @@
- /**
- * Creates a new instance of this ifabsent tag.
- */
+ /** Creates a new instance of this ifabsent tag. */
public IfAbsentTag()
{
attributeType = null;
assertionValue = null;
}
-
-
- /**
- * Retrieves the name for this tag.
- *
- * @return The name for this tag.
- */
+ @Override
public String getName()
{
return "IfAbsent";
}
-
-
- /**
- * Indicates whether this tag is allowed for use in the extra lines for
- * branches.
- *
- * @return <CODE>true</CODE> if this tag may be used in branch definitions,
- * or <CODE>false</CODE> if not.
- */
+ @Override
public boolean allowedInBranch()
{
return true;
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a branch definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param branch The branch in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -122,23 +90,7 @@
}
}
-
-
- /**
- * Performs any initialization for this tag that may be needed while parsing
- * a template definition.
- *
- * @param templateFile The template file in which this tag is used.
- * @param template The template in which this tag is used.
- * @param arguments The set of arguments provided for this tag.
- * @param lineNumber The line number on which this tag appears in the
- * template file.
- * @param warnings A list into which any appropriate warning messages
- * may be placed.
- *
- * @throws InitializationException If a problem occurs while initializing
- * this tag.
- */
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -170,17 +122,7 @@
}
}
-
-
- /**
- * Generates the content for this tag by appending it to the provided tag.
- *
- * @param templateEntry The entry for which this tag is being generated.
- * @param templateValue The template value to which the generated content
- * should be appended.
- *
- * @return The result of generating content for this tag.
- */
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
@@ -205,4 +147,3 @@
return TagResult.SUCCESS_RESULT;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java
index 49c0695..af4fb11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java
@@ -40,9 +40,7 @@
- /**
- * Creates a new instance of this ifpresent tag.
- */
+ /** Creates a new instance of this ifpresent tag. */
public IfPresentTag()
{
attributeType = null;
@@ -56,6 +54,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "IfPresent";
@@ -70,6 +69,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -92,6 +92,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -139,6 +140,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -180,6 +182,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java
index 6ec5a8b..4cfa53b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -27,10 +27,7 @@
-/**
- * This class defines a tag that is used to include a last name in the
- * attribute value.
- */
+/** This class defines a tag that is used to include a last name in the attribute value. */
public class LastNameTag
extends Tag
{
@@ -39,9 +36,7 @@
- /**
- * Creates a new instance of this last name tag.
- */
+ /** Creates a new instance of this last name tag. */
public LastNameTag()
{
// No implementation required.
@@ -54,6 +49,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "Last";
@@ -68,6 +64,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return false;
@@ -90,6 +87,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -116,6 +114,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java
index 3d0512c..cccafb1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -53,9 +53,7 @@
- /**
- * Creates a new instance of this list tag.
- */
+ /** Creates a new instance of this list tag. */
public ListTag()
{
// No implementation required.
@@ -68,6 +66,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "List";
@@ -82,6 +81,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -104,6 +104,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -129,6 +130,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -205,6 +207,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
index e81ebc1..ddcb82d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -53,10 +53,7 @@
*/
private ByteArrayOutputStream entryOutputStream;
- /**
- * The byte array that will hold the LDIF representation of the next entry to
- * be read.
- */
+ /** The byte array that will hold the LDIF representation of the next entry to be read. */
private ByteBuffer entryBytes;
/** The IOException that should be thrown the next time a read is requested. */
@@ -111,9 +108,8 @@
- /**
- * Closes this input stream so that no more data may be read from it.
- */
+ /** Closes this input stream so that no more data may be read from it. */
+ @Override
public void close()
{
closed = true;
@@ -131,6 +127,7 @@
* @throws IOException If a problem has occurred while generating data for
* use by this input stream.
*/
+ @Override
public int read()
throws IOException
{
@@ -170,6 +167,7 @@
* @throws IOException If a problem has occurred while generating data for
* use by this input stream.
*/
+ @Override
public int read(byte[] b, int off, int len)
throws IOException
{
@@ -196,7 +194,7 @@
- /** {@inheritDoc} */
+ @Override
public boolean writeEntry(TemplateEntry entry)
throws IOException, MakeLDIFException
{
@@ -216,7 +214,7 @@
- /** {@inheritDoc} */
+ @Override
public void closeEntryWriter()
{
allGenerated = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
index 28b7787..2b58ffb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -61,6 +61,7 @@
* Operates in a loop, generating entries and feeding them to the input stream
* until either all entries have been generated or the input stream is closed.
*/
+ @Override
public void run()
{
try
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
index 1145975..fd08edf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ParentDNTag.java
@@ -32,9 +32,7 @@
public class ParentDNTag
extends Tag
{
- /**
- * Creates a new instance of this parent DN tag.
- */
+ /** Creates a new instance of this parent DN tag. */
public ParentDNTag()
{
// No implementation required.
@@ -47,6 +45,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "ParentDN";
@@ -61,6 +60,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return false;
@@ -83,6 +83,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -107,6 +108,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java
index 0e1b1e5..8cab4cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -43,9 +43,7 @@
- /**
- * Creates a new instance of this presence tag.
- */
+ /** Creates a new instance of this presence tag. */
public PresenceTag()
{
percentage = 100;
@@ -58,6 +56,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "Presence";
@@ -72,6 +71,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -94,6 +94,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -119,6 +120,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -189,6 +191,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
index fc9eb89..6fdf838 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
@@ -31,9 +31,7 @@
public class RDNTag
extends Tag
{
- /**
- * Creates a new instance of this RDN tag.
- */
+ /** Creates a new instance of this RDN tag. */
public RDNTag()
{
// No implementation required.
@@ -46,6 +44,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "RDN";
@@ -60,6 +59,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -82,6 +82,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -112,6 +113,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -136,6 +138,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
index dbd8bbf..e4a8642 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -73,69 +73,51 @@
- /**
- * The value that indicates that the value should be a random number.
- */
+ /** The value that indicates that the value should be a random number. */
public static final int RANDOM_TYPE_NUMERIC = 3;
- /**
- * The value that indicates that the value should be a random month.
- */
+ /** The value that indicates that the value should be a random month. */
public static final int RANDOM_TYPE_MONTH = 4;
- /**
- * The value that indicates that the value should be a telephone number.
- */
+ /** The value that indicates that the value should be a telephone number. */
public static final int RANDOM_TYPE_TELEPHONE = 5;
- /**
- * The character set that will be used for alphabetic characters.
- */
+ /** The character set that will be used for alphabetic characters. */
public static final char[] ALPHA_CHARS =
"abcdefghijklmnopqrstuvwxyz".toCharArray();
- /**
- * The character set that will be used for numeric characters.
- */
+ /** The character set that will be used for numeric characters. */
public static final char[] NUMERIC_CHARS = "01234567890".toCharArray();
- /**
- * The character set that will be used for alphanumeric characters.
- */
+ /** The character set that will be used for alphanumeric characters. */
public static final char[] ALPHANUMERIC_CHARS =
"abcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
- /**
- * The character set that will be used for hexadecimal characters.
- */
+ /** The character set that will be used for hexadecimal characters. */
public static final char[] HEX_CHARS = "01234567890abcdef".toCharArray();
- /**
- * The character set that will be used for base64 characters.
- */
+ /** The character set that will be used for base64 characters. */
public static final char[] BASE64_CHARS =
("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" +
"01234567890+/").toCharArray();
- /**
- * The set of month names that will be used.
- */
+ /** The set of month names that will be used. */
public static final String[] MONTHS =
{
"January",
@@ -160,10 +142,7 @@
/** The decimal format used to format numeric values. */
private DecimalFormat decimalFormat;
- /**
- * The number of characters between the minimum and maximum length
- * (inclusive).
- */
+ /** The number of characters between the minimum and maximum length (inclusive). */
private int lengthRange;
/** The maximum number of characters to include in the value. */
@@ -189,9 +168,7 @@
- /**
- * Creates a new instance of this random tag.
- */
+ /** Creates a new instance of this random tag. */
public RandomTag()
{
characterSet = null;
@@ -212,6 +189,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "Random";
@@ -226,6 +204,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -248,6 +227,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -273,6 +253,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -600,6 +581,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java
index d5d983e..b6c5171 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -45,9 +45,7 @@
- /**
- * Creates a new instance of this sequential tag.
- */
+ /** Creates a new instance of this sequential tag. */
public SequentialTag()
{
// No implementation required.
@@ -60,6 +58,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "Sequential";
@@ -74,6 +73,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -96,6 +96,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -121,6 +122,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -213,6 +215,7 @@
* @param parentEntry The entry below which the new entries will be
* generated.
*/
+ @Override
public void initializeForParent(TemplateEntry parentEntry)
{
if (resetOnNewParents)
@@ -232,6 +235,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java
index f8db016..605b7b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -39,9 +39,7 @@
- /**
- * Creates a new instance of this static text tag.
- */
+ /** Creates a new instance of this static text tag. */
public StaticTextTag()
{
text = "";
@@ -54,6 +52,7 @@
*
* @return The name for this tag.
*/
+ @Override
public String getName()
{
return "StaticText";
@@ -68,6 +67,7 @@
* @return <CODE>true</CODE> if this tag may be used in branch definitions,
* or <CODE>false</CODE> if not.
*/
+ @Override
public boolean allowedInBranch()
{
return true;
@@ -90,6 +90,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForBranch(TemplateFile templateFile, Branch branch,
String[] arguments, int lineNumber,
List<LocalizableMessage> warnings)
@@ -122,6 +123,7 @@
* @throws InitializationException If a problem occurs while initializing
* this tag.
*/
+ @Override
public void initializeForTemplate(TemplateFile templateFile,
Template template, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings)
@@ -148,6 +150,7 @@
*
* @return The result of generating content for this tag.
*/
+ @Override
public TagResult generateValue(TemplateEntry templateEntry,
TemplateValue templateValue)
{
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 a35c110..4ff1300 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
@@ -12,30 +12,25 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
-
package org.opends.server.tools.upgrade;
-
+import static com.forgerock.opendj.util.OperatingSystem.*;
import static org.opends.messages.ToolMessages.*;
-import static com.forgerock.opendj.util.OperatingSystem.isUnix;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.FilePermission;
-import org.opends.server.util.StaticUtils;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
-
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.FilePermission;
+import org.opends.server.util.StaticUtils;
/**
* Utility class for use by applications containing methods for managing file
@@ -44,47 +39,28 @@
*/
class FileManager
{
-
- /**
- * Describes the approach taken to deleting a file or directory.
- */
+ /** Describes the approach taken to deleting a file or directory. */
public static enum DeletionPolicy
{
-
- /**
- * Delete the file or directory immediately.
- */
+ /** Delete the file or directory immediately. */
DELETE_IMMEDIATELY,
-
- /**
- * Mark the file or directory for deletion after the JVM has exited.
- */
+ /** Mark the file or directory for deletion after the JVM has exited. */
DELETE_ON_EXIT,
-
/**
* First try to delete the file immediately. If the deletion was
* unsuccessful mark the file for deleteion when the JVM has existed.
*/
DELETE_ON_EXIT_IF_UNSUCCESSFUL
-
}
-
-
- /**
- * Upgrade's Log.
- */
+ /** Upgrade's Log. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
private FileManager()
{
// do nothing;
}
-
-
/**
* Deletes everything below the specified file.
*
@@ -98,16 +74,12 @@
deleteRecursively(file, null, DeletionPolicy.DELETE_IMMEDIATELY);
}
-
-
private static void deleteRecursively(File file, FileFilter filter,
DeletionPolicy deletePolicy) throws IOException
{
operateRecursively(new DeleteOperation(file, deletePolicy), filter);
}
-
-
/**
* Copies everything below the specified file.
*
@@ -129,8 +101,6 @@
return co.getDestination();
}
-
-
private static void operateRecursively(FileOperation op, FileFilter filter)
throws IOException
{
@@ -181,8 +151,6 @@
}
}
-
-
/**
* Renames the source file to the target file. If the target file exists it is
* first deleted. The rename and delete operation return values are checked
@@ -218,18 +186,11 @@
}
}
-
-
- /**
- * A file operation.
- */
+ /** A file operation. */
private static abstract class FileOperation
{
-
private File objectFile;
-
-
/**
* Creates a new file operation.
*
@@ -241,8 +202,6 @@
this.objectFile = objectFile;
}
-
-
/**
* Gets the file to be operated on.
*
@@ -253,8 +212,6 @@
return objectFile;
}
-
-
/**
* Make a copy of this class for the child file.
*
@@ -264,8 +221,6 @@
*/
public abstract FileOperation copyForChild(File child);
-
-
/**
* Execute this operation.
*
@@ -273,23 +228,15 @@
* if there is a problem.
*/
public abstract void apply() throws IOException;
-
}
-
-
- /**
- * A copy operation.
- */
+ /** A copy operation. */
private static class CopyOperation extends FileOperation
{
-
private File destination;
private boolean overwrite;
-
-
/**
* Create a new copy operation.
*
@@ -307,16 +254,12 @@
this.overwrite = overwrite;
}
-
-
- /** {@inheritDoc} */
+ @Override
public FileOperation copyForChild(File child)
{
return new CopyOperation(child, destination, overwrite);
}
-
-
/**
* Returns the destination file that is the result of copying
* <code>objectFile</code> to <code>destDir</code>.
@@ -328,9 +271,7 @@
return this.destination;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void apply() throws IOException
{
final File objectFile = getObjectFile();
@@ -406,11 +347,8 @@
}
}
}
-
}
-
-
/**
* Returns the file permission on the selected file.
*
@@ -434,7 +372,6 @@
return FilePermission.decodeUNIXMode("644");
}
return FilePermission.decodeUNIXMode("755");
-
}
else if (name.endsWith(".sh"))
{
@@ -453,8 +390,6 @@
return FilePermission.decodeUNIXMode("644");
}
-
-
/**
* Creates the parent directory if it does not already exist.
*
@@ -474,18 +409,11 @@
return b;
}
-
-
- /**
- * A delete operation.
- */
+ /** A delete operation. */
private static class DeleteOperation extends FileOperation
{
-
private DeletionPolicy deletionPolicy;
-
-
/**
* Creates a delete operation.
*
@@ -502,17 +430,13 @@
this.deletionPolicy = deletionPolicy;
}
-
-
- /** {@inheritDoc} */
+ @Override
public FileOperation copyForChild(File child)
{
return new DeleteOperation(child, deletionPolicy);
}
-
-
- /** {@inheritDoc} */
+ @Override
public void apply() throws IOException
{
File file = getObjectFile();
@@ -573,5 +497,4 @@
}
}
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java
index f7ac3f4..47b7d98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
-
-
/**
* This class implements an enumeration that may be used for
* configuration items that may have three possible values: accept,
@@ -30,22 +28,10 @@
mayInvoke=true)
public enum AcceptRejectWarn
{
- /**
- * Indicates that elements meeting the associated criteria should be
- * accepted.
- */
+ /** Indicates that elements meeting the associated criteria should be accepted. */
ACCEPT("accept"),
-
-
-
- /**
- * Indicates that elements meeting the associated criteria should be
- * rejected.
- */
+ /** Indicates that elements meeting the associated criteria should be rejected. */
REJECT("reject"),
-
-
-
/**
* Indicates that a warning should be logged if an element meets the
* associated criteria. Whether it will be accepted or rejected
@@ -54,13 +40,9 @@
*/
WARN("warn");
-
-
/** The human-readable name for this policy. */
private String policyName;
-
-
/**
* Creates a new accept/reject/warn policy with the provided name.
*
@@ -71,8 +53,6 @@
this.policyName = policyName;
}
-
-
/**
* Retrieves the accept/reject/warn policy for the specified name.
*
@@ -103,8 +83,6 @@
}
}
-
-
/**
* Retrieves the human-readable name for this accept/reject/warn
* policy.
@@ -112,9 +90,9 @@
* @return The human-readable name for this accept/reject/warn
* policy.
*/
+ @Override
public String toString()
{
return policyName;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java
index bb01c5d..dc483b7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java
@@ -12,14 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.types;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements an enumeration that holds the possible set of
* additional properties that can be included in an account status
@@ -38,9 +36,6 @@
* available for all notification types.
*/
PASSWORD_POLICY_DN("password-policy-dn"),
-
-
-
/**
* The property whose value will be a generalized time
* representation of the time at which the user's account will be
@@ -48,18 +43,12 @@
* {@code ACCOUNT_TEMPORARILY_LOCKED} notification type.
*/
ACCOUNT_UNLOCK_TIME("account-unlock-time"),
-
-
-
/**
* The property whose value will be the number of seconds until the
* user's account is unlocked. This will be available for the
* {@code ACCOUNT_TEMPORARILY_LOCKED} notification type.
*/
SECONDS_UNTIL_UNLOCK("seconds-until-unlock"),
-
-
-
/**
* The property whose value will be a localized, human-readable
* representation of the length of time until the user's account is
@@ -67,9 +56,6 @@
* {@code ACCOUNT_TEMPORARILY_LOCKED} notification type.
*/
TIME_UNTIL_UNLOCK("time-until-unlock"),
-
-
-
/**
* The property whose value will be the generalized time
* representation of the time that the user's password will expire.
@@ -77,18 +63,12 @@
* notification type.
*/
PASSWORD_EXPIRATION_TIME("password-expiration-time"),
-
-
-
/**
* The property whose value will be the number of seconds until the
* user's password expires. This will be available for the
* {@code PASSWORD_EXPIRING} notification type.
*/
SECONDS_UNTIL_EXPIRATION("seconds-until-expiration"),
-
-
-
/**
* The property whose value will be a localized, human-readable
* representation of the length of time until the user's password
@@ -96,9 +76,6 @@
* {@code PASSWORD_EXPIRING} notification type.
*/
TIME_UNTIL_EXPIRATION("time-until-expiration"),
-
-
-
/**
* The property whose value will be a clear-text representation of
* the user's old password. This may be available for the
@@ -106,9 +83,6 @@
* types.
*/
OLD_PASSWORD("old-password"),
-
-
-
/**
* The property whose value will be a clear-text representation of
* the user's new password. This may be available for the
@@ -117,13 +91,9 @@
*/
NEW_PASSWORD("new-password");
-
-
/** The notification type name. */
private String name;
-
-
/**
* Creates a new account status notification property with the
* provided name.
@@ -136,8 +106,6 @@
this.name = name;
}
-
-
/**
* Retrieves the account status notification type with the specified
* name.
@@ -151,51 +119,31 @@
*/
public static AccountStatusNotificationProperty forName(String name)
{
- String lowerName = toLowerCase(name);
- if (lowerName.equals("password-policy-dn"))
+ switch (toLowerCase(name))
{
+ case "password-policy-dn":
return PASSWORD_POLICY_DN;
- }
- else if (lowerName.equals("account-unlock-time"))
- {
+ case "account-unlock-time":
return ACCOUNT_UNLOCK_TIME;
- }
- else if (lowerName.equals("seconds-until-unlock"))
- {
+ case "seconds-until-unlock":
return SECONDS_UNTIL_UNLOCK;
- }
- else if (lowerName.equals("time-until-unlock"))
- {
+ case "time-until-unlock":
return TIME_UNTIL_UNLOCK;
- }
- else if (lowerName.equals("password-expiration-time"))
- {
+ case "password-expiration-time":
return PASSWORD_EXPIRATION_TIME;
- }
- else if (lowerName.equals("seconds-until-expiration"))
- {
+ case "seconds-until-expiration":
return SECONDS_UNTIL_EXPIRATION;
- }
- else if (lowerName.equals("time-until-expiration"))
- {
+ case "time-until-expiration":
return TIME_UNTIL_EXPIRATION;
- }
- else if (lowerName.equals("old-password"))
- {
+ case "old-password":
return OLD_PASSWORD;
- }
- else if (lowerName.equals("new-password"))
- {
+ case "new-password":
return NEW_PASSWORD;
- }
- else
- {
+ default:
return null;
}
}
-
-
/**
* Retrieves the name for this account status notification property.
*
@@ -206,18 +154,9 @@
return name;
}
-
-
- /**
- * Retrieves a string representation of this account status
- * notification property.
- *
- * @return A string representation of this account status
- * notification property.
- */
+ @Override
public String toString()
{
return name;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java
index c499a36..d3fedc1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java
@@ -12,14 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements an enumeration that holds the possible event
* types that can trigger an account status notification.
@@ -37,36 +35,23 @@
* many failed attempts.
*/
ACCOUNT_TEMPORARILY_LOCKED("account-temporarily-locked"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user account has been permanently locked after too
* many failed attempts.
*/
- ACCOUNT_PERMANENTLY_LOCKED(
- "account-permanently-locked"),
-
-
-
+ ACCOUNT_PERMANENTLY_LOCKED("account-permanently-locked"),
/**
* Indicates that an account status message should be generated
* whenever a user account has been unlocked by an administrator.
*/
ACCOUNT_UNLOCKED("account-unlocked"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user account has been locked because it was idle for
* too long.
*/
ACCOUNT_IDLE_LOCKED("account-idle-locked"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user account has been locked because it the password
@@ -74,25 +59,16 @@
* within the required interval.
*/
ACCOUNT_RESET_LOCKED("account-reset-locked"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user account has been disabled by an administrator.
*/
ACCOUNT_DISABLED("account-disabled"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user account has been enabled by an administrator.
*/
ACCOUNT_ENABLED("account-enabled"),
-
-
-
/**
* Indicates that an account status message should be generated
* whenever a user authentication has failed because the account
@@ -100,49 +76,33 @@
*/
ACCOUNT_EXPIRED("account-expired"),
-
-
/**
* Indicates that an account status notification message should be
* generated whenever a user authentication has failed because the
* password has expired.
*/
PASSWORD_EXPIRED("password-expired"),
-
-
-
-
/**
* Indicates that an account status notification message should be
* generated the first time that a password expiration warning is
* encountered for a user password.
*/
PASSWORD_EXPIRING("password-expiring"),
-
-
-
/**
* Indicates that an account status notification message should be
* generated whenever a user's password is reset by an
* administrator.
*/
PASSWORD_RESET("password-reset"),
-
-
-
/**
* Indicates whether an account status notification message should
* be generated whenever a user changes his/her own password.
*/
PASSWORD_CHANGED("password-changed");
-
-
/** The notification type name. */
private String name;
-
-
/**
* Creates a new account status notification type with the provided
* name.
@@ -154,8 +114,6 @@
this.name = name;
}
-
-
/**
* Retrieves the account status notification type with the specified
* name.
@@ -169,63 +127,37 @@
*/
public static AccountStatusNotificationType typeForName(String name)
{
- String lowerName = toLowerCase(name);
- if (lowerName.equals("account-temporarily-locked"))
+ switch (toLowerCase(name))
{
+ case "account-temporarily-locked":
return ACCOUNT_TEMPORARILY_LOCKED;
- }
- else if (lowerName.equals("account-permanently-locked"))
- {
+ case "account-permanently-locked":
return ACCOUNT_PERMANENTLY_LOCKED;
- }
- else if (lowerName.equals("account-unlocked"))
- {
+ case "account-unlocked":
return ACCOUNT_UNLOCKED;
- }
- else if (lowerName.equals("account-idle-locked"))
- {
+ case "account-idle-locked":
return ACCOUNT_IDLE_LOCKED;
- }
- else if (lowerName.equals("account-reset-locked"))
- {
+ case "account-reset-locked":
return ACCOUNT_RESET_LOCKED;
- }
- else if (lowerName.equals("account-disabled"))
- {
+ case "account-disabled":
return ACCOUNT_DISABLED;
- }
- else if (lowerName.equals("account-enabled"))
- {
+ case "account-enabled":
return ACCOUNT_ENABLED;
- }
- else if (lowerName.equals("account-expired"))
- {
+ case "account-expired":
return ACCOUNT_EXPIRED;
- }
- else if (lowerName.equals("password-expired"))
- {
+ case "password-expired":
return PASSWORD_EXPIRED;
- }
- else if (lowerName.equals("password-expiring"))
- {
+ case "password-expiring":
return PASSWORD_EXPIRING;
- }
- else if (lowerName.equals("password-reset"))
- {
+ case "password-reset":
return PASSWORD_RESET;
- }
- else if (lowerName.equals("password-changed"))
- {
+ case "password-changed":
return PASSWORD_CHANGED;
- }
- else
- {
+ default:
return null;
}
}
-
-
/**
* Retrieves the name for this account status notification type.
*
@@ -236,18 +168,9 @@
return name;
}
-
-
- /**
- * Retrieves a string representation of this account status
- * notification type.
- *
- * @return A string representation of this account status
- * notification type.
- */
+ @Override
public String toString()
{
return name;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java
index 9751647..a17379f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
-
-
/**
* This enumeration defines the set of possible authentication types
* that may be used for a bind request. This is based on the LDAP
@@ -36,29 +34,21 @@
*/
SIMPLE((byte) 0x80),
-
-
/**
* The authentication type that indicates that the user will be
* performing SASL authentication using some extensible mechanism.
*/
SASL((byte) 0xA3),
-
-
/**
* The authentication type that indicates that the associated
* connection is an internal connection.
*/
INTERNAL((byte) 0xFF);
-
-
/** The BER type tag that is associated with this authentication type. */
private byte berType;
-
-
/**
* Creates a new authentication type with the provided BER type tag.
*
@@ -70,27 +60,17 @@
this.berType = berType;
}
-
-
/**
- * Retrieves the BER type tag associated with this authentication
- * type.
+ * Retrieves the BER type tag associated with this authentication type.
*
- * @return The BER type tag associated with this authentication
- * type.
+ * @return The BER type tag associated with this authentication type.
*/
public int getBERType()
{
return berType;
}
-
-
- /**
- * Retrieves a string representation of this authentication type.
- *
- * @return A string representation of this authentication type.
- */
+ @Override
public String toString()
{
switch (berType)
@@ -106,4 +86,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java
index 3b7e199..a58d4f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java
@@ -12,32 +12,26 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TimeZone;
-
-import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.util.Base64;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.TimeZone;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.opends.server.util.Base64;
/**
* This class defines a data structure for holding information about a
@@ -52,99 +46,44 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
- /**
- * The name of the property that holds the date that the backup was
- * created.
- */
+ /** The name of the property that holds the date that the backup was created. */
public static final String PROPERTY_BACKUP_DATE = "backup_date";
-
-
-
- /**
- * The name of the property that holds the backup ID in encoded
- * representations.
- */
+ /** The name of the property that holds the backup ID in encoded representations. */
public static final String PROPERTY_BACKUP_ID = "backup_id";
-
-
- /**
- * The name of the property that holds the incremental flag in
- * encoded representations.
- */
+ /** The name of the property that holds the incremental flag in encoded representations. */
public static final String PROPERTY_IS_INCREMENTAL = "incremental";
-
-
-
- /**
- * The name of the property that holds the compressed flag in
- * encoded representations.
- */
+ /** The name of the property that holds the compressed flag in encoded representations. */
public static final String PROPERTY_IS_COMPRESSED = "compressed";
-
-
-
- /**
- * The name of the property that holds the encrypted flag in encoded
- * representations.
- */
+ /** The name of the property that holds the encrypted flag in encoded representations. */
public static final String PROPERTY_IS_ENCRYPTED = "encrypted";
-
-
-
- /**
- * The name of the property that holds the unsigned hash in encoded
- * representations.
- */
+ /** The name of the property that holds the unsigned hash in encoded representations. */
public static final String PROPERTY_UNSIGNED_HASH = "hash";
-
-
-
- /**
- * The name of the property that holds the signed hash in encoded
- * representations.
- */
+ /** The name of the property that holds the signed hash in encoded representations. */
public static final String PROPERTY_SIGNED_HASH = "signed_hash";
-
-
-
/**
* The name of the property that holds the set of dependencies in
* encoded representations (one dependency per instance).
*/
public static final String PROPERTY_DEPENDENCY = "dependency";
-
-
-
/**
* The prefix to use with custom backup properties. The name of the
* property will be appended to this prefix.
*/
public static final String PROPERTY_CUSTOM_PREFIX = "property.";
-
-
- /**
- * The backup directory with which this backup info structure is
- * associated.
- */
+ /** The backup directory with which this backup info structure is associated. */
private BackupDirectory backupDirectory;
/** Indicates whether this backup is compressed. */
private boolean isCompressed;
-
/** Indicates whether this backup is encrypted. */
private boolean isEncrypted;
-
/** Indicates whether this is an incremental backup. */
private boolean isIncremental;
/** The signed hash for this backup, if appropriate. */
private byte[] signedHash;
-
/** The unsigned hash for this backup, if appropriate. */
private byte[] unsignedHash;
@@ -167,8 +106,6 @@
/** The unique ID for this backup. */
private String backupID;
-
-
/**
* Creates a new backup info structure with the provided
* information.
@@ -232,8 +169,6 @@
}
}
-
-
/**
* Retrieves the reference to the backup directory in which this
* backup is stored.
@@ -246,8 +181,6 @@
return backupDirectory;
}
-
-
/**
* Retrieves the unique ID for this backup.
*
@@ -258,8 +191,6 @@
return backupID;
}
-
-
/**
* Retrieves the date that this backup was created.
*
@@ -270,8 +201,6 @@
return backupDate;
}
-
-
/**
* Indicates whether this is an incremental or a full backup.
*
@@ -283,8 +212,6 @@
return isIncremental;
}
-
-
/**
* Indicates whether this backup is compressed.
*
@@ -296,8 +223,6 @@
return isCompressed;
}
-
-
/**
* Indicates whether this backup is encrypted.
*
@@ -309,8 +234,6 @@
return isEncrypted;
}
-
-
/**
* Retrieves the data for the unsigned hash for this backup, if
* appropriate.
@@ -323,8 +246,6 @@
return unsignedHash;
}
-
-
/**
* Retrieves the data for the signed hash for this backup, if
* appropriate.
@@ -337,8 +258,6 @@
return signedHash;
}
-
-
/**
* Retrieves the set of the backup IDs for the backups on which this
* backup is dependent. This is primarily intended for use with
@@ -355,8 +274,6 @@
return dependencies;
}
-
-
/**
* Indicates whether this backup has a dependency on the backup with
* the provided ID.
@@ -373,8 +290,6 @@
return dependencies.contains(backupID);
}
-
-
/**
* Retrieves a set of additional properties that should be
* associated with this backup. This may be used by the backend to
@@ -393,8 +308,6 @@
return backupProperties;
}
-
-
/**
* Retrieves the value of the backup property with the specified
* name.
@@ -409,8 +322,6 @@
return backupProperties.get(name);
}
-
-
/**
* Encodes this backup info structure to a multi-line string
* representation. This representation may be parsed by the
@@ -468,8 +379,6 @@
return list;
}
-
-
/**
* Decodes the provided list of strings as the representation of a
* backup info structure.
@@ -593,7 +502,6 @@
throw new ConfigException(message, e);
}
-
// There must have been at least a backup ID and backup date
// specified.
if (backupID == null)
@@ -609,15 +517,12 @@
throw new ConfigException(message);
}
-
return new BackupInfo(backupDirectory, backupID, backupDate,
isIncremental, isCompressed, isEncrypted,
unsignedHash, signedHash, dependencies,
backupProperties);
}
-
-
/**
* Retrieves a multi-line string representation of this backup info
* structure.
@@ -625,6 +530,7 @@
* @return A multi-line string representation of this backup info
* structure.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
@@ -632,8 +538,6 @@
return buffer.toString();
}
-
-
/**
* Appends a multi-line string representation of this backup info
* structure to the provided buffer.
@@ -651,4 +555,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java
index 2ac71c3..4d40c12 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -213,6 +213,7 @@
*
* @return A string representation of this disconnect reason.
*/
+ @Override
public String toString()
{
return message.toString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
index cd3fb23..9a1a177 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
@@ -12,19 +12,18 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.types;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.forgerock.opendj.ldap.ByteSequenceReader;
+import static org.opends.messages.CoreMessages.*;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.api.CompressedSchema;
import org.opends.server.core.DirectoryServer;
-import static org.opends.messages.CoreMessages.*;
-
/**
* This class defines a data structure that contains configuration
* information about how an entry should be encoded.
@@ -61,10 +60,7 @@
- /**
- * A reference to an entry encode configuration with all the default
- * settings.
- */
+ /** A reference to an entry encode configuration with all the default settings. */
public static final EntryEncodeConfig
DEFAULT_CONFIG = new EntryEncodeConfig();
@@ -87,10 +83,7 @@
- /**
- * Creates a new encoded entry configuration with the default
- * settings.
- */
+ /** Creates a new encoded entry configuration with the default settings. */
public EntryEncodeConfig()
{
excludeDN = false;
@@ -303,13 +296,7 @@
return (b & flag) == flag;
}
- /**
- * Retrieves a string representation of this entry encode
- * configuration.
- *
- * @return A string representation of this entry encode
- * configuration.
- */
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
@@ -317,8 +304,6 @@
return buffer.toString();
}
-
-
/**
* Appends a string representation of this entry encode
* configuration to the provided buffer.
@@ -337,4 +322,3 @@
buffer.append(")");
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java
index 6538eb1..ca7550b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -37,10 +37,7 @@
- /**
- * The file behavior that indicates that the data written should
- * overwrite any existing file.
- */
+ /** The file behavior that indicates that the data written should overwrite any existing file. */
OVERWRITE("overwrite"),
@@ -87,6 +84,7 @@
*
* @return A string representation of this existing file behavior.
*/
+ @Override
public String toString()
{
return name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java
index 828f30a..b7bc117 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java
@@ -12,14 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
-
-
/**
* This enumeration defines the set of possible filter types that may
* be used for search filters. This is based on the LDAP
@@ -32,81 +30,30 @@
mayInvoke=true)
public enum FilterType
{
- /**
- * The filter type for AND filters.
- */
+ /** The filter type for AND filters. */
AND(TYPE_FILTER_AND),
-
-
-
- /**
- * The filter type for OR filters.
- */
+ /** The filter type for OR filters. */
OR(TYPE_FILTER_OR),
-
-
-
- /**
- * The filter type for NOT filters.
- */
+ /** The filter type for NOT filters. */
NOT(TYPE_FILTER_NOT),
-
-
-
- /**
- * The filter type for equality filters.
- */
+ /** The filter type for equality filters. */
EQUALITY(TYPE_FILTER_EQUALITY),
-
-
-
- /**
- * The filter type for substring filters.
- */
+ /** The filter type for substring filters. */
SUBSTRING(TYPE_FILTER_SUBSTRING),
-
-
-
- /**
- * The filter type for greater or equal filters.
- */
+ /** The filter type for greater or equal filters. */
GREATER_OR_EQUAL(TYPE_FILTER_GREATER_OR_EQUAL),
-
-
-
- /**
- * The filter type for less or equal filters.
- */
+ /** The filter type for less or equal filters. */
LESS_OR_EQUAL(TYPE_FILTER_LESS_OR_EQUAL),
-
-
-
- /**
- * The filter type for presence filters.
- */
+ /** The filter type for presence filters. */
PRESENT(TYPE_FILTER_PRESENCE),
-
-
-
- /**
- * The filter type for approximate filters.
- */
+ /** The filter type for approximate filters. */
APPROXIMATE_MATCH(TYPE_FILTER_APPROXIMATE),
-
-
-
- /**
- * The filter type for extensible matching filters.
- */
+ /** The filter type for extensible matching filters. */
EXTENSIBLE_MATCH(TYPE_FILTER_EXTENSIBLE_MATCH);
-
-
/** The LDAP BER type for this filter type. */
private byte berType;
-
-
/**
* Creates a new filter type with the provided BER type.
*
@@ -117,8 +64,6 @@
this.berType = berType;
}
-
-
/**
* Retrieves the LDAP BER type for this filter type.
*
@@ -129,13 +74,12 @@
return berType;
}
-
-
/**
* Retrieves a string representation of this filter type.
*
* @return A string representation of this filter type.
*/
+ @Override
public String toString()
{
switch (berType)
@@ -165,4 +109,3 @@
}
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
index 5110395..41fd028 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -196,6 +196,7 @@
*
* @return The human-readable name for this index type.
*/
+ @Override
public String toString()
{
return indexName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
index 1145341..64861c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -164,6 +164,7 @@
*
* @return A string representation of this intermediate response.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java
index dc22326..6ec5c4a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -122,6 +122,7 @@
* @return A string representation of this LDIF import result
* object.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java
index 3d25010..4154105 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
@@ -30,26 +30,17 @@
mayInvoke=true)
public enum LockType
{
- /**
- * The lock type that indicates that a read lock should be obtained
- * for the associated object.
- */
+ /** The lock type that indicates that a read lock should be obtained for the associated object. */
READ("Read"),
- /**
- * The lock type that indicates that a write lock should be obtained
- * for the associated object.
- */
+ /** The lock type that indicates that a write lock should be obtained for the associated object. */
WRITE("Write"),
- /**
- * The lock type that indicates that no lock should be obtained for
- * the associated object.
- */
+ /** The lock type that indicates that no lock should be obtained for the associated object. */
NONE("None");
@@ -88,6 +79,7 @@
*
* @return A string representation of this lock type element.
*/
+ @Override
public String toString()
{
return name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java
index 702f0dc..fb54fe5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
-
-
/**
* This enumeration defines the set of possible operation types that
* may be processed by the Directory Server.
@@ -29,81 +27,30 @@
mayInvoke=true)
public enum OperationType
{
- /**
- * The operation type for abandon operations.
- */
+ /** The operation type for abandon operations. */
ABANDON("ABANDON"),
-
-
-
- /**
- * The operation type for add operations.
- */
+ /** The operation type for add operations. */
ADD("ADD"),
-
-
-
- /**
- * The operation type for bind operations.
- */
+ /** The operation type for bind operations. */
BIND("BIND"),
-
-
-
- /**
- * The operation type for compare operations.
- */
+ /** The operation type for compare operations. */
COMPARE("COMPARE"),
-
-
-
- /**
- * The operation type for delete operations.
- */
+ /** The operation type for delete operations. */
DELETE("DELETE"),
-
-
-
- /**
- * The operation type for extended operations.
- */
+ /** The operation type for extended operations. */
EXTENDED("EXTENDED"),
-
-
-
- /**
- * The operation type for modify operations.
- */
+ /** The operation type for modify operations. */
MODIFY("MODIFY"),
-
-
-
- /**
- * The operation type for modify DN operations.
- */
+ /** The operation type for modify DN operations. */
MODIFY_DN("MODIFYDN"),
-
-
-
- /**
- * The operation type for search operations.
- */
+ /** The operation type for search operations. */
SEARCH("SEARCH"),
-
-
-
- /**
- * The operation type for unbind operations.
- */
+ /** The operation type for unbind operations. */
UNBIND("UNBIND");
-
-
/** The string representation of this operation type. */
private final String operationName;
-
-
/**
* Creates a new operation type with the provided operation name.
*
@@ -115,8 +62,6 @@
this.operationName = operationName;
}
-
-
/**
* Retrieves the human-readable name for this operation type.
*
@@ -127,16 +72,14 @@
return operationName;
}
-
-
/**
* Retrieves a string representation of this operation type.
*
* @return A string representation of this operation type.
*/
+ @Override
public final String toString()
{
return operationName;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
index 26624e9..77162bc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
@@ -12,12 +12,10 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.types;
-
-
/**
* This enumeration defines a policy that indicates how the server
* should deal with SSL/TLS-based client connections. It is used to
@@ -32,22 +30,13 @@
mayInvoke=true)
public enum SSLClientAuthPolicy
{
- /**
- * Indicates that the server will not request a certificate from the
- * client.
- */
+ /** Indicates that the server will not request a certificate from the client. */
DISABLED("Disabled"),
-
-
-
/**
* Indicates that the server will request a certificate from the
* client but will not require that one be provided.
*/
OPTIONAL("Optional"),
-
-
-
/**
* Indicates that the server will request a certificate from the
* client and will reject any connection attempt in which the client
@@ -55,13 +44,9 @@
*/
REQUIRED("Required");
-
-
/** The human-readable name for this policy. */
private String policyName;
-
-
/**
* Creates a new SSL client auth policy with the provided name.
*
@@ -72,8 +57,6 @@
this.policyName = policyName;
}
-
-
/**
* Retrieves the SSL client authentication policy for the specified
* name.
@@ -110,17 +93,15 @@
}
}
-
-
/**
* Retrieves the human-readable name for this SSL client auth
* policy.
*
* @return The human-readable name for this SSL client auth policy.
*/
+ @Override
public String toString()
{
return policyName;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java
index bb96a55..76274a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java
@@ -20,8 +20,6 @@
import org.forgerock.opendj.ldap.DN;
-
-
/**
* This abstract class defines methods for a change record entry. It
* includes operations to get the DN, as well as methods to
@@ -37,7 +35,6 @@
/** The DN for this entry. */
private DN dn;
-
/**
* Creates a new change record entry with the provided information.
*
@@ -50,7 +47,6 @@
this.dn = dn;
}
-
/**
* Retrieves the distinguished name for this entry.
*
@@ -61,8 +57,6 @@
return dn;
}
-
-
/**
* Retrieves the name of the change operation type.
*
@@ -70,13 +64,6 @@
*/
public abstract ChangeOperationType getChangeOperationType();
-
-
- /**
- * Retrieves a string representation of this change record entry.
- *
- * @return A string representation of this change record entry.
- */
+ @Override
public abstract String toString();
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
index 6d781d2..222f168 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
@@ -51,6 +51,7 @@
*
* @return The name of the change operation type.
*/
+ @Override
public ChangeOperationType getChangeOperationType()
{
return ChangeOperationType.DELETE;
@@ -58,7 +59,6 @@
- /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java
index 377fc4d..2e55493 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.util;
@@ -78,6 +78,7 @@
* @throws CertificateException If the client certificate chain is not
* trusted.
*/
+ @Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
@@ -119,6 +120,7 @@
* @throws CertificateException If the server certificate chain is not
* trusted.
*/
+ @Override
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
@@ -155,6 +157,7 @@
* @return A non-null (possibly empty) array of acceptable CA issuer
* certificates.
*/
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
return trustManager.getAcceptedIssuers();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
index 83014d9..a32ead1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
@@ -76,7 +76,6 @@
* Get the new RDN for the requested modify DN operation.
*
* @return the new RDN.
- *
*/
public RDN getNewRDN()
{
@@ -88,7 +87,6 @@
* Get the new superior DN for the requested modify DN operation.
*
* @return the new superior DN, or <CODE>null</CODE> if there is none.
- *
*/
public DN getNewSuperiorDN()
{
@@ -100,7 +98,6 @@
* Get the new RDN for the requested modify DN operation.
*
* @return the new RDN.
- *
*/
public boolean deleteOldRDN()
{
@@ -113,6 +110,7 @@
*
* @return The name of the change operation type.
*/
+ @Override
public ChangeOperationType getChangeOperationType()
{
return ChangeOperationType.MODIFY_DN;
@@ -120,7 +118,6 @@
- /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java
index 87b08fa..595bf62 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.util;
@@ -63,9 +63,8 @@
- /**
- * Closes all of the underlying output streams.
- */
+ /** Closes all of the underlying output streams. */
+ @Override
public void close()
{
for (OutputStream s : targetStreams)
@@ -83,9 +82,8 @@
- /**
- * Flushes all of the underlying output streams.
- */
+ /** Flushes all of the underlying output streams. */
+ @Override
public void flush()
{
for (OutputStream s : targetStreams)
@@ -109,6 +107,7 @@
*
* @param b The byte array containing the data to be written.
*/
+ @Override
public void write(byte[] b)
{
for (OutputStream s : targetStreams)
@@ -134,6 +133,7 @@
* @param off The position at which the data to write begins in the array.
* @param len The number of bytes to b written.
*/
+ @Override
public void write(byte[] b, int off, int len)
{
for (OutputStream s : targetStreams)
@@ -156,6 +156,7 @@
*
* @param b The byte to be written.
*/
+ @Override
public void write(int b)
{
for (OutputStream s : targetStreams)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java
index 3ab315d..17a449d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java
@@ -12,16 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.util;
import java.io.InputStream;
import java.io.IOException;
-/**
- * An implementation of input stream that enforces an read size limit.
- */
+/** An implementation of input stream that enforces an read size limit. */
public class SizeLimitInputStream extends InputStream
{
private int bytesRead;
@@ -43,7 +41,7 @@
this.readLimit = readLimit;
}
- /** {@inheritDoc} */
+ @Override
public int available() throws IOException
{
int streamAvail = parentStream.available();
@@ -51,14 +49,14 @@
return limitedAvail < streamAvail ? limitedAvail : streamAvail;
}
- /** {@inheritDoc} */
+ @Override
public synchronized void mark(int readlimit)
{
parentStream.mark(readlimit);
markBytesRead = bytesRead;
}
- /** {@inheritDoc} */
+ @Override
public int read() throws IOException
{
if(bytesRead >= readLimit)
@@ -74,7 +72,7 @@
return b;
}
- /** {@inheritDoc} */
+ @Override
public int read(byte b[], int off, int len) throws IOException
{
if(off < 0 || len < 0 || off+len > b.length)
@@ -105,14 +103,14 @@
return readLen;
}
- /** {@inheritDoc} */
+ @Override
public synchronized void reset() throws IOException
{
parentStream.reset();
bytesRead = markBytesRead;
}
- /** {@inheritDoc} */
+ @Override
public long skip(long n) throws IOException
{
if(bytesRead + n > readLimit)
@@ -124,12 +122,12 @@
return parentStream.skip(n);
}
- /** {@inheritDoc} */
+ @Override
public boolean markSupported() {
return parentStream.markSupported();
}
- /** {@inheritDoc} */
+ @Override
public void close() throws IOException {
parentStream.close();
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java b/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java
index c724f1a..ce51f6a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java
@@ -12,16 +12,17 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server;
-import org.opends.server.loggers.TextWriter;
-
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import java.util.ArrayList;
+import org.opends.server.loggers.TextWriter;
+
+@SuppressWarnings("javadoc")
public class TestTextWriter implements TextWriter
{
/** The list that will hold the messages logged. */
@@ -32,24 +33,25 @@
messageList = new LinkedList<>();
}
+ @Override
public synchronized void writeRecord(String record)
{
messageList.add(record);
}
- /** {@inheritDoc} */
+ @Override
public void flush()
{
// No implementation is required.
}
- /** {@inheritDoc} */
+ @Override
public void shutdown()
{
messageList.clear();
}
- /** {@inheritDoc} */
+ @Override
public long getBytesWritten()
{
// No implementation is required. Just return 0;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
index b62dc6b..fa90526 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
@@ -16,52 +16,33 @@
*/
package org.opends.server.api;
+import static org.testng.Assert.*;
+
import java.util.LinkedHashMap;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.DN;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.DummyAlertHandler;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import org.opends.server.TestCaseUtils;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.AlertGenerator;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.extensions.DummyAlertHandler;
-import org.forgerock.opendj.ldap.DN;
-
-import static org.testng.Assert.*;
-
-
-
-/**
- * A set of generic alert handler test cases.
- */
+/** A set of generic alert handler test cases. */
public class AlertHandlerTestCase
extends APITestCase
implements AlertGenerator
{
-
- /**
- * The alert type to use for these tests.
- */
+ /** The alert type to use for these tests. */
public static final String ALERT_TYPE = "org.opends.test.TestAlert";
-
-
- /**
- * The alert description to use for these tests.
- */
+ /** The alert description to use for these tests. */
public static final String ALERT_DESCRIPTION =
"This is the alert description";
-
-
- /**
- * The alert message to use for these tests.
- */
+ /** The alert message to use for these tests. */
public static final LocalizableMessage ALERT_MESSAGE = LocalizableMessage.raw("This is the alert message");
-
-
/**
* Ensures that the Directory Server is running and registers with it as an
* alert generator.
@@ -76,8 +57,6 @@
DirectoryServer.registerAlertGenerator(this);
}
-
-
/**
* Tests the ability of the alert handler to send an administrative alert
* with no special configuration.
@@ -91,11 +70,7 @@
assertEquals(DummyAlertHandler.getAlertCount(), count+1);
}
-
-
- /**
- * Tests alert handler functionality when a given alert is explicitly enabled.
- */
+ /** Tests alert handler functionality when a given alert is explicitly enabled. */
@Test
public void testEnabledAlert()
{
@@ -120,8 +95,6 @@
}
}
-
-
/**
* Tests alert handler functionality when a given alert is not explicitly
* enabled but others are.
@@ -150,12 +123,7 @@
}
}
-
-
- /**
- * Tests alert handler functionality when a given alert is explicitly
- * disabled.
- */
+ /** Tests alert handler functionality when a given alert is explicitly disabled. */
@Test
public void testDisabledAlert()
{
@@ -180,8 +148,6 @@
}
}
-
-
/**
* Tests alert handler functionality when a given alert is not explicitly
* disabled but others are.
@@ -210,12 +176,7 @@
}
}
-
-
- /**
- * Tests alert handler functionality when a given alert is both enabled and
- * disabled.
- */
+ /** Tests alert handler functionality when a given alert is both enabled and disabled. */
@Test
public void testEnabledAndDisabledAlert()
{
@@ -242,8 +203,6 @@
}
}
-
-
/**
* Retrieves the DN of the configuration entry with which this alert
* generator is associated.
@@ -251,6 +210,7 @@
* @return The DN of the configuration entry with which this alert
* generator is associated.
*/
+ @Override
@Test // TestNG treats this as a test, so we annotate it to eliminate warnings
public DN getComponentEntryDN()
{
@@ -264,8 +224,6 @@
}
}
-
-
/**
* Retrieves the fully-qualified name of the Java class for this
* alert generator implementation.
@@ -273,14 +231,13 @@
* @return The fully-qualified name of the Java class for this
* alert generator implementation.
*/
+ @Override
@Test // TestNG treats this as a test, so we annotate it to eliminate warnings
public String getClassName()
{
return getClass().getName();
}
-
-
/**
* Retrieves information about the set of alerts that this generator
* may produce. The map returned should be between the notification
@@ -292,6 +249,7 @@
* @return Information about the set of alerts that this generator
* may produce.
*/
+ @Override
@Test // TestNG treats this as a test, so we annotate it to eliminate warnings
public LinkedHashMap<String,String> getAlerts()
{
@@ -302,4 +260,3 @@
return alerts;
}
}
-
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 e9b49fa..d164dce 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
@@ -20,31 +20,24 @@
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
-
-/**
- * Test authentication policy interaction.
- */
+/** Test authentication policy interaction. */
public class AuthenticationPolicyTestCase extends APITestCase
{
-
- /**
- * A mock policy which records which methods have been called and their
- * parameters.
- */
+ /** A mock policy which records which methods have been called and their parameters. */
private final class MockPolicy extends AuthenticationPolicy
{
private final boolean isDisabled;
@@ -53,7 +46,6 @@
private boolean isStateFinalized;
private ByteString matchedPassword;
-
/**
* Returns {@code true} if {@code finalizeAuthenticationPolicy} was called.
*
@@ -64,8 +56,6 @@
return isPolicyFinalized;
}
-
-
/**
* Returns {@code true} if {@code finalizeStateAfterBind} was called.
*
@@ -76,8 +66,6 @@
return isStateFinalized;
}
-
-
/**
* Returns the password which was tested.
*
@@ -88,8 +76,6 @@
return matchedPassword;
}
-
-
/**
* Creates a new mock policy.
*
@@ -104,24 +90,20 @@
this.isDisabled = isDisabled;
}
-
-
- /** {@inheritDoc} */
+ @Override
public DN getDN()
{
return policyDN;
}
-
-
- /** {@inheritDoc} */
+ @Override
public AuthenticationPolicyState createAuthenticationPolicyState(
Entry userEntry, long time) throws DirectoryException
{
return new AuthenticationPolicyState(userEntry)
{
- /** {@inheritDoc} */
+ @Override
public boolean passwordMatches(ByteString password)
throws DirectoryException
{
@@ -129,25 +111,19 @@
return matches;
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isDisabled()
{
return MockPolicy.this.isDisabled;
}
-
-
- /** {@inheritDoc} */
+ @Override
public void finalizeStateAfterBind() throws DirectoryException
{
isStateFinalized = true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public AuthenticationPolicy getAuthenticationPolicy()
{
return MockPolicy.this;
@@ -155,24 +131,17 @@
};
}
-
-
- /** {@inheritDoc} */
+ @Override
public void finalizeAuthenticationPolicy()
{
isPolicyFinalized = true;
}
-
}
-
-
private final String policyDNString = "cn=test policy,o=test";
private final String userDNString = "cn=test user,o=test";
private DN policyDN;
-
-
/**
* Ensures that the Directory Server is running and creates a test backend
* containing a single test user.
@@ -188,8 +157,6 @@
policyDN = DN.valueOf(policyDNString);
}
-
-
/**
* Returns test data for the simple/sasl tests.
*
@@ -209,8 +176,6 @@
// @formatter:on
}
-
-
/**
* Test simple authentication where password validation succeeds.
*
@@ -232,9 +197,7 @@
// Create an empty test backend 'o=test'
TestCaseUtils.initializeTestBackend(true);
- /*
- * The test user which who will be authenticated.
- */
+ /* The test user which who will be authenticated. */
TestCaseUtils.addEntries(
/* @formatter:off */
"dn: " + userDNString,
@@ -279,8 +242,6 @@
}
}
-
-
/**
* Test simple authentication where password validation succeeds.
*
@@ -302,9 +263,7 @@
// Create an empty test backend 'o=test'
TestCaseUtils.initializeTestBackend(true);
- /*
- * The test user which who will be authenticated.
- */
+ /* The test user which who will be authenticated. */
TestCaseUtils.addEntries(
/* @formatter:off */
"dn: " + userDNString,
@@ -356,5 +315,4 @@
assertTrue(policy.isPolicyFinalized());
}
}
-
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
index dbe4dc0..0302b1c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=AES,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
index 494e2af..122ef4c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
@@ -19,22 +19,16 @@
import org.forgerock.opendj.server.config.meta.Base64PasswordStorageSchemeCfgDefn;
import org.opends.server.api.PasswordStorageScheme;
-/**
- * A set of test cases for the base64 password storage scheme.
- */
+/** A set of test cases for the base64 password storage scheme. */
public class Base64PasswordStorageSchemeTestCase
extends PasswordStorageSchemeTestCase
{
- /**
- * Creates a new instance of this storage scheme test case.
- */
+ /** Creates a new instance of this storage scheme test case. */
public Base64PasswordStorageSchemeTestCase()
{
super("cn=Base64,cn=Password Storage Schemes,cn=config");
}
-
-
/**
* Retrieves an initialized instance of this password storage scheme.
*
@@ -42,10 +36,10 @@
*
* @throws Exception If an unexpected problem occurs.
*/
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
new Base64PasswordStorageScheme(), configEntry, Base64PasswordStorageSchemeCfgDefn.getInstance());
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
index a363e18..eeb2a3c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
@@ -19,22 +19,16 @@
import org.forgerock.opendj.server.config.meta.BlowfishPasswordStorageSchemeCfgDefn;
import org.opends.server.api.PasswordStorageScheme;
-/**
- * A set of test cases for the Blowfish password storage scheme.
- */
+/** A set of test cases for the Blowfish password storage scheme. */
public class BlowfishPasswordStorageSchemeTestCase
extends PasswordStorageSchemeTestCase
{
- /**
- * Creates a new instance of this storage scheme test case.
- */
+ /** Creates a new instance of this storage scheme test case. */
public BlowfishPasswordStorageSchemeTestCase()
{
super("cn=Blowfish,cn=Password Storage Schemes,cn=config");
}
-
-
/**
* Retrieves an initialized instance of this password storage scheme.
*
@@ -42,6 +36,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
index 5f2b7b7..3cc8745 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=Clear,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
index f28dd1a..7cb93e5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=MD5,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
index dc17d59..3caa4db 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=RC4,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java
index 27d9460..8248466 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2015 ForgeRock AS.
+ * Portions copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -56,12 +56,9 @@
* This class tests SASL confidentiality/integrity over TLS (SSL). It
* generates binary data larger than the TLS buffer size to make sure
* that the data is processed correctly.
- *
*/
public class SASLOverTLSTestCase extends ExtensionsTestCase {
- /**
- * Client SSL socket factory which blindly trusts server certificates.
- */
+ /** Client SSL socket factory which blindly trusts server certificates. */
public static final class TestSSLSocketFactory extends SSLSocketFactory
{
public static synchronized SocketFactory getDefault()
@@ -86,50 +83,57 @@
}
}
+ @Override
public Socket createSocket() throws IOException
{
return factory.createSocket();
}
+ @Override
public Socket createSocket(String host, int port) throws IOException,
UnknownHostException
{
return factory.createSocket(host, port);
}
+ @Override
public String[] getDefaultCipherSuites()
{
return factory.getDefaultCipherSuites();
}
+ @Override
public String[] getSupportedCipherSuites()
{
return factory.getSupportedCipherSuites();
}
+ @Override
public Socket createSocket(Socket s, String host, int port,
boolean autoClose) throws IOException
{
return factory.createSocket(s, host, port, autoClose);
}
+ @Override
public Socket createSocket(String host, int port, InetAddress localHost,
int localPort) throws IOException, UnknownHostException
{
return factory.createSocket(host, port, localHost, localPort);
}
+ @Override
public Socket createSocket(InetAddress host, int port) throws IOException
{
return factory.createSocket(host, port);
}
+ @Override
public Socket createSocket(InetAddress address, int port,
InetAddress localAddress, int localPort) throws IOException
{
return factory.createSocket(address, port, localAddress, localPort);
}
-
}
private static int KB = 1024;
@@ -153,7 +157,7 @@
private static String confidentiality = "auth-conf";
private static String integrity = "auth-int";
- //Go from 8KB to 64KB.
+ /** Go from 8KB to 64KB. */
@DataProvider(name = "kiloBytes")
public Object[][] kiloBytes() {
return new Object[][] {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
index 2d9c6eb..b4b9041 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=SHA-1,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
index b8c48b8..0c0409e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
@@ -34,17 +34,14 @@
super("cn=Salted MD5,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
new SaltedMD5PasswordStorageScheme(), configEntry, SaltedMD5PasswordStorageSchemeCfgDefn.getInstance());
}
-
-
- /**
- * Tests matching with a different salt size.
- */
+ /** Tests matching with a different salt size. */
@Test
public void testDifferentSaltSize() throws Exception {
SaltedMD5PasswordStorageScheme scheme = InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
index fae58a1..f460ea2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
@@ -36,28 +36,20 @@
/** The number of notifications that this handler has processed. */
private static AtomicInteger notificationsProcessed = new AtomicInteger(0);
-
-
- /**
- * Creates a new instance of this test account status notification handler.
- */
+ /** Creates a new instance of this test account status notification handler. */
public TestAccountStatusNotificationHandler()
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void initializeStatusNotificationHandler(
AccountStatusNotificationHandlerCfg configuration)
{
// No implementation is required.
}
-
-
- /** {@inheritDoc} */
+ @Override
public void handleStatusNotification(AccountStatusNotification notification)
{
notificationsProcessed.incrementAndGet();
@@ -105,8 +97,6 @@
}
}
-
-
/**
* Retrieves the number of account status notifications that this handler has
* processed.
@@ -119,8 +109,6 @@
return notificationsProcessed.get();
}
-
-
/**
* Resets the counter used to keep track fo the number of account status
* notfications that this handler has processed.
@@ -130,4 +118,3 @@
notificationsProcessed.set(0);
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java
index c0851fe..7516f9d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java
@@ -16,30 +16,19 @@
*/
package org.opends.server.extensions;
-
-
import java.util.LinkedHashMap;
import org.opends.server.api.AlertGenerator;
import org.forgerock.opendj.ldap.DN;
-
-
-/**
- * This class defines a simple alert generator that may be used for testing
- * purposes.
- */
+/** This class defines a simple alert generator that may be used for testing purposes. */
public class TestAlertGenerator
implements AlertGenerator
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
+ /** The fully-qualified name of this class for debugging purposes. */
private static final String CLASS_NAME =
"org.opends.server.extensions.TestAlertGenerator";
-
-
/** The DN of the "configuration entry" for this alert generator. */
private DN configEntryDN;
@@ -49,8 +38,6 @@
/** The alert type used for testing purposes. */
private String alertType;
-
-
/**
* Creates a new instance of this test alert generator.
*
@@ -64,8 +51,6 @@
alertDescription = "This is a test alert.";
}
-
-
/**
* Retrieves the alert type for this test alert generator.
*
@@ -76,25 +61,19 @@
return alertType;
}
-
-
- /** {@inheritDoc} */
+ @Override
public DN getComponentEntryDN()
{
return configEntryDN;
}
-
-
- /** {@inheritDoc} */
+ @Override
public String getClassName()
{
return CLASS_NAME;
}
-
-
- /** {@inheritDoc} */
+ @Override
public LinkedHashMap<String,String> getAlerts()
{
LinkedHashMap<String,String> alerts = new LinkedHashMap<>();
@@ -104,4 +83,3 @@
return alerts;
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
index 7914a70..4b39de5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
@@ -29,6 +29,7 @@
super("cn=3DES,cn=Password Storage Schemes,cn=config");
}
+ @Override
protected PasswordStorageScheme<?> getScheme() throws Exception
{
return InitializationUtils.initializePasswordStorageScheme(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java
index f56714e..a785d65 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java
@@ -12,15 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.monitors;
-
-
import org.opends.server.api.MonitorProvider;
-
-
/**
* This class defines a set of tests for the
* org.opends.server.monitors.StackTraceMonitorProvider class.
@@ -39,21 +36,11 @@
super("cn=JVM Stack Trace,cn=Monitor Providers,cn=config");
}
-
-
- /**
- * Retrieves an initialized instance of the associated monitor provider.
- *
- * @return An initialized instance of the associated monitor provider.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- protected MonitorProvider getMonitorInstance()
- throws Exception
+ @Override
+ protected MonitorProvider<?> getMonitorInstance() throws Exception
{
StackTraceMonitorProvider monitorProvider = new StackTraceMonitorProvider();
monitorProvider.initializeMonitorProvider(null);
return monitorProvider;
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java
index 35421d5..47a0a50 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java
@@ -12,15 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.monitors;
-
-
import org.opends.server.api.MonitorProvider;
-
-
/**
* This class defines a set of tests for the
* org.opends.server.monitors.SystemInfoMonitorProvider class.
@@ -39,21 +36,11 @@
super("cn=System Info,cn=Monitor Providers,cn=config");
}
-
-
- /**
- * Retrieves an initialized instance of the associated monitor provider.
- *
- * @return An initialized instance of the associated monitor provider.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- protected MonitorProvider getMonitorInstance()
- throws Exception
+ @Override
+ protected MonitorProvider<?> getMonitorInstance() throws Exception
{
SystemInfoMonitorProvider monitorProvider = new SystemInfoMonitorProvider();
monitorProvider.initializeMonitorProvider(null);
return monitorProvider;
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
index 1b55a21..6e85068 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
@@ -12,16 +12,13 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.monitors;
-
-
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
-
-
/**
* This class defines a set of tests for the
* org.opends.server.monitors.TraditionalWorkQueueMonitor class.
@@ -40,20 +37,10 @@
super(null);
}
-
-
- /**
- * Retrieves an initialized instance of the associated monitor provider.
- *
- * @return An initialized instance of the associated monitor provider.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- protected MonitorProvider getMonitorInstance()
- throws Exception
+ @Override
+ protected MonitorProvider<?> getMonitorInstance() throws Exception
{
String monitorName = "work queue";
return DirectoryServer.getMonitorProvider(monitorName);
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java
index 69f7b8a..a1d36b1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java
@@ -12,15 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.opends.server.monitors;
-
-
import org.opends.server.api.MonitorProvider;
-
-
/**
* This class defines a set of tests for the
* org.opends.server.monitors.VersionMonitorProvider class.
@@ -39,21 +36,11 @@
super("cn=Version,cn=Monitor Providers,cn=config");
}
-
-
- /**
- * Retrieves an initialized instance of the associated monitor provider.
- *
- * @return An initialized instance of the associated monitor provider.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- protected MonitorProvider getMonitorInstance()
- throws Exception
+ @Override
+ protected MonitorProvider<?> getMonitorInstance() throws Exception
{
VersionMonitorProvider monitorProvider = new VersionMonitorProvider();
monitorProvider.initializeMonitorProvider(null);
return monitorProvider;
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java
index b67d3fc..7c0f913 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java
@@ -12,20 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.server.protocols.internal;
-
-
import java.util.ArrayList;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
-
-
-
/**
* This class provides an internal search listener that may be used for testing
* purposes. It merely stores the entries and referrals in an internal list.
@@ -39,29 +34,21 @@
/** The list of search result references returned. */
private ArrayList<SearchResultReference> searchReferences;
-
-
- /**
- * Creates a new instance of this test internal search listener.
- */
+ /** Creates a new instance of this test internal search listener. */
public TestInternalSearchListener()
{
searchEntries = new ArrayList<>();
searchReferences = new ArrayList<>();
}
-
-
- /** {@inheritDoc} */
+ @Override
public void handleInternalSearchEntry(InternalSearchOperation searchOperation,
SearchResultEntry searchEntry)
{
searchEntries.add(searchEntry);
}
-
-
- /** {@inheritDoc} */
+ @Override
public void handleInternalSearchReference(
InternalSearchOperation searchOperation,
SearchResultReference searchReference)
@@ -69,8 +56,6 @@
searchReferences.add(searchReference);
}
-
-
/**
* Retrieves the set of search result entries returned for the search.
*
@@ -81,8 +66,6 @@
return searchEntries;
}
-
-
/**
* Retrieves the set of search result references returned for the search.
*
@@ -93,4 +76,3 @@
return searchReferences;
}
}
-
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
index 086d1c5..cec63bd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
@@ -16,18 +16,19 @@
*/
package org.opends.server.protocols.jmx;
+import static org.testng.Assert.*;
+
import java.util.HashMap;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DeleteOperation;
import org.opends.server.plugins.InvocationCounterPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import static org.testng.Assert.*;
/**
* This class check is the pos-connected and post-disconnected plugin are
@@ -35,13 +36,7 @@
*/
public class PostConnectedDisconnectTest extends JmxTestCase
{
-
- /**
- * Set up the environment for performing the tests in this suite.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
+ @Override
@BeforeClass
public void setUp() throws Exception
{
@@ -96,7 +91,7 @@
* Perform a simple connect.
* @throws Exception If something wrong occurs.
*/
- @Test(enabled = false, groups = {"slow"})
+ @Test(enabled = false, groups = "slow")
public void checkPostConnectDisconnectPlugin() throws Exception
{
// Before the test, how many time postconnect and postdisconnect
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
index d21be9c..865598a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
@@ -19,8 +19,8 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
/**
@@ -30,7 +30,6 @@
public class ExternalChangelogDomainFakeCfg
implements ExternalChangelogDomainCfg
{
-
/** The value of the "ecl-include" property. */
private SortedSet<String> pECLInclude;
@@ -55,7 +54,6 @@
this.pECLIncludeForDeletes = eclIncludeForDeletes != null ? eclIncludeForDeletes : new TreeSet<String>();
}
- /** {@inheritDoc} */
@Override
public Class<? extends ExternalChangelogDomainCfg> configurationClass()
{
@@ -73,8 +71,6 @@
ConfigurationChangeListener<ExternalChangelogDomainCfg> listener)
{}
-
-
/**
* Deregister an existing External Changelog Domain configuration change listener.
*
@@ -86,8 +82,6 @@
ConfigurationChangeListener<ExternalChangelogDomainCfg> listener)
{}
-
-
@Override
public SortedSet<String> getECLInclude()
{
@@ -100,7 +94,6 @@
return this.pECLIncludeForDeletes;
}
-
/**
* Set enabled.
* @param enabled a.
@@ -110,7 +103,6 @@
this.pEnabled = enabled;
}
-
/**
* Gets the "enabled" property.
* <p>
@@ -125,6 +117,7 @@
return this.pEnabled;
}
+ @Override
public DN dn()
{
return pDN;
@@ -134,5 +127,4 @@
{
this.pDN = dn;
}
-
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
index 2ac598b..5fe8ca1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
@@ -12,33 +12,29 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Random;
+
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.tools.makeldif.EntryWriter;
import org.opends.server.tools.makeldif.MakeLDIFException;
import org.opends.server.tools.makeldif.TemplateEntry;
import org.opends.server.tools.makeldif.TemplateFile;
+import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.InitializationException;
import org.opends.server.types.LDIFExportConfig;
-import org.opends.server.types.ExistingFileBehavior;
-import org.opends.server.util.LDIFWriter;
import org.opends.server.util.LDIFException;
-import org.forgerock.i18n.LocalizableMessage;
+import org.opends.server.util.LDIFWriter;
-import java.io.IOException;
-import java.util.Random;
-import java.util.ArrayList;
-
-/**
- * This class makes test LDIF files using the makeldif package.
- */
+/** This class makes test LDIF files using the makeldif package. */
public class LdifFileWriter implements EntryWriter
{
- /**
- * The LDIF writer used to write the entries to the file.
- */
+ /** The LDIF writer used to write the entries to the file. */
private LDIFWriter ldifWriter;
/**
@@ -116,7 +112,7 @@
template.generateLDIF(new LdifFileWriter(ldifWriter));
}
- /** {@inheritDoc} */
+ @Override
public boolean writeEntry(TemplateEntry entry)
throws IOException, MakeLDIFException
{
@@ -130,7 +126,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public void closeEntryWriter()
{
try
--
Gitblit v1.10.0