From 8d21db36015f8560d9cd2bcee9817f2c0a07a386 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Mar 2015 14:11:47 +0000
Subject: [PATCH] Autorefactored javadocs
---
opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationProperty.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java | 90
opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java | 44
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java | 60
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java | 16
opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java | 42
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/StaticTextTag.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java | 60
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java | 22
opendj-server-legacy/src/main/java/org/opends/server/util/SizeLimitInputStream.java | 33
opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java | 20
opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java | 29
opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java | 10
opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/util/MultiOutputStream.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java | 17
opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java | 5
opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java | 14
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java | 10
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java | 15
opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 64
opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java | 152
opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tasks/RestartTaskThread.java | 10
opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java | 166
opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java | 52
opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 135
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java | 18
opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java | 6
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java | 20
opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java | 18
opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java | 52
opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 8
opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfAbsentTag.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/ListTag.java | 10
opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java | 44
opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java | 10
opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java | 42
opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java | 54
opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotificationType.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java | 78
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java | 13
opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java | 48
opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java | 9
opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java | 9
opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java | 26
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/SequentialTag.java | 8
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java | 35
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java | 54
opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/LDIFImportResult.java | 7
opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java | 24
opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java | 34
opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java | 92
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java | 34
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java | 1
opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java | 5
opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java | 17
opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java | 20
opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java | 30
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java | 8
opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java | 16
opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java | 220 -
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/AttributeValueTag.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java | 50
opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java | 43
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java | 6
opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java | 15
opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java | 52
opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java | 24
opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTask.java | 14
opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java | 11
opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java | 22
opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java | 24
opendj-server-legacy/src/main/java/org/opends/server/util/ChangeRecordEntry.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java | 46
opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java | 42
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java | 24
opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java | 101
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java | 11
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java | 8
opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 17
opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java | 88
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java | 42
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java | 11
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java | 18
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java | 34
opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java | 148
opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java | 12
opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java | 26
opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java | 44
opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java | 22
opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java | 60
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java | 28
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 2
opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java | 37
opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java | 5
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java | 8
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java | 46
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java | 16
opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java | 24
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java | 60
opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java | 14
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/DisconnectReason.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/ExistingFileBehavior.java | 3
opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java | 54
opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java | 19
opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java | 9
opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java | 11
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java | 10
opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java | 42
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java | 28
opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java | 62
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java | 10
opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java | 20
opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java | 26
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java | 2
opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java | 307 -
opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java | 26
opendj-server-legacy/src/main/java/org/opends/server/types/AcceptRejectWarn.java | 3
opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java | 45
opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/ExpirationCheckTrustManager.java | 4
opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java | 8
opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java | 13
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 2
opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java | 4
opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java | 80
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java | 14
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 18
opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java | 10
opendj-server-legacy/src/main/java/org/opends/server/tasks/EnterLockdownModeTask.java | 14
opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java | 9
opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java | 38
opendj-server-legacy/src/main/java/org/opends/server/types/AuthenticationType.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java | 94
opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java | 8
opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java | 28
opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java | 14
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java | 25
opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java | 9
opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 50
opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/PromptTrustManager.java | 4
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java | 124
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 3
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 2
opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java | 44
opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/FilterType.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java | 54
opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java | 7
opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java | 10
opendj-server-legacy/src/main/java/org/opends/server/types/BackupInfo.java | 38
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java | 7
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java | 44
opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java | 42
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java | 14
opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java | 27
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RandomTag.java | 24
opendj-server-legacy/src/main/java/org/opends/server/types/IntermediateResponse.java | 9
opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java | 48
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/LastNameTag.java | 4
opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java | 14
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java | 10
opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java | 46
opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java | 16
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java | 6
opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java | 94
opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java | 42
opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java | 33
opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 14
opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java | 2
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java | 7
opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java | 10
opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java | 31
opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java | 8
opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/OperationType.java | 3
opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java | 42
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java | 5
opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java | 62
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java | 120
opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java | 34
opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java | 200 -
opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java | 10
opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java | 44
opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java | 14
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java | 52
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java | 8
opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java | 56
opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java | 48
opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java | 4
opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java | 5
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java | 22
opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java | 46
opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java | 36
opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java | 10
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java | 12
opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java | 32
opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 44
opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 218 -
opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java | 18
opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java | 4
opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java | 4
opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java | 15
opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java | 58
opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java | 18
opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java | 2
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java | 10
opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java | 4
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FileTag.java | 12
opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java | 8
opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java | 48
opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java | 36
opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java | 33
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/IfPresentTag.java | 6
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java | 46
opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java | 42
opendj-server-legacy/src/main/java/org/opends/server/tasks/LeaveLockdownModeTask.java | 14
opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java | 13
opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java | 14
opendj-server-legacy/src/main/java/org/opends/server/tasks/ShutdownTaskThread.java | 4
opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java | 7
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java | 18
opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java | 18
opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java | 10
opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java | 9
opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java | 40
opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java | 28
opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java | 50
opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/types/LockType.java | 3
opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java | 16
opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java | 26
opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java | 22
opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java | 36
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/FirstNameTag.java | 4
opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java | 12
opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java | 3
opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java | 10
opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 2
opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java | 26
opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java | 4
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java | 14
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java | 16
opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java | 10
opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java | 6
opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java | 22
opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java | 20
opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java | 48
opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java | 64
opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java | 11
opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java | 16
opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java | 58
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/PresenceTag.java | 6
opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java | 12
opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java | 13
372 files changed, 2,657 insertions(+), 6,198 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
index eafa835..e2e75d3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -46,9 +46,7 @@
{
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -60,9 +58,7 @@
.addToSchema().toSchema().getMatchingRule(EMR_AUTH_PASSWORD_OID);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
index 10f6505..89f3e29 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java
@@ -22,13 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
-
package org.opends.server.schema;
-
import java.util.Collection;
import java.util.Collections;
@@ -45,14 +42,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -60,11 +53,7 @@
matchingRule = CoreSchema.getAuthPasswordExactMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
index c9e12c6..c28f8cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordSyntax.java
@@ -22,14 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -57,11 +55,9 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -73,11 +69,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -91,8 +83,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -104,8 +94,6 @@
return SYNTAX_AUTH_PASSWORD_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -117,8 +105,6 @@
return SYNTAX_AUTH_PASSWORD_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -130,8 +116,6 @@
return SYNTAX_AUTH_PASSWORD_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -146,8 +130,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -163,8 +145,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -180,8 +160,6 @@
return null;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -197,8 +175,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -227,8 +203,6 @@
}
}
-
-
/**
* Decodes the provided authentication password value into its component
* parts.
@@ -474,8 +448,6 @@
};
}
-
-
/**
* Indicates whether the provided value is encoded using the auth password
* syntax.
@@ -502,22 +474,14 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
index b97e8ef..0010fc1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BinarySyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -49,13 +49,13 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
@@ -70,11 +70,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -101,8 +97,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -114,8 +108,6 @@
return SYNTAX_BINARY_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -127,8 +119,6 @@
return SYNTAX_BINARY_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -140,8 +130,6 @@
return SYNTAX_BINARY_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -156,8 +144,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +158,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -188,8 +172,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -205,8 +187,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -227,22 +207,14 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
index 732730e..d7f270e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getBitStringMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
index 342997d..7620f03 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,11 +52,9 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -70,11 +66,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -86,8 +78,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -98,8 +88,6 @@
return SYNTAX_BIT_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -110,8 +98,6 @@
return SYNTAX_BIT_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -122,8 +108,6 @@
return SYNTAX_BIT_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -137,8 +121,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -153,8 +135,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -169,8 +149,6 @@
return null;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -185,8 +163,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -241,21 +217,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
index 4823fed..24502a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class BooleanEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getBooleanMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
index a42341a..f79500e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -53,11 +53,9 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -69,11 +67,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -86,8 +80,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -99,8 +91,6 @@
return SYNTAX_BOOLEAN_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -112,8 +102,6 @@
return SYNTAX_BOOLEAN_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -125,8 +113,6 @@
return SYNTAX_BOOLEAN_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -141,8 +127,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -158,8 +142,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -175,8 +157,6 @@
return null;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -192,8 +172,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -229,8 +207,6 @@
return returnValue;
}
-
-
/**
* Retrieves an attribute value containing a representation of the provided
* boolean value.
@@ -244,22 +220,14 @@
return b ? ServerConstants.TRUE_VALUE : ServerConstants.FALSE_VALUE;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
index 1623e98..0c1b2ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class CaseExactEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getCaseExactMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
index 9d40f5b..598de12 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseExactIA5EqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseExactIA5MatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
index c89d860..f37c8f6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseExactIA5SubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getInstance().getMatchingRule(SchemaConstants.SMR_CASE_EXACT_IA5_OID);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
index 68849df..d9c284a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseExactOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseExactOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
index 760cf26..a03ac3c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseExactSubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseExactSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
index 4df0f21..776ca0e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getCaseIgnoreMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
index 2515d01..f518b4e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated MatchingRule.
+ /** Associated MatchingRule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getCaseIgnoreIA5MatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
index bfcb20b..9f77da2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class CaseIgnoreIA5SubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getCaseIgnoreIA5SubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
index 82eb08e..c22254b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getCaseIgnoreListMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
index 69df326..cd3d7df 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseIgnoreListSubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseIgnoreListSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
index a860f98..99d859a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseIgnoreOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseIgnoreOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
index cf5a347..94cdd45 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class CaseIgnoreSubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getCaseIgnoreSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
index fda59b0..99fafa9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
* Portions Copyright 2013-2014 Manuel Gaupp
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -53,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -75,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -108,82 +100,50 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getName()
{
return SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getOID()
{
return SYNTAX_CERTIFICATE_EXACT_ASSERTION_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDescription()
{
return SYNTAX_CERTIFICATE_EXACT_ASSERTION_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getApproximateMatchingRule()
{
// Approximate matching will not be allowed by default.
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -192,21 +152,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
index c91e361..e965518 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java
@@ -23,6 +23,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2013-2014 Manuel Gaupp
+ * Portions Copyright 2015 ForgeRock AS.
*/
@@ -43,15 +44,11 @@
public final class CertificateExactMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +56,7 @@
matchingRule = CoreSchema.getCertificateExactMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
index ad2d47c..cbaa430 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateListSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,17 +52,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -106,8 +98,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -118,8 +108,6 @@
return SYNTAX_CERTLIST_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -130,8 +118,6 @@
return SYNTAX_CERTLIST_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -142,8 +128,6 @@
return SYNTAX_CERTLIST_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +141,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +154,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +167,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +181,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -224,21 +200,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
index a47961f..395a267 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificatePairSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,17 +52,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -106,8 +98,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -118,8 +108,6 @@
return SYNTAX_CERTPAIR_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -130,8 +118,6 @@
return SYNTAX_CERTPAIR_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -142,8 +128,6 @@
return SYNTAX_CERTPAIR_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +141,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +154,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +167,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +181,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -224,21 +200,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
index a9d235d..fcd6c25 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateSyntax.java
@@ -27,8 +27,6 @@
*/
package org.opends.server.schema;
-
-
import java.io.IOException;
import java.util.List;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -63,20 +61,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
- // The current configuration.
+ /** The current configuration. */
private volatile CertificateAttributeSyntaxCfg config;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -88,11 +84,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(CertificateAttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -124,11 +116,7 @@
config.addCertificateChangeListener(this);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationChangeAcceptable(
CertificateAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -137,11 +125,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationChange(
CertificateAttributeSyntaxCfg configuration)
{
@@ -149,8 +133,6 @@
return new ConfigChangeResult();
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -161,8 +143,6 @@
return SYNTAX_CERTIFICATE_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -173,8 +153,6 @@
return SYNTAX_CERTIFICATE_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -185,8 +163,6 @@
return SYNTAX_CERTIFICATE_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -200,8 +176,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -215,8 +189,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -230,8 +202,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -246,8 +216,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -479,21 +447,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
index cea2ffe..2b09922 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -64,14 +64,14 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Stores the list of available locales on this JVM.
+ /** Stores the list of available locales on this JVM. */
private static final Set<Locale> supportedLocales = new HashSet<Locale>(
Arrays.asList(Locale.getAvailableLocales()));
- // Current Configuration.
+ /** Current Configuration. */
private CollationMatchingRuleCfg currentConfig;
- // Map of OID and the Matching Rule.
+ /** Map of OID and the Matching Rule. */
private final Map<String, MatchingRule> matchingRules =
new HashMap<String, MatchingRule>();
@@ -84,9 +84,7 @@
super();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
@@ -114,9 +112,7 @@
matchingRules.clear();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeMatchingRule(CollationMatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -169,11 +165,7 @@
currentConfig.addCollationChangeListener(this);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void finalizeMatchingRule()
{
@@ -181,11 +173,7 @@
currentConfig.removeCollationChangeListener(this);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
CollationMatchingRuleCfg configuration)
@@ -242,9 +230,7 @@
return ccr;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
CollationMatchingRuleCfg configuration,
@@ -336,22 +322,18 @@
return locale;
}
-
-
/**
* A utility class for extracting the OID and Language Tag from the
* configuration entry.
*/
private final class CollationMapper
{
- // OID of the collation rule.
+ /** OID of the collation rule. */
private String oid;
- // Language Tag.
+ /** Language Tag. */
private String lTag;
-
-
/**
* Creates a new instance of CollationMapper.
*
@@ -368,8 +350,6 @@
}
}
-
-
/**
* Returns the OID part of the collation text.
*
@@ -380,8 +360,6 @@
return oid;
}
-
-
/**
* Returns the language Tag of collation text.
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
index cfbfef7..dd9bd9d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
@@ -58,23 +58,21 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
- // The current configuration
+ /** The current configuration. */
private volatile CountryStringAttributeSyntaxCfg config;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -86,11 +84,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(CountryStringAttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -130,11 +124,7 @@
config.addCountryStringChangeListener(this);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationChangeAcceptable(
CountryStringAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -143,11 +133,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationChange(
CountryStringAttributeSyntaxCfg configuration)
{
@@ -158,8 +144,6 @@
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -170,8 +154,6 @@
return SYNTAX_COUNTRY_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -182,8 +164,6 @@
return SYNTAX_COUNTRY_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -194,8 +174,6 @@
return SYNTAX_COUNTRY_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -209,8 +187,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -224,8 +200,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -239,8 +213,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -254,8 +226,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -303,21 +273,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
index 91fe73f..74fe234 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITContentRuleSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -59,19 +59,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -83,11 +79,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
@@ -120,77 +112,49 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
return SYNTAX_DIT_CONTENT_RULE_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return SYNTAX_DIT_CONTENT_RULE_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
return SYNTAX_DIT_CONTENT_RULE_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getApproximateMatchingRule()
{
@@ -198,11 +162,7 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -223,8 +183,6 @@
}
}
-
-
/**
* Decodes the contents of the provided ASN.1 octet string as a DIT content
* rule definition according to the rules of this syntax. Note that the
@@ -904,8 +862,6 @@
isObsolete, extraProperties);
}
-
-
/**
* Reads the next token name from the DIT content rule definition, skipping
* over any leading or trailing spaces, and appends it to the provided buffer.
@@ -960,8 +916,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -1040,8 +994,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -1126,8 +1078,6 @@
return startPos;
}
-
-
/**
* Reads an attributeType/objectclass description or numeric OID from the
* provided string, skipping over any leading or trailing spaces, and
@@ -1272,8 +1222,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1429,21 +1377,13 @@
return startPos;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
index 501b87b..f141a4e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -49,8 +47,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the DIT structure rule description syntax, which is
* used to hold DIT structure rule definitions in the server schema. The format
@@ -62,19 +58,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -86,11 +78,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
{
@@ -122,82 +110,50 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getName()
{
return SYNTAX_DIT_STRUCTURE_RULE_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getOID()
{
return SYNTAX_DIT_STRUCTURE_RULE_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDescription()
{
return SYNTAX_DIT_STRUCTURE_RULE_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -217,8 +173,6 @@
}
}
-
-
/**
* Decodes the contents of the provided ASN.1 octet string as a DIT structure
* rule definition according to the rules of this syntax. Note that the
@@ -674,8 +628,6 @@
extraProperties);
}
-
-
/**
* Reads the next token name from the DIT content rule definition, skipping
* over any leading or trailing spaces, and appends it to the provided buffer.
@@ -730,8 +682,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -810,8 +760,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -896,8 +844,6 @@
return startPos;
}
-
-
/**
* Reads an attributeType/objectclass description or numeric OID from the
* provided string, skipping over any leading or trailing spaces, and
@@ -1040,8 +986,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1196,21 +1140,13 @@
return startPos;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
index 31494d6..e957910 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.util.HashSet;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.StringTokenizer;
@@ -45,8 +43,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines the delivery method attribute syntax. This contains one
* or more of a fixed set of values. If there are multiple values, then they
@@ -89,25 +85,21 @@
"telephone"
};
-
-
- // The hash set containing the allowed values.
+ /** The hash set containing the allowed values. */
private HashSet<String> allowedValues;
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -119,11 +111,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -166,8 +154,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -178,8 +164,6 @@
return SYNTAX_DELIVERY_METHOD_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -190,8 +174,6 @@
return SYNTAX_DELIVERY_METHOD_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -202,8 +184,6 @@
return SYNTAX_DELIVERY_METHOD_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -217,8 +197,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -232,8 +210,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -247,8 +223,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -262,8 +236,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -300,21 +272,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
index 205ea64..ff61d34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class DirectoryStringFirstComponentEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getDirectoryStringFirstComponentMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
index 91454e4..faea3bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringSyntax.java
@@ -56,22 +56,22 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // Indicates whether we will allow zero-length values.
+ /** Indicates whether we will allow zero-length values. */
private boolean allowZeroLengthValues;
- // The reference to the configuration for this directory string syntax.
+ /** The reference to the configuration for this directory string syntax. */
private DirectoryStringAttributeSyntaxCfg currentConfig;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
@@ -86,11 +86,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(DirectoryStringAttributeSyntaxCfg configuration)
throws ConfigException
@@ -142,8 +138,6 @@
allowZeroLengthValues = currentConfig.isAllowZeroLengthValues();
}
-
-
/**
* Performs any finalization that may be necessary for this attribute syntax.
*/
@@ -153,8 +147,6 @@
currentConfig.removeDirectoryStringChangeListener(this);
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -166,8 +158,6 @@
return SYNTAX_DIRECTORY_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -179,8 +169,6 @@
return SYNTAX_DIRECTORY_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -192,8 +180,6 @@
return SYNTAX_DIRECTORY_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -208,8 +194,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -224,8 +208,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -240,8 +222,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -256,8 +236,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -286,8 +264,6 @@
}
}
-
-
/**
* Indicates whether zero-length values will be allowed. This is technically
* forbidden by the LDAP specification, but it was allowed in earlier versions
@@ -303,11 +279,7 @@
return allowZeroLengthValues;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(
DirectoryStringAttributeSyntaxCfg configuration,
@@ -317,11 +289,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
DirectoryStringAttributeSyntaxCfg configuration)
@@ -332,22 +300,14 @@
return new ConfigChangeResult();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
index 4dc09b5..b968f7f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class DistinguishedNameEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getDistinguishedNameMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
index d833190..4895c2a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
@@ -53,16 +51,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -74,11 +68,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -98,8 +88,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -111,8 +99,6 @@
return SYNTAX_DN_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -124,8 +110,6 @@
return SYNTAX_DN_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -137,8 +121,6 @@
return SYNTAX_DN_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -153,8 +135,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -170,8 +150,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -186,8 +164,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +179,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -243,22 +217,14 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
index f3bd0a4..0f5a5d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class DoubleMetaphoneApproximateMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getInstance().getMatchingRule("1.3.6.1.4.1.26027.1.4.1");
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
index e966a57..50a5e99 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -51,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -73,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -106,8 +100,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -118,8 +110,6 @@
return SYNTAX_ENHANCED_GUIDE_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -130,8 +120,6 @@
return SYNTAX_ENHANCED_GUIDE_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -142,8 +130,6 @@
return SYNTAX_ENHANCED_GUIDE_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +143,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +156,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +169,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +183,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -295,21 +273,13 @@
return GuideSyntax.criteriaIsValid(criteria, valueStr, invalidReason);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
index 054c8f6..ee3c6d2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxNumberSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.util.HashSet;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -44,8 +42,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the facsimile telephone number attribute syntax, which
* contains a printable string (the number) followed by zero or more parameters.
@@ -85,19 +81,15 @@
ALLOWED_FAX_PARAMETERS.add("uncompressed");
}
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -109,11 +101,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -139,8 +127,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -151,8 +137,6 @@
return SYNTAX_FAXNUMBER_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -163,8 +147,6 @@
return SYNTAX_FAXNUMBER_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -175,8 +157,6 @@
return SYNTAX_FAXNUMBER_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -190,8 +170,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -205,8 +183,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -220,8 +196,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -236,8 +210,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -348,21 +320,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
index bd2faa1..ffde107 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/FaxSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -53,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -75,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -105,8 +97,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -117,8 +107,6 @@
return SYNTAX_FAX_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -129,8 +117,6 @@
return SYNTAX_FAX_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -141,8 +127,6 @@
return SYNTAX_FAX_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -156,8 +140,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -171,8 +153,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -186,8 +166,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -202,8 +180,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -223,21 +199,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
index 8a95991..940cc6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getGeneralizedTimeMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
index 4fdd35c..cd25c05 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getGeneralizedTimeOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
index 9fbc675..72420e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -23,12 +23,10 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 D. J. Hagberg, Millibits Consulting, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -50,8 +48,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class defines the generalized time attribute syntax, which is a way of
* representing time in a form like "YYYYMMDDhhmmssZ". The actual form is
@@ -64,23 +60,19 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // UTC TimeZone is assumed to never change over JVM lifetime
+ /** UTC TimeZone is assumed to never change over JVM lifetime. */
private static final TimeZone TIME_ZONE_UTC_OBJ =
TimeZone.getTimeZone(TIME_ZONE_UTC);
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -92,11 +84,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -126,8 +114,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -139,8 +125,6 @@
return SYNTAX_GENERALIZED_TIME_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -152,8 +136,6 @@
return SYNTAX_GENERALIZED_TIME_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -165,8 +147,6 @@
return SYNTAX_GENERALIZED_TIME_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -181,8 +161,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -197,8 +175,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -213,8 +189,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -230,8 +204,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -260,8 +232,6 @@
}
}
-
-
/**
* Retrieves the generalized time representation of the provided date.
*
@@ -274,8 +244,6 @@
return d == null ? null : format(d.getTime());
}
-
-
/**
* Retrieves the generalized time representation of the provided date.
*
@@ -375,8 +343,6 @@
return sb.toString();
}
-
-
/**
* Retrieves an attribute value containing a generalized time representation
* of the provided date.
@@ -390,8 +356,6 @@
return ByteString.valueOf(format(time));
}
-
-
/**
* Decodes the provided normalized value as a generalized time value and
* retrieves a timestamp containing its representation.
@@ -1319,8 +1283,6 @@
}
}
-
-
/**
* Completes decoding the generalized time value containing a fractional
* component. It will also decode the trailing 'Z' or offset.
@@ -1446,8 +1408,6 @@
}
}
-
-
/**
* Decodes a time zone offset from the provided value.
*
@@ -1595,22 +1555,14 @@
return TimeZone.getTimeZone("GMT" + offSetStr);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
index d7b2b0d..7caac20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
@@ -51,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -73,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -103,8 +97,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -115,8 +107,6 @@
return SYNTAX_GUIDE_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -127,8 +117,6 @@
return SYNTAX_GUIDE_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -139,8 +127,6 @@
return SYNTAX_GUIDE_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -154,8 +140,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -169,8 +153,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -184,8 +166,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -200,8 +180,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -244,8 +222,6 @@
&& criteriaIsValid(valueStr.substring(sharpPos+1), valueStr, invalidReason);
}
-
-
/**
* Determines whether the provided string represents a valid criteria
* according to the guide syntax.
@@ -533,21 +509,13 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
index bc6e432..85201bc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IA5StringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -51,20 +51,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +74,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -117,8 +111,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -129,8 +121,6 @@
return SYNTAX_IA5_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -141,8 +131,6 @@
return SYNTAX_IA5_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -153,8 +141,6 @@
return SYNTAX_IA5_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -168,8 +154,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -183,8 +167,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -198,8 +180,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -213,8 +193,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -245,21 +223,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
index c1cd7c8..a1ee055 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getIntegerMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
index f382828..5e2814c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class IntegerFirstComponentEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getIntegerFirstComponentMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
index 07c1b10..a9746b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getIntegerOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
index e8a10ac..69b5963 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -50,13 +50,13 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
@@ -71,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -102,8 +98,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -115,8 +109,6 @@
return SYNTAX_INTEGER_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -128,8 +120,6 @@
return SYNTAX_INTEGER_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -141,8 +131,6 @@
return SYNTAX_INTEGER_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +145,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -173,8 +159,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -189,8 +173,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -206,8 +188,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -344,22 +324,14 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
index 99af6e2..cdbe709 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/JPEGSyntax.java
@@ -58,20 +58,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
- // The current configuration for this JPEG syntax.
+ /** The current configuration for this JPEG syntax. */
private volatile JPEGAttributeSyntaxCfg config;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -83,11 +81,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(JPEGAttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -116,8 +110,6 @@
config.addJPEGChangeListener(this);
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -128,8 +120,6 @@
return SYNTAX_JPEG_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -140,8 +130,6 @@
return SYNTAX_JPEG_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -152,8 +140,6 @@
return SYNTAX_JPEG_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -167,8 +153,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -182,8 +166,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -197,8 +179,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -213,8 +193,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -265,9 +243,7 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationChangeAcceptable(
JPEGAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -276,11 +252,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationChange(
JPEGAttributeSyntaxCfg configuration)
{
@@ -289,21 +261,13 @@
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
index 6e48227..a42486d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getKeywordMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index f94e553..53e3a28 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -66,17 +66,15 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -88,11 +86,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -119,8 +113,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -132,8 +124,6 @@
return SYNTAX_LDAP_SYNTAX_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -145,8 +135,6 @@
return SYNTAX_LDAP_SYNTAX_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -158,8 +146,6 @@
return SYNTAX_LDAP_SYNTAX_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -174,8 +160,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -190,8 +174,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -206,8 +188,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -223,8 +203,6 @@
return null;
}
-
-
/**
* Decodes the contents of the provided byte sequence as an ldap syntax
* definition according to the rules of this syntax. Note that the provided
@@ -568,8 +546,6 @@
description,extraProperties);
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -658,8 +634,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -897,28 +871,20 @@
return startPos;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
return true;
}
-
-
/**
* This class provides a substitution mechanism where one unimplemented
* syntax can be substituted by another defined syntax. A substitution syntax
@@ -927,22 +893,20 @@
private static class SubstitutionSyntax extends
LDAPSyntaxDescriptionSyntax
{
- // The syntax that will substitute the unimplemented syntax.
+ /** The syntax that will substitute the unimplemented syntax. */
private AttributeSyntax<?> subSyntax;
- // The description of this syntax.
+ /** The description of this syntax. */
private String description;
- // The definition of this syntax.
+ /** The definition of this syntax. */
private String definition;
- //The oid of this syntax.
+ /** The oid of this syntax. */
private String oid;
-
-
- //Creates a new instance of this syntax.
+ /** Creates a new instance of this syntax. */
private SubstitutionSyntax(AttributeSyntax<?> subSyntax,
String definition,
String description,
@@ -955,11 +919,7 @@
this.oid = oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
@@ -967,44 +927,28 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
return description;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
return definition;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -1012,8 +956,6 @@
return subSyntax.valueIsAcceptable(value, invalidReason);
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -1028,8 +970,6 @@
return subSyntax.getEqualityMatchingRule();
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -1044,8 +984,6 @@
return subSyntax.getOrderingMatchingRule();
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -1060,8 +998,6 @@
return subSyntax.getSubstringMatchingRule();
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -1077,8 +1013,6 @@
}
}
-
-
/**
* This class provides a regex mechanism where a new syntax and its
* corresponding matching rules can be created on-the-fly. A regex
@@ -1087,32 +1021,32 @@
private static class RegexSyntax extends
LDAPSyntaxDescriptionSyntax
{
- // The Pattern associated with the regex.
+ /** The Pattern associated with the regex. */
private Pattern pattern;
- // The description of this syntax.
+ /** The description of this syntax. */
private String description;
- //The oid of this syntax.
+ /** The oid of this syntax. */
private String oid;
- //The definition of this syntax.
+ /** The definition of this syntax. */
private String definition;
- //The equality matching rule.
+ /** The equality matching rule. */
private MatchingRule equalityMatchingRule;
- //The substring matching rule.
+ /** The substring matching rule. */
private MatchingRule substringMatchingRule;
- //The ordering matching rule.
+ /** The ordering matching rule. */
private MatchingRule orderingMatchingRule;
- //The approximate matching rule.
+ /** The approximate matching rule. */
private MatchingRule approximateMatchingRule;
- //Creates a new instance of this syntax.
+ /** Creates a new instance of this syntax. */
private RegexSyntax(Pattern pattern,
String definition,
String description,
@@ -1125,11 +1059,7 @@
this.oid = oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
@@ -1137,22 +1067,14 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
@@ -1160,20 +1082,14 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
return definition;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -1189,8 +1105,6 @@
return matches;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -1211,8 +1125,6 @@
return equalityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -1232,8 +1144,6 @@
return orderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -1253,8 +1163,6 @@
return substringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -1275,8 +1183,6 @@
}
}
-
-
/**
* This class provides an enumeration-based mechanism where a new syntax
* and its corresponding matching rules can be created on-the-fly. An enum
@@ -1285,32 +1191,32 @@
private static class EnumSyntax extends
LDAPSyntaxDescriptionSyntax
{
- //Set of read-only enum entries.
+ /** Set of read-only enum entries. */
LinkedList<ByteSequence> entries;
- // The description of this syntax.
+ /** The description of this syntax. */
private String description;
- //The oid of this syntax.
+ /** The oid of this syntax. */
private String oid;
- //The equality matching rule.
+ /** The equality matching rule. */
private MatchingRule equalityMatchingRule;
- //The substring matching rule.
+ /** The substring matching rule. */
private MatchingRule substringMatchingRule;
- //The ordering matching rule.
+ /** The ordering matching rule. */
private MatchingRule orderingMatchingRule;
- //The approximate matching rule.
+ /** The approximate matching rule. */
private MatchingRule approximateMatchingRule;
- //The definition of this syntax.
+ /** The definition of this syntax. */
private String definition;
- //Creates a new instance of this syntax.
+ /** Creates a new instance of this syntax. */
private EnumSyntax(LinkedList<ByteSequence> entries,
String definition,
String description,
@@ -1323,11 +1229,7 @@
this.oid = oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
@@ -1335,55 +1237,35 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return oid;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
return definition;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
return description;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void finalizeSyntax()
{
DirectoryServer.deregisterMatchingRule(orderingMatchingRule);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -1397,8 +1279,6 @@
return isAllowed;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -1419,8 +1299,6 @@
return equalityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -1461,8 +1339,6 @@
return orderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -1482,8 +1358,6 @@
return substringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
index ec761ac..932f992 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleSyntax.java
@@ -22,14 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -50,8 +48,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the matching rule description syntax, which is used to
* hold matching rule definitions in the server schema. The format of this
@@ -62,19 +58,15 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -86,11 +78,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
@@ -117,8 +105,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -130,8 +116,6 @@
return SYNTAX_MATCHING_RULE_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -143,8 +127,6 @@
return SYNTAX_MATCHING_RULE_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -156,8 +138,6 @@
return SYNTAX_MATCHING_RULE_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +152,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -188,8 +166,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -204,8 +180,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -221,8 +195,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -592,8 +564,6 @@
return true;
}
-
-
/**
* Reads the next token name from the matching rule definition, skipping over
* any leading or trailing spaces, and appends it to the provided buffer.
@@ -648,8 +618,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -726,8 +694,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -811,8 +777,6 @@
return startPos;
}
-
-
/**
* Reads the attribute type/objectclass description or numeric OID from the
* provided string, skipping over any leading or trailing spaces, and
@@ -959,8 +923,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1115,22 +1077,14 @@
return startPos;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
index 16d62c1..04a74c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -49,8 +47,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the matching rule use description syntax, which is used
* to hold matching rule use definitions in the server schema. The format of
@@ -62,19 +58,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -86,11 +78,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
{
@@ -122,82 +110,50 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getName()
{
return SYNTAX_MATCHING_RULE_USE_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getOID()
{
return SYNTAX_MATCHING_RULE_USE_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDescription()
{
return SYNTAX_MATCHING_RULE_USE_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public MatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -217,8 +173,6 @@
}
}
-
-
/**
* Decodes the contents of the provided ASN.1 octet string as a matching rule
* use definition according to the rules of this syntax. Note that the
@@ -611,8 +565,6 @@
extraProperties);
}
-
-
/**
* Reads the next token name from the matching rule use definition, skipping
* over any leading or trailing spaces, and appends it to the provided buffer.
@@ -667,8 +619,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -747,8 +697,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -832,8 +780,6 @@
return startPos;
}
-
-
/**
* Reads the attribute type description or numeric OID from the provided
* string, skipping over any leading or trailing spaces, and appending the
@@ -978,8 +924,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1134,21 +1078,13 @@
return startPos;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 6e51632..1482c0a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -50,16 +50,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -71,11 +67,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -96,8 +88,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -108,8 +98,6 @@
return SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -120,8 +108,6 @@
return SYNTAX_NAME_AND_OPTIONAL_UID_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -132,8 +118,6 @@
return SYNTAX_NAME_AND_OPTIONAL_UID_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -147,8 +131,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -163,8 +145,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -178,8 +158,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -194,8 +172,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -246,8 +222,6 @@
return false;
}
-
-
// If there is an "optional uid", then normalize it and make sure it only
// contains valid binary digits.
if (sharpPos > 0)
@@ -270,21 +244,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
index 7df9880..970c4b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameFormSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -58,19 +58,15 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -82,11 +78,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
@@ -119,77 +111,49 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
return SYNTAX_NAME_FORM_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return SYNTAX_NAME_FORM_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
return SYNTAX_NAME_FORM_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getApproximateMatchingRule()
{
@@ -197,11 +161,7 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -222,8 +182,6 @@
}
}
-
-
/**
* Decodes the contents of the provided ASN.1 octet string as a name form
* definition according to the rules of this syntax. Note that the provided
@@ -736,8 +694,6 @@
optionalAttributes, extraProperties);
}
-
-
/**
* Reads the next token name from the name form definition, skipping over any
* leading or trailing spaces, and appends it to the provided buffer.
@@ -791,8 +747,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -871,8 +825,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -957,8 +909,6 @@
return startPos;
}
-
-
/**
* Reads the attribute type description or numeric OID from the provided
* string, skipping over any leading or trailing spaces, and appending the
@@ -1109,8 +1059,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1269,19 +1217,13 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
index e1eca0c..43519eb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class NumericStringEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getNumericStringMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
index 4fe2df6..3a5953e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class NumericStringOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getNumericStringOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
index 605b338..fd83add 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class NumericStringSubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getNumericStringSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
index 56cf95c..e313894 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
@@ -51,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -73,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -106,8 +100,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -118,8 +110,6 @@
return SYNTAX_NUMERIC_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -130,8 +120,6 @@
return SYNTAX_NUMERIC_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -142,8 +130,6 @@
return SYNTAX_NUMERIC_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +143,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +156,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +169,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +183,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -247,21 +225,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
index c617975..4c902be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OIDSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -53,14 +51,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -72,11 +68,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -95,8 +87,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -107,8 +97,6 @@
return SYNTAX_OID_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -119,8 +107,6 @@
return SYNTAX_OID_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -131,8 +117,6 @@
return SYNTAX_OID_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -146,8 +130,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -162,8 +144,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -177,8 +157,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -193,8 +171,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -215,21 +191,13 @@
invalidReason);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
index b00e214..6f0a122 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
@@ -63,19 +63,15 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -87,11 +83,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
@@ -124,77 +116,49 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getName()
{
return SYNTAX_OBJECTCLASS_NAME;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getOID()
{
return SYNTAX_OBJECTCLASS_OID;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getDescription()
{
return SYNTAX_OBJECTCLASS_DESCRIPTION;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MatchingRule getApproximateMatchingRule()
{
@@ -202,11 +166,7 @@
return null;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
@@ -227,8 +187,6 @@
}
}
-
-
/**
* Decodes the contents of the provided ASN.1 octet string as an objectclass
* definition according to the rules of this syntax. Note that the provided
@@ -935,8 +893,6 @@
extraProperties);
}
-
-
/**
* Reads the next token name from the objectclass definition, skipping over
* any leading or trailing spaces, and appends it to the provided buffer.
@@ -991,8 +947,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -1073,8 +1027,6 @@
return startPos;
}
-
-
/**
* Reads the value of a string enclosed in single quotes, skipping over the
* quotes and any leading or trailing spaces, and appending the string to the
@@ -1161,8 +1113,6 @@
return startPos;
}
-
-
/**
* Reads the attribute type/objectclass description or numeric OID from the
* provided string, skipping over any leading or trailing spaces, and
@@ -1317,8 +1267,6 @@
return startPos;
}
-
-
/**
* Reads the value for an "extra" parameter. It will handle a single unquoted
* word (which is technically illegal, but we'll allow it), a single quoted
@@ -1423,8 +1371,6 @@
valueList.add(valueBuffer.toString());
}
-
-
// Skip over any trailing spaces.
while ((startPos < length) && (valueStr.charAt(startPos) == ' '))
{
@@ -1443,8 +1389,6 @@
return startPos;
}
-
-
/**
* Indicates whether the provided objectclass or any of its superiors is equal
* to the "top" objectclass.
@@ -1477,21 +1421,13 @@
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
index 4acadcb..c88e84a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class ObjectIdentifierEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getObjectIdentifierMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
index 2c19829..2a32d65 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class ObjectIdentifierFirstComponentEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getObjectIdentifierFirstComponentMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
index c548448..498d1a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class OctetStringEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getOctetStringMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
index a13f372..57120b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class OctetStringOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getOctetStringOrderingMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
index 3a59bad..7a3050a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getOctetStringSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
index 5f36e48..8fd8cab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -53,17 +51,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -75,11 +71,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -105,8 +97,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -117,8 +107,6 @@
return SYNTAX_OCTET_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -129,8 +117,6 @@
return SYNTAX_OCTET_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -141,8 +127,6 @@
return SYNTAX_OCTET_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -156,8 +140,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -171,8 +153,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -186,8 +166,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -202,8 +180,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -223,21 +199,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
index bf48654..3ccf08b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/OtherMailboxSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,14 +52,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -73,11 +69,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -98,8 +90,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -110,8 +100,6 @@
return SYNTAX_OTHER_MAILBOX_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -122,8 +110,6 @@
return SYNTAX_OTHER_MAILBOX_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -134,8 +120,6 @@
return SYNTAX_OTHER_MAILBOX_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -149,8 +133,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -165,8 +147,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -180,8 +160,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -196,8 +174,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -285,21 +261,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
index 4ea2591..3054310 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PostalAddressSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -55,14 +53,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -74,11 +70,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -99,8 +91,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -111,8 +101,6 @@
return SYNTAX_POSTAL_ADDRESS_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -123,8 +111,6 @@
return SYNTAX_POSTAL_ADDRESS_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -135,8 +121,6 @@
return SYNTAX_POSTAL_ADDRESS_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -150,8 +134,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -166,8 +148,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -181,8 +161,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -197,8 +175,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -218,21 +194,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
index b5fc9ec..d1b278c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java
@@ -22,10 +22,8 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
-
package org.opends.server.schema;
import java.util.Collection;
@@ -43,14 +41,10 @@
public final class PresentationAddressEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +52,7 @@
matchingRule = CoreSchema.getPresentationAddressMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
index 3c881e4..9f77d88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressSyntax.java
@@ -22,26 +22,22 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
+import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
-
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
-
/**
* This class implements the presentation address attribute syntax, which is
* defined in RFC 1278. However, because this LDAP syntax is being deprecated,
@@ -53,20 +49,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -78,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -119,8 +109,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -131,8 +119,6 @@
return SYNTAX_PRESENTATION_ADDRESS_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -143,8 +129,6 @@
return SYNTAX_PRESENTATION_ADDRESS_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -155,8 +139,6 @@
return SYNTAX_PRESENTATION_ADDRESS_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -170,8 +152,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -185,8 +165,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -200,8 +178,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -215,8 +191,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -236,21 +210,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
index 86578b5..f36d5ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/PrintableStringSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -55,20 +53,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -80,11 +76,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -121,8 +113,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -133,8 +123,6 @@
return SYNTAX_PRINTABLE_STRING_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -145,8 +133,6 @@
return SYNTAX_PRINTABLE_STRING_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -157,8 +143,6 @@
return SYNTAX_PRINTABLE_STRING_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +156,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +169,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -202,8 +182,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -217,8 +195,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -271,21 +247,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
index d477a96..4ba7cd1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getProtocolInformationMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
index 5d894fe..806a1d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -53,20 +51,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default approximate matching rule for this syntax.
+ /** The default approximate matching rule for this syntax. */
private MatchingRule defaultApproximateMatchingRule;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -78,11 +74,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -119,8 +111,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -131,8 +121,6 @@
return SYNTAX_PROTOCOL_INFORMATION_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -143,8 +131,6 @@
return SYNTAX_PROTOCOL_INFORMATION_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -155,8 +141,6 @@
return SYNTAX_PROTOCOL_INFORMATION_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -170,8 +154,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -185,8 +167,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -200,8 +180,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -215,8 +193,6 @@
return defaultApproximateMatchingRule;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -236,21 +212,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
index 809d472..d17e775 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,17 +52,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -109,8 +101,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -121,8 +111,6 @@
return SYNTAX_SUBSTRING_ASSERTION_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -133,8 +121,6 @@
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -145,8 +131,6 @@
return SYNTAX_SUBSTRING_ASSERTION_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -160,8 +144,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -175,8 +157,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -190,8 +170,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -206,8 +184,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -263,21 +239,13 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
index a423ec9..2e3714e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -51,13 +51,13 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
/**
@@ -70,9 +70,7 @@
// No implementation required.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException {
@@ -219,20 +217,14 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isHumanReadable()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 4388597..ffcfd6a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,17 +52,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -109,8 +101,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -121,8 +111,6 @@
return SYNTAX_SUPPORTED_ALGORITHM_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -133,8 +121,6 @@
return SYNTAX_SUPPORTED_ALGORITHM_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -145,8 +131,6 @@
return SYNTAX_SUPPORTED_ALGORITHM_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -160,8 +144,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -175,8 +157,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -190,8 +170,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -206,8 +184,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -227,21 +203,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
index 37d6b58..fb811a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,15 +43,11 @@
public final class TelephoneNumberEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getTelephoneNumberMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
index e7b44ae..8e22dda 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getTelephoneNumberSubstringsMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
index 3e6b98c..578c617 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -61,20 +61,18 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Indicates whether this matching rule should operate in strict mode.
+ /** Indicates whether this matching rule should operate in strict mode. */
private boolean strictMode;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
- // The current configuration for this telephone number syntax.
+ /** The current configuration for this telephone number syntax. */
private TelephoneNumberAttributeSyntaxCfg currentConfig;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -86,11 +84,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(TelephoneNumberAttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -121,8 +115,6 @@
}
}
-
-
/**
* Performs any finalization that may be necessary for this attribute syntax.
*/
@@ -131,8 +123,6 @@
currentConfig.removeTelephoneNumberChangeListener(this);
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -143,8 +133,6 @@
return SYNTAX_TELEPHONE_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -155,8 +143,6 @@
return SYNTAX_TELEPHONE_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -167,8 +153,6 @@
return SYNTAX_TELEPHONE_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -182,8 +166,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -198,8 +180,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -213,8 +193,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -229,8 +207,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -319,8 +295,6 @@
}
}
-
-
/**
* Indicates whether the provided character is a valid separator for telephone
* number components when operating in strict mode.
@@ -342,11 +316,7 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationChangeAcceptable(
TelephoneNumberAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -355,11 +325,7 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationChange(
TelephoneNumberAttributeSyntaxCfg configuration)
{
@@ -369,21 +335,13 @@
return new ConfigChangeResult();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index f746dc4..2ce68b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.util.HashSet;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -43,8 +41,6 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
-
-
/**
* This class implements the teletex terminal identifier attribute syntax, which
* contains a printable string (the terminal identifier) followed by zero or
@@ -83,19 +79,15 @@
ALLOWED_TTX_PARAMETERS.add("private");
}
-
-
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -107,11 +99,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -140,8 +128,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -152,8 +138,6 @@
return SYNTAX_TELETEX_TERM_ID_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -164,8 +148,6 @@
return SYNTAX_TELETEX_TERM_ID_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -176,8 +158,6 @@
return SYNTAX_TELETEX_TERM_ID_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -191,8 +171,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -206,8 +184,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -221,8 +197,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -237,8 +211,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -381,21 +353,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
index c291dc3..06beb71 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelexNumberSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -54,17 +52,15 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -76,11 +72,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -106,8 +98,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -118,8 +108,6 @@
return SYNTAX_TELEX_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -130,8 +118,6 @@
return SYNTAX_TELEX_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -142,8 +128,6 @@
return SYNTAX_TELEX_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -157,8 +141,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -172,8 +154,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -187,8 +167,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -203,8 +181,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -329,21 +305,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
index c8791a0..e2f08a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UTCTimeSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -49,8 +47,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class implements the UTC time attribute syntax. This is very similar to
* the generalized time syntax (and actually has been deprecated in favor of
@@ -64,16 +60,12 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
/**
* The lock that will be used to provide threadsafe access to the date
* formatter.
*/
private static Object dateFormatLock;
-
-
/**
* The date formatter that will be used to convert dates into UTC time values.
* Note that all interaction with it must be synchronized.
@@ -87,18 +79,16 @@
private static Date datum2000;
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
- // The default substring matching rule for this syntax.
+ /** The default substring matching rule for this syntax. */
private MatchingRule defaultSubstringMatchingRule;
-
-
- /*
+ /**
* Create the date formatter that will be used to construct and parse
* normalized UTC time values.
*/
@@ -120,8 +110,6 @@
dateFormatLock = new Object();
}
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -133,11 +121,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -163,8 +147,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -175,8 +157,6 @@
return SYNTAX_UTC_TIME_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -187,8 +167,6 @@
return SYNTAX_UTC_TIME_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -199,8 +177,6 @@
return SYNTAX_UTC_TIME_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -214,8 +190,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -229,8 +203,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -244,8 +216,6 @@
return defaultSubstringMatchingRule;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -260,8 +230,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -691,8 +659,6 @@
}
}
-
-
/**
* Indicates whether the provided string contains a valid set of two or four
* UTC offset digits. The provided string must have either two or four
@@ -819,8 +785,6 @@
return true;
}
-
-
/**
* Retrieves an attribute value containing a UTC time representation of the
* provided date.
@@ -839,8 +803,6 @@
return ByteString.valueOf(valueString);
}
-
-
/**
* Decodes the provided normalized value as a UTC time value and
* retrieves a Java <CODE>Date</CODE> object containing its representation.
@@ -897,21 +859,13 @@
}
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
index ad0d710..51b68b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class UUIDEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- // Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getUUIDMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
index b2c17b89..1217f63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class UUIDOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,9 +54,7 @@
matchingRule = CoreSchema.getUUIDOrderingMatchingRule();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
index 91e34e5..c99328b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -52,14 +50,12 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
+ /** The default ordering matching rule for this syntax. */
private MatchingRule defaultOrderingMatchingRule;
-
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -71,11 +67,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -94,8 +86,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -106,8 +96,6 @@
return SYNTAX_UUID_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -118,8 +106,6 @@
return SYNTAX_UUID_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -130,8 +116,6 @@
return SYNTAX_UUID_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -145,8 +129,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -160,8 +142,6 @@
return defaultOrderingMatchingRule;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -176,8 +156,6 @@
return null;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -192,8 +170,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -277,21 +253,13 @@
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
index adf0c19..3dcacb1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class UniqueMemberEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getUniqueMemberMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
index 300f032..3efa77d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -46,9 +46,7 @@
{
private MatchingRule matchingRule;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -62,9 +60,7 @@
.toSchema().getMatchingRule(EMR_USER_PASSWORD_OID);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
index 4c83ba7..23128f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -44,14 +44,10 @@
public final class UserPasswordExactEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -59,11 +55,7 @@
matchingRule = CoreSchema.getInstance().getMatchingRule("1.3.6.1.4.1.26027.1.4.2");
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
index fe2039f..039f6c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordSyntax.java
@@ -28,8 +28,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -68,7 +66,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The default equality matching rule for this syntax.
+ /** The default equality matching rule for this syntax. */
private MatchingRule defaultEqualityMatchingRule;
/**
@@ -82,11 +80,7 @@
super();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -99,8 +93,6 @@
}
}
-
-
/**
* Retrieves the common name for this attribute syntax.
*
@@ -111,8 +103,6 @@
return SYNTAX_USER_PASSWORD_NAME;
}
-
-
/**
* Retrieves the OID for this attribute syntax.
*
@@ -123,8 +113,6 @@
return SYNTAX_USER_PASSWORD_OID;
}
-
-
/**
* Retrieves a description for this attribute syntax.
*
@@ -135,8 +123,6 @@
return SYNTAX_USER_PASSWORD_DESCRIPTION;
}
-
-
/**
* Retrieves the default equality matching rule that will be used for
* attributes with this syntax.
@@ -150,8 +136,6 @@
return defaultEqualityMatchingRule;
}
-
-
/**
* Retrieves the default ordering matching rule that will be used for
* attributes with this syntax.
@@ -166,8 +150,6 @@
return null;
}
-
-
/**
* Retrieves the default substring matching rule that will be used for
* attributes with this syntax.
@@ -182,8 +164,6 @@
return null;
}
-
-
/**
* Retrieves the default approximate matching rule that will be used for
* attributes with this syntax.
@@ -198,8 +178,6 @@
return null;
}
-
-
/**
* Indicates whether the provided value is acceptable for use in an attribute
* with this syntax. If it is not, then the reason may be appended to the
@@ -220,8 +198,6 @@
return true;
}
-
-
/**
* Decodes the provided user password value into its component parts.
*
@@ -280,8 +256,6 @@
return new String[] { toLowerCase(schemeName), encodedValue };
}
-
-
/**
* Indicates whether the provided value is encoded using the user password
* syntax.
@@ -325,21 +299,13 @@
&& closingBracePos != value.length() - 1;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isBEREncodingRequired()
{
return false;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isHumanReadable()
{
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
index cdbe385..cad0614 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
@@ -43,14 +43,10 @@
public final class WordEqualityMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
{
- //Associated Matching Rule.
+ /** Associated Matching Rule. */
private org.forgerock.opendj.ldap.schema.MatchingRule matchingRule;
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void initializeMatchingRule(MatchingRuleCfg configuration)
throws ConfigException, InitializationException
@@ -58,11 +54,7 @@
matchingRule = CoreSchema.getWordMatchingRule();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
index c9c7ea7..ac2ebd6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.tasks;
@@ -62,17 +62,13 @@
/** The list of files to be added to the server schema. */
private TreeSet<String> filesToAdd;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getDisplayName() {
return INFO_TASK_ADD_SCHEMA_FILE_NAME.get();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -177,9 +173,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected TaskState runTask()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
index add3b6e..9e4628a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
@@ -148,26 +148,21 @@
private ArrayList<Backend<?>> backendsToArchive;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getDisplayName() {
return INFO_TASK_BACKUP_NAME.get();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getAttributeDisplayName(String attrName) {
return argDisplayMap.get(attrName);
}
- /**
- * {@inheritDoc}
- */
- @Override public void initializeTask() throws DirectoryException
+ /** {@inheritDoc} */
+ @Override
+ public void initializeTask() throws DirectoryException
{
// If the client connection is available, then make sure the associated
// client has the BACKEND_BACKUP privilege.
@@ -550,9 +545,7 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void interruptTask(TaskState interruptState, LocalizableMessage interruptReason)
{
@@ -567,18 +560,14 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isInterruptable() {
return true;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected TaskState runTask()
{
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 73dea2a..6002e15 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,16 +48,12 @@
extends Task
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public LocalizableMessage getDisplayName() {
return INFO_TASK_ENTER_LOCKDOWN_MODE_NAME.get();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -87,9 +83,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected TaskState runTask()
{
DirectoryServer.setLockdownMode(true);
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 f6ccd8d..b7eeb2b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,16 +48,12 @@
extends Task
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public LocalizableMessage getDisplayName() {
return INFO_TASK_LEAVE_LOCKDOWN_MODE_NAME.get();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -87,9 +83,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
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 8123abd..2823d1a 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
@@ -22,19 +22,15 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import org.opends.server.core.DirectoryServer;
import org.opends.server.api.DirectoryThread;
-
-
-
/**
* This class defines a thread that will be spawned to invoke a Directory Server
* in-core restart. That is, the server will perform an internal shutdown, and
@@ -60,7 +56,7 @@
- // The shutdown message that will be used.
+ /** The shutdown message that will be used. */
private LocalizableMessage 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 66683c4..51192b2 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
@@ -59,17 +59,17 @@
- // 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.
+ /** The shutdown message that will be used. */
private LocalizableMessage shutdownMessage;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public LocalizableMessage getDisplayName() {
return INFO_TASK_SHUTDOWN_NAME.get();
}
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 52b42db..1f74312 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
import org.forgerock.i18n.LocalizableMessage;
@@ -51,7 +51,7 @@
- // The shutdown message that will be used.
+ /** The shutdown message that will be used. */
private LocalizableMessage shutdownMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
index 6fab083..eefd20b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
@@ -62,7 +62,7 @@
*/
public class JavaPropertiesTool extends ConsoleApplication
{
- // The argument parser
+ /** The argument parser. */
private JavaPropertiesToolArgumentParser argParser;
/**
@@ -438,52 +438,40 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isQuiet()
{
return argParser.quietArg.isPresent();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isInteractive()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isMenuDrivenMode() {
return true;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isScriptFriendly() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isAdvancedMode() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isVerbose() {
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
index 2ac18a6..f06a2f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.tools;
@@ -99,47 +99,49 @@
public class LDAPAuthenticationHandler
implements PrivilegedExceptionAction<Object>, CallbackHandler
{
- // The bind DN for GSSAPI authentication.
+ /** The bind DN for GSSAPI authentication. */
private ByteSequence gssapiBindDN;
- // The LDAP reader that will be used to read data from the server.
+ /** The LDAP reader that will be used to read data from the server. */
private final LDAPReader reader;
- // The LDAP writer that will be used to send data to the server.
+ /** The LDAP writer that will be used to send data to the server. */
private final LDAPWriter writer;
- // The atomic integer that will be used to obtain message IDs for request
- // messages.
+ /**
+ * The atomic integer that will be used to obtain message IDs for request
+ * messages.
+ */
private final AtomicInteger nextMessageID;
- // An array filled with the inner pad byte.
+ /** An array filled with the inner pad byte. */
private byte[] iPad;
- // An array filled with the outer pad byte.
+ /** An array filled with the outer pad byte. */
private byte[] oPad;
- // The authentication password for GSSAPI authentication.
+ /** The authentication password for GSSAPI authentication. */
private char[] gssapiAuthPW;
- // The message digest that will be used to create MD5 hashes.
+ /** The message digest that will be used to create MD5 hashes. */
private MessageDigest md5Digest;
- // The secure random number generator for use by this authentication handler.
+ /** The secure random number generator for use by this authentication handler. */
private SecureRandom secureRandom;
- // The authentication ID for GSSAPI authentication.
+ /** The authentication ID for GSSAPI authentication. */
private String gssapiAuthID;
- // The authorization ID for GSSAPI authentication.
+ /** The authorization ID for GSSAPI authentication. */
private String gssapiAuthzID;
- // The quality of protection for GSSAPI authentication.
+ /** The quality of protection for GSSAPI authentication. */
private String gssapiQoP;
- // The host name used to connect to the remote system.
+ /** The host name used to connect to the remote system. */
private final String hostName;
- // The SASL mechanism that will be used for callback authentication.
+ /** The SASL mechanism that will be used for callback authentication. */
private String saslMechanism;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
index 1cc33bf..b6b7005 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
@@ -71,10 +71,10 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The hostname to connect to.
+ /** The hostname to connect to. */
private String hostName;
- // The port number on which the directory server is accepting requests.
+ /** The port number on which the directory server is accepting requests. */
private int portNumber = 389;
private LDAPConnectionOptions connectionOptions;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java
index e0f8cb7..342807b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageAccount.java
@@ -478,28 +478,28 @@
- // The LDAP reader used to read responses from the server.
+ /** The LDAP reader used to read responses from the server. */
private static LDAPReader ldapReader;
- // The LDAP writer used to send requests to the server.
+ /** The LDAP writer used to send requests to the server. */
private static LDAPWriter ldapWriter;
- // The counter that will be used for LDAP message IDs.
+ /** The counter that will be used for LDAP message IDs. */
private static AtomicInteger nextMessageID;
- // The connection to the server.
+ /** The connection to the server. */
private static LDAPConnection connection;
- // The print stream to use when writing messages to standard error.
+ /** The print stream to use when writing messages to standard error. */
private static PrintStream err;
- // The print stream to use when writing messages to standard output.
+ /** The print stream to use when writing messages to standard output. */
private static PrintStream out;
- // The DN of the user to target with the operation.
+ /** The DN of the user to target with the operation. */
private static String targetDNString;
- // The argument parser for this tool.
+ /** The argument parser for this tool. */
private static SubCommandArgumentParser argParser;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
index 5bb1347..4c130d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
@@ -350,50 +350,38 @@
return 0;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isAdvancedMode() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isInteractive() {
return !noPrompt.isPresent();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isMenuDrivenMode() {
return !task.isPresent() && !cancel.isPresent() && !summary.isPresent() &&
!noPrompt.isPresent();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isQuiet() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isScriptFriendly() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isVerbose() {
return false;
@@ -523,9 +511,7 @@
private static abstract class TopMenuCallback
implements MenuCallback<Void> {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<Void> invoke(ConsoleApplication app) throws ClientException {
return invoke((ManageTasks)app);
@@ -561,9 +547,7 @@
this.taskId = taskId;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<TaskEntry> invoke(ConsoleApplication app)
throws ClientException
@@ -617,9 +601,7 @@
this.taskId = taskId;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<Void> invoke(ManageTasks app) throws ClientException {
MenuResult<TaskEntry> res = new PrintTaskInfo(taskId).invoke(app);
@@ -684,9 +666,7 @@
super(taskId);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<TaskEntry> invoke(ManageTasks app)
throws ClientException
@@ -876,9 +856,7 @@
super(taskId);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected MenuResult<TaskEntry> invoke(ManageTasks app)
throws ClientException
@@ -937,9 +915,7 @@
this.cancelableIndices = cancelableIndices;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<Void> invoke(ManageTasks app)
throws ClientException
@@ -1010,9 +986,7 @@
super(taskId);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public MenuResult<TaskEntry> invoke(ManageTasks app)
throws ClientException
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 08e4994..307a9d2 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools;
import org.forgerock.i18n.LocalizableMessage;
@@ -57,7 +57,7 @@
- // The singleton trust manager array for this class.
+ /** The singleton trust manager array for this class. */
private static TrustManager[] trustManagerArray =
new TrustManager[] { new PromptTrustManager() };
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
index 7badd6b..6d95dd4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/WaitForFileDelete.java
@@ -397,54 +397,42 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isAdvancedMode()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isInteractive()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isMenuDrivenMode()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isQuiet()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isScriptFriendly()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isVerbose()
{
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 87c7924..0ad458a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -65,9 +65,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addTaskAttributes(List<RawAttribute> attributes)
{
ArrayList<ByteString> baseDNs = new ArrayList<ByteString>();
@@ -83,73 +81,55 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public List<String> getDependencyIds()
{
return taskSchedule.getDependencyIds();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public FailedDependencyAction getFailedDependencyAction()
{
return taskSchedule.getFailedDependencyAction();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public List<String> getNotifyUponCompletionEmailAddresses()
{
return taskSchedule.getNotifyUponCompletionEmailAddresses();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public List<String> getNotifyUponErrorEmailAddresses()
{
return taskSchedule.getNotifyUponErrorEmailAddresses();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getRecurringDateTime()
{
return taskSchedule.getRecurringDateTime();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Date getStartDateTime()
{
return taskSchedule.getStartDate();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<?> getTaskClass()
{
return org.opends.server.tasks.PurgeConflictsHistoricalTask.class;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getTaskId()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getTaskObjectclass()
{
return "ds-task-purge-conflicts-historical";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
index 10d6266..1d544f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -38,20 +38,14 @@
*/
public enum ReplicationCliReturnCode
{
- /**
- * successful.
- */
+ /** Successful. */
SUCCESSFUL(0, INFO_REPLICATION_SUCCESSFUL.get()),
- /**
- * successful but no operation was performed.
- */
+ /** Successful but no operation was performed. */
SUCCESSFUL_NOP(SUCCESSFUL.getReturnCode(),
INFO_REPLICATION_SUCCESSFUL_NOP.get()),
- /**
- * Unable to initialize arguments.
- */
+ /** Unable to initialize arguments. */
CANNOT_INITIALIZE_ARGS(1, ERR_REPLICATION_NO_MESSAGE.get()),
/**
@@ -60,24 +54,16 @@
*/
ERROR_USER_DATA(2, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * The user canceled the operation in interactive mode.
- */
+ /** The user canceled the operation in interactive mode. */
USER_CANCELLED(3, ERR_REPLICATION_USER_CANCELLED.get()),
- /**
- * Conflicting arguments.
- */
+ /** Conflicting arguments. */
CONFLICTING_ARGS(4, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * The provided base DNs cannot be used to enable replication.
- */
+ /** The provided base DNs cannot be used to enable replication. */
REPLICATION_CANNOT_BE_ENABLED_ON_BASEDN(5, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * The provided base DNs cannot be used to disable replication.
- */
+ /** The provided base DNs cannot be used to disable replication. */
REPLICATION_CANNOT_BE_DISABLED_ON_BASEDN(6, ERR_REPLICATION_NO_MESSAGE.get()),
/**
@@ -104,124 +90,80 @@
*/
INITIALIZING_TRIES_COMPLETED(10, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error enabling replication on a base DN.
- */
+ /** Error enabling replication on a base DN. */
ERROR_ENABLING_REPLICATION_ON_BASEDN(11, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error initializing base DN.
- */
+ /** Error initializing base DN. */
ERROR_INITIALIZING_BASEDN_GENERIC(12, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error reading configuration.
- */
+ /** Error reading configuration. */
ERROR_READING_CONFIGURATION(13, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error updating ADS.
- */
+ /** Error updating ADS. */
ERROR_UPDATING_ADS(14, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error reading ADS.
- */
+ /** Error reading ADS. */
ERROR_READING_ADS(15, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error reading TopologyCache.
- */
+ /** Error reading TopologyCache. */
ERROR_READING_TOPOLOGY_CACHE(16, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error configuring replication server.
- */
+ /** Error configuring replication server. */
ERROR_CONFIGURING_REPLICATIONSERVER(17, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Unsupported ADS scenario.
- */
+ /** Unsupported ADS scenario. */
REPLICATION_ADS_MERGE_NOT_SUPPORTED(18, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error disabling replication on base DN.
- */
+ /** Error disabling replication on base DN. */
ERROR_DISABLING_REPLICATION_ON_BASEDN(19, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error removing replication port reference on base DN.
- */
+ /** Error removing replication port reference on base DN. */
ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN(20,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error initializing Administration Framework.
- */
+ /** Error initializing Administration Framework. */
ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK(21,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error seeding trustore.
- */
+ /** Error seeding trustore. */
ERROR_SEEDING_TRUSTORE(22, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error launching pre external initialization.
- */
+ /** Error launching pre external initialization. */
ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION(23,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error launching pre external initialization.
- */
+ /** Error launching pre external initialization. */
ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION(24,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error disabling replication server.
- */
+ /** Error disabling replication server. */
ERROR_DISABLING_REPLICATION_SERVER(25, ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error executing purge historical.
- */
+ /** Error executing purge historical. */
ERROR_EXECUTING_PURGE_HISTORICAL(26,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * The provided base DNs cannot be purged.
- */
+ /** The provided base DNs cannot be purged. */
HISTORICAL_CANNOT_BE_PURGED_ON_BASEDN(27,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error launching purge historical.
- */
+ /** Error launching purge historical. */
ERROR_LAUNCHING_PURGE_HISTORICAL(28,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error loading configuration class in local purge historical.
- */
+ /** Error loading configuration class in local purge historical. */
ERROR_LOCAL_PURGE_HISTORICAL_CLASS_LOAD(29,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Error starting server in local purge historical.
- */
+ /** Error starting server in local purge historical. */
ERROR_LOCAL_PURGE_HISTORICAL_SERVER_START(30,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Timeout error in local purge historical.
- */
+ /** Timeout error in local purge historical. */
ERROR_LOCAL_PURGE_HISTORICAL_TIMEOUT(31,
ERR_REPLICATION_NO_MESSAGE.get()),
- /**
- * Generic error executing local purge historical.
- */
+ /** Generic error executing local purge historical. */
ERROR_LOCAL_PURGE_HISTORICAL_EXECUTING(32,
ERR_REPLICATION_NO_MESSAGE.get());
@@ -229,7 +171,7 @@
private LocalizableMessage message;
private int returnCode;
- // Private constructor.
+ /** Private constructor. */
private ReplicationCliReturnCode(int returnCode, LocalizableMessage message)
{
this.returnCode = returnCode;
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 0e3c960..0786a7d 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,10 +48,10 @@
public class AttributeValueTag
extends Tag
{
- // The attribute type that specifies which value should be used.
+ /** The attribute type that specifies which value should be used. */
private AttributeType attributeType;
- // The maximum number of characters to include from the value.
+ /** The maximum number of characters to include from the value. */
private int numCharacters;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
index 3950c53..678fd88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
@@ -48,23 +48,25 @@
*/
public class Branch
{
- // The DN for this branch entry.
+ /** The DN for this branch entry. */
private DN branchDN;
- // The number of entries that should be created below this branch for each
- // subordinate template.
+ /**
+ * The number of entries that should be created below this branch for each
+ * subordinate template.
+ */
private int[] numEntriesPerTemplate;
- // The names of the subordinate templates for this branch.
+ /** The names of the subordinate templates for this branch. */
private String[] subordinateTemplateNames;
- // The set of subordinate templates for this branch.
+ /** The set of subordinate templates for this branch. */
private Template[] subordinateTemplates;
- // The set of template lines that correspond to the RDN components.
+ /** The set of template lines that correspond to the RDN components. */
private TemplateLine[] rdnLines;
- // The set of extra lines that should be included in this branch entry.
+ /** The set of extra lines that should be included in this branch entry. */
private TemplateLine[] extraLines;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
index 6ca490f..261e165 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/DNTag.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -45,7 +45,7 @@
public class DNTag
extends Tag
{
- // The number of DN components to include.
+ /** The number of DN components to include. */
private int numComponents;
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 1fa4fff..4a13363 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,19 +48,19 @@
public class FileTag
extends Tag
{
- // Indicates whether the values should be selected sequentially or at random.
+ /** Indicates whether the values should be selected sequentially or at random. */
private boolean sequential;
- // The file containing the data.
+ /** The file containing the data. */
private File dataFile;
- // The index used for sequential access.
+ /** The index used for sequential access. */
private int nextIndex;
- // The random number generator for this tag.
+ /** The random number generator for this tag. */
private Random random;
- // The array of lines read from the file.
+ /** The array of lines read from the file. */
private String[] fileLines;
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 3caee8e..373ff18 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,7 +44,7 @@
public class FirstNameTag
extends Tag
{
- // The template file with which this tag is associated.
+ /** The template file with which this tag is associated. */
private TemplateFile templateFile;
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 57ed097..b8f29b5 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,10 +48,10 @@
public class IfAbsentTag
extends Tag
{
- // The attribute type for which to make the determination.
+ /** The attribute type for which to make the determination. */
private AttributeType attributeType;
- // The value for which to make the determination.
+ /** The value for which to make the determination. */
private String assertionValue;
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 c6062af..1ed57b4 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -48,10 +48,10 @@
public class IfPresentTag
extends Tag
{
- // The attribute type for which to make the determination.
+ /** The attribute type for which to make the determination. */
private AttributeType attributeType;
- // The value for which to make the determination.
+ /** The value for which to make the determination. */
private String assertionValue;
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 3c556cf..c740563 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,7 +44,7 @@
public class LastNameTag
extends Tag
{
- // The template file with which this tag is associated.
+ /** The template file with which this tag is associated. */
private TemplateFile templateFile;
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 33ee518..5a2e4d0 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
@@ -49,16 +49,16 @@
public class ListTag
extends Tag
{
- // The ultimate cumulative weight.
+ /** The ultimate cumulative weight. */
private int cumulativeWeight;
- // The set of cumulative weights for the list items.
+ /** The set of cumulative weights for the list items. */
private int[] valueWeights;
- // The set of values in the list.
+ /** The set of values in the list. */
private String[] valueStrings;
- // The random number generator for this tag.
+ /** The random number generator for this tag. */
private Random random;
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 ac9667d..9ca5fb0 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
@@ -51,33 +51,37 @@
extends InputStream
implements EntryWriter
{
- // Indicates whether all of the entries have been generated.
+ /** Indicates whether all of the entries have been generated. */
private boolean allGenerated;
- // Indicates whether this input stream has been closed.
+ /** Indicates whether this input stream has been closed. */
private boolean closed;
- // The byte array output stream that will be used to convert entries to byte
- // arrays with their LDIF representations.
+ /**
+ * The byte array output stream that will be used to convert entries to byte
+ * arrays with their LDIF representations.
+ */
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.
+ /** The IOException that should be thrown the next time a read is requested. */
private IOException ioException;
- // The LDIF writer that will be used to write the entries to LDIF.
+ /** The LDIF writer that will be used to write the entries to LDIF. */
private LDIFWriter ldifWriter;
- // The queue used to hold generated entries until they can be read.
+ /** The queue used to hold generated entries until they can be read. */
private LinkedBlockingQueue<TemplateEntry> entryQueue;
- // The background thread being used to actually generate the entries.
+ /** The background thread being used to actually generate the entries. */
private MakeLDIFInputStreamThread generatorThread;
- // The template file to use to generate the entries.
+ /** The template file to use to generate the entries. */
private TemplateFile templateFile;
@@ -202,9 +206,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean writeEntry(TemplateEntry entry)
throws IOException, MakeLDIFException
{
@@ -224,9 +226,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
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 0618afd..08b6acc 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -40,17 +41,17 @@
class MakeLDIFInputStreamThread
extends DirectoryThread
{
- // The MakeLDIF input stream that this thread is feeding.
+ /** The MakeLDIF input stream that this thread is feeding. */
private MakeLDIFInputStream inputStream;
- // The template file to use to generate the entries.
+ /** The template file to use to generate the entries. */
private TemplateFile templateFile;
/**
* Creates a new instance of this MakeLDIF input stream thread that will feed
- * the provided input strema.
+ * the provided input stream.
*
* @param inputStream The MakeLDIF input stream that this thread will feed.
* @param templateFile The template file to use to generate the entries.
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 5ee12ac..7714ceb 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -45,10 +45,10 @@
public class PresenceTag
extends Tag
{
- // The percentage of the entries in which this attribute value should appear.
+ /** The percentage of the entries in which this attribute value should appear. */
private int percentage;
- // The random number generator for this tag.
+ /** The random number generator for this tag. */
private Random random;
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 9695856..634f7dd 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
@@ -164,35 +164,37 @@
- // The character set that should be used to generate the values.
+ /** The character set that should be used to generate the values. */
private char[] characterSet;
- // The decimal format used to format numeric values.
+ /** 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.
+ /** The maximum number of characters to include in the value. */
private int maxLength;
- // The minimum number of characters to include in the value.
+ /** The minimum number of characters to include in the value. */
private int minLength;
- // The type of random value that should be generated.
+ /** The type of random value that should be generated. */
private int randomType;
- // The maximum numeric value that should be generated.
+ /** The maximum numeric value that should be generated. */
private long maxValue;
- // The minimum numeric value that should be generated.
+ /** The minimum numeric value that should be generated. */
private long minValue;
- // The number of values between the minimum and maximum value (inclusive).
+ /** The number of values between the minimum and maximum value (inclusive). */
private long valueRange;
- // The random number generator for this tag.
+ /** The random number generator for this tag. */
private Random random;
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 db76ec1..4a33ca0 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,13 +44,13 @@
public class SequentialTag
extends Tag
{
- // Indicates whether to reset for each parent.
+ /** Indicates whether to reset for each parent. */
private boolean resetOnNewParents;
- // The initial value in the sequence.
+ /** The initial value in the sequence. */
private int initialValue;
- // The next value in the sequence.
+ /** The next value in the sequence. */
private int nextValue;
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 42ba2ea..fc6b03f 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,7 +44,7 @@
public class StaticTextTag
extends Tag
{
- // The static text to include in the LDIF.
+ /** The static text to include in the LDIF. */
private String text;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java
index 7cd41dc..55ac69b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TagResult.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -58,16 +59,16 @@
- // Indicates whether to keep processing the associated line.
+ /** Indicates whether to keep processing the associated line. */
private boolean keepProcessingLine;
- // Indicates whether to keep processing the associated entry.
+ /** Indicates whether to keep processing the associated entry. */
private boolean keepProcessingEntry;
- // Indicates whether to keep processing entries below the associated parent.
+ /** Indicates whether to keep processing entries below the associated parent. */
private boolean keepProcessingParent;
- // Indicates whether to keep processing entries for the template file.
+ /** Indicates whether to keep processing entries for the template file. */
private boolean keepProcessingTemplateFile;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
index 85e1fbc..5845db7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
@@ -45,26 +45,28 @@
*/
public class Template
{
- // The attribute types that are used in the RDN for entries generated using
- // this template.
+ /**
+ * The attribute types that are used in the RDN for entries generated using
+ * this template.
+ */
private AttributeType[] rdnAttributes;
- // The number of entries to create for each subordinate template.
+ /** The number of entries to create for each subordinate template. */
private int[] numEntriesPerTemplate;
- // The name for this template.
+ /** The name for this template. */
private String name;
- // The names of the subordinate templates below this template.
+ /** The names of the subordinate templates below this template. */
private String[] subordinateTemplateNames;
- // The subordinate templates below this template.
+ /** The subordinate templates below this template. */
private Template[] subordinateTemplates;
- // The template file that contains this template.
+ /** The template file that contains this template. */
private TemplateFile templateFile;
- // The set of template lines for this template.
+ /** The set of template lines for this template. */
private TemplateLine[] templateLines;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
index 0a8c111..7a69ae3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -46,21 +46,25 @@
*/
public class TemplateEntry
{
- // The branch used to generate this entry (if it is associated with a branch).
+ /** The branch used to generate this entry (if it is associated with a branch). */
private Branch branch;
- // The DN for this template entry, if it is known.
+ /** The DN for this template entry, if it is known. */
private DN dn;
- // The DN of the parent entry for this template entry, if it is available.
+ /** The DN of the parent entry for this template entry, if it is available. */
private DN parentDN;
- // The set of attributes associated with this template entry, mapped from the
- // lowercase name of the attribute to the list of generated values.
+ /**
+ * The set of attributes associated with this template entry, mapped from the
+ * lowercase name of the attribute to the list of generated values.
+ */
private LinkedHashMap<AttributeType,ArrayList<TemplateValue>> attributes;
- // The template used to generate this entry (if it is associated with a
- // template).
+ /**
+ * The template used to generate this entry (if it is associated with a
+ * template).
+ */
private Template template;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java
index d02675e..f316f7c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateFile.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -74,56 +74,64 @@
- // A map of the contents of various text files used during the parsing
- // process, mapped from absolute path to the array of lines in the file.
+ /**
+ * A map of the contents of various text files used during the parsing
+ * process, mapped from absolute path to the array of lines in the file.
+ */
private HashMap<String,String[]> fileLines;
- // The index of the next first name value that should be used.
+ /** The index of the next first name value that should be used. */
private int firstNameIndex;
- // The index of the next last name value that should be used.
+ /** The index of the next last name value that should be used. */
private int lastNameIndex;
- // A counter used to keep track of the number of times that the larger of the
- // first/last name list has been completed.
+ /**
+ * A counter used to keep track of the number of times that the larger of the
+ * first/last name list has been completed.
+ */
private int nameLoopCounter;
- // A counter that will be used in case we have exhausted all possible first
- // and last name combinations.
+ /**
+ * A counter that will be used in case we have exhausted all possible first
+ * and last name combinations.
+ */
private int nameUniquenessCounter;
- // The set of branch definitions for this template file.
+ /** The set of branch definitions for this template file. */
private LinkedHashMap<DN,Branch> branches;
- // The set of constant definitions for this template file.
+ /** The set of constant definitions for this template file. */
private LinkedHashMap<String,String> constants;
- // The set of registered tags for this template file.
+ /** The set of registered tags for this template file. */
private LinkedHashMap<String,Tag> registeredTags;
- // The set of template definitions for this template file.
+ /** The set of template definitions for this template file. */
private LinkedHashMap<String,Template> templates;
- // The random number generator for this template file.
+ /** The random number generator for this template file. */
private Random random;
- // The next first name that should be used.
+ /** The next first name that should be used. */
private String firstName;
- // The next last name that should be used.
+ /** The next last name that should be used. */
private String lastName;
- // The resource path to use for filesystem elements that cannot be found
- // anywhere else.
+ /**
+ * The resource path to use for filesystem elements that cannot be found
+ * anywhere else.
+ */
private String resourcePath;
- // The path to the directory containing the template file, if available.
+ /** The path to the directory containing the template file, if available. */
private String templatePath;
- // The set of first names to use when generating the LDIF.
+ /** The set of first names to use when generating the LDIF. */
private String[] firstNames;
- // The set of last names to use when generating the LDIF.
+ /** The set of last names to use when generating the LDIF. */
private String[] lastNames;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
index 4fd023d..4fba780 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
@@ -34,19 +34,19 @@
*/
public class TemplateLine
{
- // The attribute type for this template line.
+ /** The attribute type for this template line. */
private AttributeType attributeType;
- // The line number on which this template line appears in the template file.
+ /** The line number on which this template line appears in the template file. */
private int lineNumber;
- // The set of tags for this template line.
+ /** The set of tags for this template line. */
private Tag[] tags;
- // Whether this line corresponds to an URL value or not.
+ /** Whether this line corresponds to an URL value or not. */
private boolean isURL;
- // Whether this line corresponds to a base64 encoded value or not.
+ /** Whether this line corresponds to a base64 encoded value or not. */
private boolean isBase64;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java
index 8c1a005..be48d4a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateValue.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.tools.makeldif;
@@ -36,10 +37,10 @@
*/
public class TemplateValue
{
- // The generated template value.
+ /** The generated template value. */
private StringBuilder templateValue;
- // The template line used to generate this value.
+ /** The template line used to generate this value. */
private TemplateLine templateLine;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
index 03a2280..7a56904 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/UnderscoreDNTag.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
import org.forgerock.i18n.LocalizableMessage;
@@ -45,7 +45,7 @@
public class UnderscoreDNTag
extends Tag
{
- // The number of DN components to include.
+ /** The number of DN components to include. */
private int numComponents;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
index 4c17bd8..a908297 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
@@ -67,8 +67,10 @@
private int hashCode;
- // These attributes associated with the ds-task object
- // class are all handled explicitly below in the constructor
+ /**
+ * These attributes associated with the ds-task object
+ * class are all handled explicitly below in the constructor.
+ */
private static Set<String> supAttrNames = new HashSet<String>();
static {
supAttrNames.add("ds-task-id");
@@ -180,9 +182,7 @@
return hashCode;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(Object o)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
index 1faa763..998b805 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
@@ -86,19 +86,22 @@
*/
private static final int RUN_ONLINE = 52;
- // Number of milliseconds this utility will wait before reloading
- // this task's entry in the directory while it is polling for status
+ /**
+ * Number of milliseconds this utility will wait before reloading
+ * this task's entry in the directory while it is polling for status.
+ */
private static final int SYNCHRONOUS_TASK_POLL_INTERVAL = 1000;
private LDAPConnectionArgumentParser argParser;
private TaskScheduleArgs taskScheduleArgs;
- // Argument used to know whether we must test if we must run in off-line
- // mode.
+ /**
+ * Argument used to know whether we must test if we must run in off-line mode.
+ */
private BooleanArgument testIfOfflineArg;
- // This CLI is always using the administration connector with SSL
+ /** This CLI is always using the administration connector with SSL. */
private static final boolean alwaysSSL = true;
/**
@@ -187,49 +190,37 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Date getStartDateTime() {
return taskScheduleArgs.getStartDateTime();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRecurringDateTime() {
return taskScheduleArgs.getRecurringDateTime();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public List<String> getDependencyIds() {
return taskScheduleArgs.getDependencyIds();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public FailedDependencyAction getFailedDependencyAction() {
return taskScheduleArgs.getFailedDependencyAction();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public List<String> getNotifyUponCompletionEmailAddresses() {
return taskScheduleArgs.getNotifyUponCompletionEmailAddresses();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public List<String> getNotifyUponErrorEmailAddresses() {
return taskScheduleArgs.getNotifyUponErrorEmailAddresses();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
index 34c4dc8..d0ccfce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tools.upgrade;
@@ -40,9 +40,7 @@
// No implementation required.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void interact(UpgradeContext context)
throws ClientException
@@ -50,18 +48,14 @@
// Nothing to do.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void perform(UpgradeContext context) throws ClientException
{
// Must be implemented.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void verify(UpgradeContext context)
throws ClientException
@@ -69,9 +63,7 @@
// Nothing to do.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void postUpgrade(UpgradeContext context)
throws ClientException
@@ -79,9 +71,7 @@
// Nothing to do.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void postponePostUpgrade(UpgradeContext context)
throws ClientException
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 965279b..8f246ab 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
@@ -319,9 +319,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public FileOperation copyForChild(File child)
{
return new CopyOperation(child, destination, overwrite);
@@ -342,9 +340,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void apply() throws IOException
{
final File objectFile = getObjectFile();
@@ -518,9 +514,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public FileOperation copyForChild(File child)
{
return new DeleteOperation(child, deletionPolicy);
@@ -528,9 +522,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void apply() throws IOException
{
File file = getObjectFile();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
index fbef0cf..c931294 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -860,7 +860,7 @@
return modifiedLines;
}
- // Prevent instantiation.
+ /** Prevent instantiation. */
private UpgradeUtils()
{
throw new AssertionError();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java
index 9c785f4..1a39822 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AbstractAttribute.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -79,9 +79,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final boolean equals(Object o)
{
@@ -319,9 +317,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final String toString()
{
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 241a836..0e011ff 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -65,7 +66,7 @@
- // The human-readable name for this policy.
+ /** The human-readable name for this policy. */
private String policyName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java
index 903b39c..ff2ca68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AccountStatusNotification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -52,19 +52,23 @@
mayInvoke=true)
public final class AccountStatusNotification
{
- // The notification type for this account status notification.
+ /** The notification type for this account status notification. */
private AccountStatusNotificationType notificationType;
- // The entry for the user to whom this notification applies.
+ /** The entry for the user to whom this notification applies. */
private Entry userEntry;
- // A set of additional properties that may be useful for this
- // notification.
+ /**
+ * A set of additional properties that may be useful for this
+ * notification.
+ */
private Map<AccountStatusNotificationProperty,List<String>>
notificationProperties;
- // A message that provides additional information for this account
- // status notification.
+ /**
+ * A message that provides additional information for this account
+ * status notification.
+ */
private LocalizableMessage message;
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 6fd6076..1eea501 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -129,7 +129,7 @@
- // The notification type name.
+ /** The notification type name. */
private String 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 81d8c5e..5206f0c 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -148,7 +148,7 @@
- // The notification type name.
+ /** The notification type name. */
private String name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
index 85d85bc..28ad766 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AdditionalLogItem.java
@@ -192,9 +192,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
@@ -202,12 +200,9 @@
{
return key;
}
- else
- {
- final StringBuilder builder = new StringBuilder(key.length() + 16);
- toString(builder);
- return builder.toString();
- }
+ final StringBuilder builder = new StringBuilder(key.length() + 16);
+ toString(builder);
+ return builder.toString();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
index 902ae44..c8d98d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeBuilder.java
@@ -118,10 +118,10 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The attribute type for this attribute.
+ /** The attribute type for this attribute. */
private final AttributeType attributeType;
- // The name of this attribute as provided by the end user.
+ /** The name of this attribute as provided by the end user. */
private final String name;
/**
@@ -154,9 +154,7 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final ConditionResult approximatelyEqualTo(ByteString assertionValue)
{
@@ -199,9 +197,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final boolean contains(ByteString value)
{
@@ -231,9 +227,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final AttributeType getAttributeType()
{
@@ -242,9 +236,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final String getName()
{
@@ -253,9 +245,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final ConditionResult greaterThanOrEqualTo(ByteString assertionValue)
{
@@ -300,9 +290,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final boolean isVirtual()
{
@@ -311,9 +299,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final Iterator<ByteString> iterator()
{
@@ -322,9 +308,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final ConditionResult lessThanOrEqualTo(ByteString assertionValue)
{
@@ -370,9 +354,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final ConditionResult matchesSubstring(
ByteString subInitial,
@@ -421,9 +403,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final int size()
{
@@ -442,9 +422,7 @@
return hashCode;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final void toString(StringBuilder buffer)
{
@@ -466,10 +444,10 @@
extends RealAttribute
{
- // The normalized options.
+ /** The normalized options. */
private final SortedSet<String> normalizedOptions;
- // The options.
+ /** The options. */
private final Set<String> options;
@@ -502,9 +480,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<String> getOptions()
{
@@ -513,9 +489,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOption(String option)
{
@@ -525,9 +499,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOptions()
{
@@ -565,9 +537,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getNameWithOptions()
{
@@ -576,9 +546,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<String> getOptions()
{
@@ -587,9 +555,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasAllOptions(Collection<String> options)
{
@@ -598,9 +564,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOption(String option)
{
@@ -609,9 +573,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOptions()
{
@@ -620,9 +582,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean optionsEqual(Set<String> options)
{
@@ -640,10 +600,10 @@
extends RealAttribute
{
- // The normalized single option.
+ /** The normalized single option. */
private final String normalizedOption;
- // A singleton set containing the single option.
+ /** A singleton set containing the single option. */
private final Set<String> option;
@@ -673,9 +633,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<String> getOptions()
{
@@ -684,9 +642,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOption(String option)
{
@@ -696,9 +652,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean hasOptions()
{
@@ -724,10 +678,10 @@
extends AbstractSet<T>
{
- // The set of elements if there are more than one.
+ /** The set of elements if there are more than one. */
private LinkedHashSet<T> elements;
- // The first element.
+ /** The first element. */
private T firstElement;
@@ -741,9 +695,7 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean add(T e)
{
@@ -775,9 +727,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean addAll(Collection<? extends T> c)
{
@@ -811,9 +761,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void clear()
{
@@ -823,9 +771,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Iterator<T> iterator()
{
@@ -885,9 +831,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean remove(Object o)
{
@@ -909,9 +853,7 @@
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean contains(Object o)
{
@@ -953,9 +895,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int size()
{
@@ -1021,16 +961,16 @@
return type;
}
- // The attribute type for this attribute.
+ /** The attribute type for this attribute. */
private AttributeType attributeType;
- // The name of this attribute as provided by the end user.
+ /** The name of this attribute as provided by the end user. */
private String name;
- // The normalized set of options if there are more than one.
+ /** The normalized set of options if there are more than one. */
private SortedSet<String> normalizedOptions;
- // The set of options.
+ /** The set of options. */
private final SmallSet<String> options = new SmallSet<String>();
/** The map of normalized values => values for this attribute. */
@@ -1758,9 +1698,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
index db94519..66ff19c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/AttributeType.java
@@ -65,55 +65,55 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The approximate matching rule for this attribute type.
+ /** The approximate matching rule for this attribute type. */
private final MatchingRule approximateMatchingRule;
- // The syntax for this attribute type.
+ /** The syntax for this attribute type. */
private final AttributeSyntax<?> syntax;
- // The superior attribute type from which this attribute type
- // inherits.
+ /** The superior attribute type from which this attribute type inherits. */
private final AttributeType superiorType;
- // The attribute usage for this attribute type.
+ /** The attribute usage for this attribute type. */
private final AttributeUsage attributeUsage;
- // Indicates whether this attribute type is declared "collective".
+ /** Indicates whether this attribute type is declared "collective". */
private final boolean isCollective;
- // Indicates whether this attribute type is declared
- // "no-user-modification".
+ /**
+ * Indicates whether this attribute type is declared
+ * "no-user-modification".
+ */
private final boolean isNoUserModification;
- // Indicates whether this attribute type is the objectclass type.
+ /** Indicates whether this attribute type is the objectclass type. */
private final boolean isObjectClassType;
- // Indicates whether this attribute type is operational.
+ /** Indicates whether this attribute type is operational. */
private final boolean isOperational;
- // Indicates whether this attribute type is declared "single-value".
+ /** Indicates whether this attribute type is declared "single-value". */
private final boolean isSingleValue;
- // Indicates whether there is a possibility that this attribute type
- // may have one or more subtypes that list this type or one of its
- // subtypes as a superior. Note that this variable is intentional
- // not declared "final", but if it ever gets set to "true", then it
- // should never be unset back to "false".
+ /**
+ * Indicates whether there is a possibility that this attribute type
+ * may have one or more subtypes that list this type or one of its
+ * subtypes as a superior. Note that this variable is intentional
+ * not declared "final", but if it ever gets set to "true", then it
+ * should never be unset back to "false".
+ */
private boolean mayHaveSubordinateTypes;
-
- // The equality matching rule for this attribute type.
- private final MatchingRule equalityMatchingRule;
-
- // The ordering matching rule for this attribute type.
- private final MatchingRule orderingMatchingRule;
-
- // The definition string used to create this attribute type.
+ /** The definition string used to create this attribute type. */
private final String definition;
- // The substring matching rule for this attribute type.
+ /** The equality matching rule for this attribute type. */
+ private final MatchingRule equalityMatchingRule;
+ /** The ordering matching rule for this attribute type. */
+ private final MatchingRule orderingMatchingRule;
+ /** The substring matching rule for this attribute type. */
private final MatchingRule substringMatchingRule;
- // True once this attribute type has been removed from the schema.
+ /** True once this attribute type has been removed from the schema. */
private volatile boolean isDirty;
@@ -582,9 +582,7 @@
return definition;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int compareTo(AttributeType o) {
return getNormalizedPrimaryNameOrOID().compareTo(
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 ae52ad2..ee7a09f 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -63,8 +64,7 @@
- // The BER type tag that is associated with this authentication
- // type.
+ /** The BER type tag that is associated with this authentication type. */
private byte berType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
index 5fdbb9a..24e47cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/BackupDirectory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -76,15 +76,19 @@
- // The DN of the configuration entry for the backend with which this
- // backup directory is associated.
+ /**
+ * The DN of the configuration entry for the backend with which this
+ * backup directory is associated.
+ */
private DN configEntryDN;
- // The set of backups in the specified directory. The iteration
- // order will be the order in which the backups were created.
+ /**
+ * The set of backups in the specified directory. The iteration
+ * order will be the order in which the backups were created.
+ */
private LinkedHashMap<String,BackupInfo> backups;
- // The filesystem path to the backup directory.
+ /** The filesystem path to the backup directory. */
private String path;
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 2acb62e..7e88c06 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -135,40 +135,44 @@
- // 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.
+ /** Indicates whether this backup is compressed. */
private boolean isCompressed;
- // Indicates whether this backup is encrypted.
+ /** Indicates whether this backup is encrypted. */
private boolean isEncrypted;
- // Indicates whether this is an incremental backup.
+ /** Indicates whether this is an incremental backup. */
private boolean isIncremental;
- // The signed hash for this backup, if appropriate.
+ /** The signed hash for this backup, if appropriate. */
private byte[] signedHash;
- // The unsigned hash for this backup, if appropriate.
+ /** The unsigned hash for this backup, if appropriate. */
private byte[] unsignedHash;
- // The time that this backup was created.
+ /** The time that this backup was created. */
private Date backupDate;
- // The set of backup ID(s) on which this backup is dependent.
+ /** The set of backup ID(s) on which this backup is dependent. */
private HashSet<String> dependencies;
- // The set of additional properties associated with this backup.
- // This is intended for use by the backend for storing any kind of
- // state information that it might need to associated with the
- // backup. The mapping will be between a name and a value, where
- // the name must not contain an equal sign and neither the name nor
- // the value may contain line breaks;
+ /**
+ * The set of additional properties associated with this backup.
+ * This is intended for use by the backend for storing any kind of
+ * state information that it might need to associated with the
+ * backup. The mapping will be between a name and a value, where
+ * the name must not contain an equal sign and neither the name nor
+ * the value may contain line breaks;
+ */
private HashMap<String,String> backupProperties;
- // The unique ID for this backup.
+ /** The unique ID for this backup. */
private String backupID;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java
index 9faab0a..99095a1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CacheEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -42,13 +42,13 @@
notes="This should only be used within a backend")
public final class CacheEntry
{
- // The backend with which this cache entry is associated.
- private Backend backend;
+ /** The backend with which this cache entry is associated. */
+ private Backend<?> backend;
- // The entry itself.
+ /** The entry itself. */
private Entry entry;
- // The entry ID for the entry within the backend.
+ /** The entry ID for the entry within the backend. */
private long entryID;
@@ -60,7 +60,7 @@
* @param backend The backend for this cache entry.
* @param entryID The entry ID for this cache entry.
*/
- public CacheEntry(Entry entry, Backend backend, long entryID)
+ public CacheEntry(Entry entry, Backend<?> backend, long entryID)
{
this.entry = entry;
this.backend = backend;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java
index 0cf606d..100d146 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelRequest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -40,12 +40,16 @@
mayInvoke=true)
public final class CancelRequest
{
- // Indicates whether to send a response to the original request if
- // the operation is canceled.
+ /**
+ * Indicates whether to send a response to the original request if
+ * the operation is canceled.
+ */
private final boolean notifyOriginalRequestor;
- // A message that explains the purpose for this cancellation (may be
- // included in the response to the original requestor).
+ /**
+ * A message that explains the purpose for this cancellation (may be
+ * included in the response to the original requestor).
+ */
private final LocalizableMessage cancelReason;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java
index 991886c..abce1c8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CancelResult.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -42,11 +42,13 @@
mayInvoke=true)
public class CancelResult
{
- // The result code associated with this cancel result.
+ /** The result code associated with this cancel result. */
private final ResultCode resultCode;
- // A human-readable response that the server
- // provided for the result of the cancellation.
+ /**
+ * A human-readable response that the server
+ * provided for the result of the cancellation.
+ */
private final LocalizableMessage responseMessage;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java
index 33dab8f..b89c2c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CanceledOperationException.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -54,8 +54,10 @@
- // The cancel result that provides information about the status of
- // the cancellation.
+ /**
+ * The cancel result that provides information about the status of
+ * the cancellation.
+ */
private final CancelRequest cancelRequest;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java
index e1929bc..55dbcc4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CollectiveVirtualAttribute.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -42,7 +42,7 @@
*/
public class CollectiveVirtualAttribute extends AbstractAttribute
{
- // The attribute this collective virtual attribute is based on.
+ /** The attribute this collective virtual attribute is based on. */
private Attribute attribute;
/**
@@ -54,17 +54,13 @@
this.attribute = attribute;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConditionResult approximatelyEqualTo(ByteString assertionValue) {
return attribute.approximatelyEqualTo(assertionValue);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean contains(ByteString value) {
return attribute.contains(value);
@@ -77,66 +73,50 @@
return attribute.matchesEqualityAssertion(assertionValue);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public AttributeType getAttributeType() {
return attribute.getAttributeType();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<String> getOptions() {
return attribute.getOptions();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConditionResult greaterThanOrEqualTo(ByteString assertionValue) {
return attribute.greaterThanOrEqualTo(assertionValue);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isVirtual() {
return true;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Iterator<ByteString> iterator() {
return attribute.iterator();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConditionResult lessThanOrEqualTo(ByteString assertionValue) {
return attribute.lessThanOrEqualTo(assertionValue);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConditionResult matchesSubstring(ByteString subInitial,
List<ByteString> subAny, ByteString subFinal) {
return attribute.matchesSubstring(subInitial, subAny, subFinal);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int size() {
return attribute.size();
@@ -149,9 +129,7 @@
return attribute.hashCode();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void toString(StringBuilder buffer) {
attribute.toString(buffer);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
index d512163..9c662d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
@@ -72,30 +72,34 @@
mayInvoke=true)
public abstract class CommonSchemaElements implements SchemaFileElement {
- // Indicates whether this definition is declared "obsolete".
+ /** Indicates whether this definition is declared "obsolete". */
private final boolean isObsolete;
- // The hash code for this definition.
+ /** The hash code for this definition. */
private final int hashCode;
- // The set of additional name-value pairs associated with this
- // definition.
+ /**
+ * The set of additional name-value pairs associated with this
+ * definition.
+ */
private final Map<String, List<String>> extraProperties;
- // The set of names for this definition, in a mapping between
- // the all-lowercase form and the user-defined form.
+ /**
+ * The set of names for this definition, in a mapping between
+ * the all-lowercase form and the user-defined form.
+ */
private final Map<String, String> names;
- // The description for this definition.
+ /** The description for this definition. */
private final String description;
- // The OID that may be used to reference this definition.
+ /** The OID that may be used to reference this definition. */
private final String oid;
- // The primary name to use for this definition.
+ /** The primary name to use for this definition. */
private final String primaryName;
- // The lower case name for this definition.
+ /** The lower case name for this definition. */
private final String lowerName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java
index 2d230bf..8a2da64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DITContentRule.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -54,38 +54,44 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Indicates whether this content rule is declared "obsolete".
+ /** Indicates whether this content rule is declared "obsolete". */
private final boolean isObsolete;
- // The set of additional name-value pairs associated with this
- // content rule definition.
+ /**
+ * The set of additional name-value pairs associated with this
+ * content rule definition.
+ */
private final Map<String,List<String>> extraProperties;
- // The set of names for this DIT content rule, in a mapping between
- // the all-lowercase form and the user-defined form.
+ /**
+ * The set of names for this DIT content rule, in a mapping between
+ * the all-lowercase form and the user-defined form.
+ */
private final Map<String,String> names;
- // The structural objectclass for this DIT content rule.
+ /** The structural objectclass for this DIT content rule. */
private final ObjectClass structuralClass;
- // The set of auxiliary objectclasses that entries with this content
- // rule may contain, in a mapping between the objectclass and the
- // user-defined name for that class.
+ /**
+ * The set of auxiliary objectclasses that entries with this content
+ * rule may contain, in a mapping between the objectclass and the
+ * user-defined name for that class.
+ */
private final Set<ObjectClass> auxiliaryClasses;
- // The set of optional attribute types for this DIT content rule.
+ /** The set of optional attribute types for this DIT content rule. */
private final Set<AttributeType> optionalAttributes;
- // The set of prohibited attribute types for this DIT content rule.
+ /** The set of prohibited attribute types for this DIT content rule. */
private final Set<AttributeType> prohibitedAttributes;
- // The set of required attribute types for this DIT content rule.
+ /** The set of required attribute types for this DIT content rule. */
private final Set<AttributeType> requiredAttributes;
- // The definition string used to create this DIT content rule.
+ /** The definition string used to create this DIT content rule. */
private final String definition;
- // The description for this DIT content rule.
+ /** The description for this DIT content rule. */
private final String description;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
index fe9730e..37ab96c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
@@ -51,30 +51,34 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Indicates whether this DIT structure rule is declared "obsolete".
+ /** Indicates whether this DIT structure rule is declared "obsolete". */
private final boolean isObsolete;
- // The rule ID for this DIT structure rule.
+ /** The rule ID for this DIT structure rule. */
private final int ruleID;
- // The name form for this DIT structure rule.
+ /** The name form for this DIT structure rule. */
private final NameForm nameForm;
- // The set of additional name-value pairs associated with this DIT
- // structure rule.
+ /**
+ * The set of additional name-value pairs associated with this DIT
+ * structure rule.
+ */
private final Map<String,List<String>> extraProperties;
- // The set of names for this DIT structure rule, in a mapping
- // between the all-lowercase form and the user-defined form.
+ /**
+ * The set of names for this DIT structure rule, in a mapping
+ * between the all-lowercase form and the user-defined form.
+ */
private final Map<String,String> names;
- // The set of superior DIT structure rules.
+ /** The set of superior DIT structure rules. */
private final Set<DITStructureRule> superiorRules;
- // The definition string for this DIT structure rule.
+ /** The definition string for this DIT structure rule. */
private final String definition;
- // The description for this DIT structure rule.
+ /** The description for this DIT structure rule. */
private final String description;
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 218c5e5..c80fbe2 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -189,7 +189,7 @@
- // The disconnect reason.
+ /** The disconnect reason. */
private LocalizableMessage message;
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 73e7a44..21c87ec 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
@@ -80,19 +80,19 @@
- // Indicates whether to compress the attribute descriptions.
+ /** Indicates whether to compress the attribute descriptions. */
private final boolean compressAttrDescriptions;
- // Indicates whether to compress the object class sets.
+ /** Indicates whether to compress the object class sets. */
private final boolean compressObjectClassSets;
- // Indicates whether to exclude the DN.
+ /** Indicates whether to exclude the DN. */
private final boolean excludeDN;
- // The encoded representation of this encode configuration.
+ /** The encoded representation of this encode configuration. */
private final byte encodedRepresentation;
- // The compressed schema handler for this encode configuration.
+ /** The compressed schema handler for this encode configuration. */
private final CompressedSchema compressedSchema;
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 8d1842c..8bdbb5a 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -62,7 +63,7 @@
- // The name to use for this existing file behavior.
+ /** The name to use for this existing file behavior. */
private String name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java b/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
index c9e136d..2b3f2f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/FilePermission.java
@@ -133,41 +133,55 @@
- // Indicates if the Java 7 NIO features can be used, including
- // enhancements to Java 6 {@link java.io.File}.
+ /**
+ * Indicates if the Java 7 NIO features can be used, including
+ * enhancements to Java 6 {@link java.io.File}.
+ */
private static boolean useNIO;
- // The {@link java.io.File#toPath} method if it is available.
+ /** The {@link java.io.File#toPath} method if it is available. */
private static Method toPath;
- // The {@link java.nio.files.Files#setPosixFilePermissions} method if it is
- // available.
+ /**
+ * The {@link java.nio.files.Files#setPosixFilePermissions} method if it is
+ * available.
+ */
private static Method setPosixFilePermissions;
- // The {@link java.nio.file.Files#getFileAttributeView} method if it is
- // available.
+ /**
+ * The {@link java.nio.file.Files#getFileAttributeView} method if it is
+ * available.
+ */
private static Method getFileAttributeView;
- // The {@link java.nio.file.attribute.PosixFilePermissions#fromString} method
- // if it is available.
+ /**
+ * The {@link java.nio.file.attribute.PosixFilePermissions#fromString} method
+ * if it is available.
+ */
private static Method fromString;
- // The {@link java.nio.file.attribute.PosixFilePermissions#asFileAttribute}
- // method if is available.
+ /**
+ * The {@link java.nio.file.attribute.PosixFilePermissions#asFileAttribute}
+ * method if is available.
+ */
private static Method asFileAttribute;
- // The {@link java.nio.file.attribute.PosixFileAttributeView} class if it is
- // available.
+ /**
+ * The {@link java.nio.file.attribute.PosixFileAttributeView} class if it is
+ * available.
+ */
private static Class<?> posixView;
- // The {@link java.nio.file.attribute.AclFileAttributeView} class if it is
- // available.
+ /**
+ * The {@link java.nio.file.attribute.AclFileAttributeView} class if it is
+ * available.
+ */
private static Class<?> aclView;
- // The {@link java.nio.file.LinkOption} class if it is available.
+ /** The {@link java.nio.file.LinkOption} class if it is available. */
private static Class<?> linkOption;
- // The encoded representation for this file permission.
+ /** The encoded representation for this file permission. */
private int encodedPermission;
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 279c82b..01e136f 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -112,7 +112,7 @@
- // The LDAP BER type for this filter type.
+ /** The LDAP BER type for this filter type. */
private byte berType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java b/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
index 93c3057..5303a35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/HostPort.java
@@ -92,7 +92,7 @@
- // Time-stamp acts as memory barrier for networkInterfaces.
+ /** Time-stamp acts as memory barrier for networkInterfaces. */
private static final long CACHED_LOCAL_ADDRESSES_TIMEOUT_MS = 30 * 1000;
private static volatile long localAddressesTimeStamp;
private static Set<InetAddress> localAddresses = new HashSet<InetAddress>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java b/opendj-server-legacy/src/main/java/org/opends/server/types/IndexType.java
index aac5500..8c0b2fa 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -123,7 +123,7 @@
- // The human-readable name for this index type.
+ /** The human-readable name for this index type. */
private final String 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 78ec647..0be546a 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
@@ -46,17 +46,16 @@
mayInvoke=true)
public final class IntermediateResponse
{
- // The value for this intermediate response.
+ /** The value for this intermediate response. */
private ByteString value;
- // The set of controls for this intermediate response.
+ /** The set of controls for this intermediate response. */
private List<Control> controls;
- // The operation with which this intermediate response is
- // associated.
+ /** The operation with which this intermediate response is associated. */
private Operation operation;
- // The OID for this intermediate response.
+ /** The OID for this intermediate response. */
private String oid;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java b/opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java
index a7b38e6..a08e9b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/InvokableMethod.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -54,24 +54,28 @@
- // Indicates whether this method retrieves information about the
- // associated component.
+ /**
+ * Indicates whether this method retrieves information about the
+ * associated component.
+ */
private boolean retrievesComponentInfo;
- // Indicates whether this method updates information about the
- // associated component.
+ /**
+ * Indicates whether this method updates information about the
+ * associated component.
+ */
private boolean updatesComponentInfo;
- // The set of arguments for this method.
+ /** The set of arguments for this method. */
private ConfigAttribute[] arguments;
- // The description for this method.
+ /** The description for this method. */
private String description;
- // The name for this method.
+ /** The name for this method. */
private String name;
- // The return type for this method.
+ /** The return type for this method. */
private String returnType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java
index 0308d57..5314c1e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPException.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -54,13 +54,13 @@
- // The matched DN associated with this LDAP exception.
+ /** The matched DN associated with this LDAP exception. */
private final DN matchedDN;
- // The LDAP result code associated with this exception.
+ /** The LDAP result code associated with this exception. */
private final int resultCode;
- // The server-provided error message for this LDAP exception.
+ /** The server-provided error message for this LDAP exception. */
private final LocalizableMessage errorMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
index 9fec00a..c5b4b02 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
@@ -49,21 +49,22 @@
public final class LDAPSyntaxDescription
implements SchemaFileElement
{
- // The set of additional name-value pairs associated with this ldap
- // syntax definition.
+ /**
+ * The set of additional name-value pairs associated with this ldap
+ * syntax definition.
+ */
private final Map<String,List<String>> extraProperties;
- // The definition string used to create this ldap syntax
- //description.
+ /** The definition string used to create this ldap syntax description. */
private final String definition;
- // The description for this ldap syntax description.
+ /** The description for this ldap syntax description. */
private final String description;
- // The OID of the enclosed ldap syntax description.
+ /** The OID of the enclosed ldap syntax description. */
private final String oid;
- //The LDAPSyntaxDescritpionSyntax associated with this ldap syntax.
+ /** The LDAPSyntaxDescritpionSyntax associated with this ldap syntax. */
private LDAPSyntaxDescriptionSyntax descriptionSyntax;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java
index bad19ef..6b64d2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPURL.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -95,34 +95,34 @@
- // The base DN for this LDAP URL.
+ /** The base DN for this LDAP URL. */
private DN baseDN;
- // The port number for this LDAP URL.
+ /** The port number for this LDAP URL. */
private int port;
- // The set of attributes for this LDAP URL.
+ /** The set of attributes for this LDAP URL. */
private LinkedHashSet<String> attributes;
- // The set of extensions for this LDAP URL.
+ /** The set of extensions for this LDAP URL. */
private LinkedList<String> extensions;
- // The search scope for this LDAP URL.
+ /** The search scope for this LDAP URL. */
private SearchScope scope;
- // The search filter for this LDAP URL.
+ /** The search filter for this LDAP URL. */
private SearchFilter filter;
- // The host for this LDAP URL.
+ /** The host for this LDAP URL. */
private String host;
- // The raw base DN for this LDAP URL.
+ /** The raw base DN for this LDAP URL. */
private String rawBaseDN;
- // The raw filter for this LDAP URL.
+ /** The raw filter for this LDAP URL. */
private String rawFilter;
- // The scheme (i.e., protocol) for this LDAP URL.
+ /** The scheme (i.e., protocol) for this LDAP URL. */
private String scheme;
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 a8e61fd..2bff6cb 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -39,13 +40,13 @@
mayInvoke=true)
public final class LDIFImportResult
{
- // The total number of entries read during the import.
+ /** The total number of entries read during the import. */
private final long entriesRead;
- // The total number of entries rejected during the import.
+ /** The total number of entries rejected during the import. */
private final long entriesRejected;
- // The total number of entries skipped during the import.
+ /** The total number of entries skipped during the import. */
private final long entriesSkipped;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
index bad3e35..11dace6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
@@ -92,7 +92,7 @@
- // Initialize the lock table.
+ /** Initialize the lock table. */
static
{
DirectoryEnvironmentConfig environmentConfig =
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 e8db412..296910d 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -63,7 +64,7 @@
- // The human-readable name for this lock type.
+ /** The human-readable name for this lock type. */
private String name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
index ba269cf..7efdf96 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
@@ -54,30 +54,36 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Indicates whether this matching rule use is declared "obsolete".
+ /** Indicates whether this matching rule use is declared "obsolete". */
private final boolean isObsolete;
- // The set of additional name-value pairs associated with this
- // matching rule use definition.
+ /**
+ * The set of additional name-value pairs associated with this
+ * matching rule use definition.
+ */
private final Map<String,List<String>> extraProperties;
- // The set of names that may be used to refer to this matching rule
- // use, mapped between their all-lowercase representations and the
- // user-defined representations.
+ /**
+ * The set of names that may be used to refer to this matching rule
+ * use, mapped between their all-lowercase representations and the
+ * user-defined representations.
+ */
private final Map<String,String> names;
- // The matching rule with which this matching rule use is
- // associated.
+ /**
+ * The matching rule with which this matching rule use is associated.
+ */
private final MatchingRule matchingRule;
- // The set of attribute types with which this matching rule use is
- // associated.
+ /**
+ * The set of attribute types with which this matching rule use is associated.
+ */
private final Set<AttributeType> attributes;
- // The definition string used to create this matching rule use.
+ /** The definition string used to create this matching rule use. */
private final String definition;
- // The description for this matching rule use.
+ /** The description for this matching rule use. */
private final String description;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
index 84f6671..7e844ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
@@ -40,15 +40,16 @@
mayInvoke=true)
public final class Modification
{
- // The attribute for this modification.
+ /** The attribute for this modification. */
private Attribute attribute;
- // Indicates whether this modification was generated by internal
- // processing and therefore should not be subject to
- // no-user-modification and related checks.
+ /**
+ * Indicates whether this modification was generated by internal processing
+ * and therefore should not be subject to no-user-modification and related checks.
+ */
private boolean isInternal;
- // The modification type for this modification.
+ /** The modification type for this modification. */
private ModificationType modificationType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
index dc25eeb..e3b599f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
@@ -53,33 +53,37 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Indicates whether this name form is declared "obsolete".
+ /** Indicates whether this name form is declared "obsolete". */
private final boolean isObsolete;
- // The set of additional name-value pairs associated with this name
- // form definition.
+ /**
+ * The set of additional name-value pairs associated with this name
+ * form definition.
+ */
private final Map<String,List<String>> extraProperties;
- // The mapping between the lowercase names and the user-provided
- // names for this name form.
+ /**
+ * The mapping between the lowercase names and the user-provided
+ * names for this name form.
+ */
private final Map<String,String> names;
- // The reference to the structural objectclass for this name form.
+ /** The reference to the structural objectclass for this name form. */
private final ObjectClass structuralClass;
- // The set of optional attribute types for this name form.
+ /** The set of optional attribute types for this name form. */
private final Set<AttributeType> optionalAttributes;
- // The set of required attribute types for this name form.
+ /** The set of required attribute types for this name form. */
private final Set<AttributeType> requiredAttributes;
- // The definition string used to create this name form.
+ /** The definition string used to create this name form. */
private final String definition;
- // The description for this name form.
+ /** The description for this name form. */
private final String description;
- // The OID for this name form.
+ /** The OID for this name form. */
private final String oid;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java
index fc6920b..492ffb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/NamedCharacterSet.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -52,13 +52,13 @@
mayInvoke=true)
public final class NamedCharacterSet
{
- // The characters contained in this character set.
+ /** The characters contained in this character set. */
private char[] characters;
- // The random number generator to use with this character set.
+ /** The random number generator to use with this character set. */
private Random random;
- // The name assigned to this character set.
+ /** The name assigned to this character set. */
private String name;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
index 1b76453..f3f1d86 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
@@ -65,38 +65,46 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The set of optional attribute types for this objectclass.
+ /** The set of optional attribute types for this objectclass. */
private final Set<AttributeType> optionalAttributes;
- // The set of optional attribute types for this objectclass and its
- // superclasses.
+ /**
+ * The set of optional attribute types for this objectclass and its
+ * superclasses.
+ */
private final Set<AttributeType> optionalAttributesChain;
- // The set of required attribute types for this objectclass.
+ /** The set of required attribute types for this objectclass. */
private final Set<AttributeType> requiredAttributes;
- // The set of required attribute types for this objectclass and its
- // superclasses.
+ /**
+ * The set of required attribute types for this objectclass and its
+ * superclasses.
+ */
private final Set<AttributeType> requiredAttributesChain;
- // The set of required and optional attributes for this objectclass
- // and its superclasses.
+ /**
+ * The set of required and optional attributes for this objectclass
+ * and its superclasses.
+ */
private final Set<AttributeType> requiredAndOptionalChain;
- // The reference to one or more superior objectclasses.
+ /** The reference to one or more superior objectclasses. */
private final Set<ObjectClass> superiorClasses;
- // The objectclass type for this objectclass.
+ /** The objectclass type for this objectclass. */
private final ObjectClassType objectClassType;
- // Indicates whether or not this object class is allowed to
- // contain any attribute.
+ /**
+ * Indicates whether or not this object class is allowed to
+ * contain any attribute.
+ */
private final boolean isExtensibleObject;
- // The definition string used to create this objectclass.
+ /** The definition string used to create this objectclass. */
private final String definition;
- // True once this object class has been removed from the schema.
+ /** True once this object class has been removed from the schema. */
private volatile boolean isDirty;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
index 79e3549..1a50690 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -37,8 +38,10 @@
mayInvoke=true)
public abstract class OperationConfig {
- // When true indicates that the operation should stop as soon as
- // possible.
+ /**
+ * When true indicates that the operation should stop as soon as
+ * possible.
+ */
private boolean cancelled;
/**
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 a5e8159..5400549 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -108,7 +109,7 @@
- // The string representation of this operation type.
+ /** The string representation of this operation type. */
private final String operationName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java
index 279985a..55eff88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingInputStream.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -56,9 +56,7 @@
this.buffer = new ByteStringBuilder(32);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int read() throws IOException {
int readByte = parentStream.read();
if(enableRecording)
@@ -68,9 +66,7 @@
return readByte;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int read(byte[] bytes) throws IOException {
int bytesRead = parentStream.read(bytes);
@@ -81,9 +77,7 @@
return bytesRead;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int read(byte[] bytes, int i, int i1) throws IOException {
int bytesRead = parentStream.read(bytes, i, i1);
@@ -94,49 +88,37 @@
return bytesRead;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long skip(long l) throws IOException {
return parentStream.skip(l);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int available() throws IOException {
return parentStream.available();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void close() throws IOException {
parentStream.close();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void mark(int i) {
parentStream.mark(i);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void reset() throws IOException {
parentStream.reset();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean markSupported() {
return parentStream.markSupported();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java
index d516de0..d4dc00e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/RecordingOutputStream.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -55,9 +55,7 @@
this.buffer = new ByteStringBuilder(32);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void write(int i) throws IOException {
if(enableRecording)
{
@@ -66,9 +64,7 @@
parentStream.write(i);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void write(byte[] bytes) throws IOException {
if(enableRecording)
@@ -78,9 +74,7 @@
parentStream.write(bytes);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void write(byte[] bytes, int i, int i1) throws IOException {
if(enableRecording)
@@ -90,17 +84,13 @@
parentStream.write(bytes, i, i1);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void flush() throws IOException {
parentStream.flush();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void close() throws IOException {
parentStream.close();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java
index 03e3b8d..d69359f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/RestoreConfig.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -48,15 +49,18 @@
mayInvoke=true)
public final class RestoreConfig extends OperationConfig
{
- // The reference to the directory containing the backup file(s) to
- // restore.
+ /**
+ * The reference to the directory containing the backup file(s) to restore.
+ */
private BackupDirectory backupDirectory;
- // Indicates whether the "restore" should be verify-only but not
- // actually move or restore any files.
+ /**
+ * Indicates whether the "restore" should be verify-only but not
+ * actually move or restore any files.
+ */
private boolean verifyOnly;
- // The unique ID assigned to the backup that is to be restored.
+ /** The unique ID assigned to the backup that is to be restored. */
private String backupID;
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 316a74b..23e9600 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.types;
@@ -66,7 +67,7 @@
- // The human-readable name for this policy.
+ /** The human-readable name for this policy. */
private String policyName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java
index 79577bd..cdd25ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -50,7 +50,7 @@
public final class SearchResultEntry
extends Entry
{
- // The set of controls associated with this search result entry.
+ /** The set of controls associated with this search result entry. */
private List<Control> controls;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java
index cc3710e..f7e5cc2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SearchResultReference.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -44,10 +44,10 @@
mayInvoke=true)
public final class SearchResultReference
{
- // The set of controls associated with this search result reference.
+ /** The set of controls associated with this search result reference. */
private List<Control> controls;
- // The set of referral URLs for this search result reference.
+ /** The set of referral URLs for this search result reference. */
private List<String> referralURLs;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java
index 534a734..6c7fa35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SortKey.java
@@ -49,13 +49,13 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The attribute type for this sort key.
+ /** The attribute type for this sort key. */
private AttributeType attributeType;
- // The indication of whether the sort should be ascending.
+ /** The indication of whether the sort should be ascending. */
private boolean ascending;
- // The ordering matching rule to use with this sort key.
+ /** The ordering matching rule to use with this sort key. */
private MatchingRule orderingRule;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
index 3777d4f..7d97297 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SubEntry.java
@@ -72,7 +72,7 @@
*/
VIRTUAL_OVERRIDES_REAL("virtual-overrides-real");
- // String representation of the value.
+ /** String representation of the value. */
private final String name;
/**
@@ -84,9 +84,7 @@
this.name = name;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
@@ -136,50 +134,44 @@
public static final String ATTR_INHERIT_COLLECTIVE_ATTR =
"inheritattribute";
- // Attribute option to mark attributes collective.
+ /** Attribute option to mark attributes collective. */
private static final String ATTR_OPTION_COLLECTIVE =
"collective";
- // Entry object.
+ /** Entry object. */
private Entry entry;
- // Subtree specification.
+ /** Subtree specification. */
private SubtreeSpecification subTreeSpec;
- // Collective subentry flag.
+ /** Collective subentry flag. */
private boolean isCollective;
-
- // Inherited collective subentry flag.
+ /** Inherited collective subentry flag. */
private boolean isInheritedCollective;
-
- // Inherited collective from DN subentry flag.
+ /** Inherited collective from DN subentry flag. */
private boolean isInheritedFromDNCollective;
-
- // Inherited collective from RDN subentry flag.
+ /** Inherited collective from RDN subentry flag. */
private boolean isInheritedFromRDNCollective;
- // Inherited collective DN attribute type.
+ /** Inherited collective DN attribute type. */
private AttributeType inheritFromDNType;
-
- // Inherited collective RDN attribute type.
+ /** Inherited collective RDN attribute type. */
private AttributeType inheritFromRDNAttrType;
-
- // Inherited collective RDN type attribute type.
+ /** Inherited collective RDN type attribute type. */
private AttributeType inheritFromRDNType;
- // Inherited collective RDN attribute value.
+ /** Inherited collective RDN attribute value. */
private ByteString inheritFromRDNAttrValue;
-
- // Inherited collective from DN value.
+ /** Inherited collective from DN value. */
private ByteString inheritFromDNAttrValue;
- // Inherited collective from base DN.
+ /** Inherited collective from base DN. */
private DN inheritFromBaseDN;
- // Collective attributes.
+ /** Collective attributes. */
private List<Attribute> collectiveAttributes;
- // Conflict behavior.
+ /** Conflict behavior. */
private CollectiveConflictBehavior conflictBehavior =
CollectiveConflictBehavior.REAL_OVERRIDES_VIRTUAL;
@@ -191,7 +183,6 @@
*/
public SubEntry(Entry entry) throws DirectoryException
{
- // Entry object.
this.entry = entry;
// Process subtree specification.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
index 6647413..90a42d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
@@ -68,7 +68,7 @@
*/
public static final class AndRefinement extends Refinement
{
- // The set of refinements which must all be true.
+ /** The set of refinements which must all be true. */
private final Collection<Refinement> refinementSet;
@@ -87,9 +87,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(final Object obj)
{
@@ -110,9 +108,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -121,9 +117,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean matches(final Entry entry)
{
@@ -141,9 +135,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public StringBuilder toString(final StringBuilder builder)
{
@@ -180,7 +172,7 @@
*/
public static final class FilterRefinement extends Refinement
{
- // The search filter.
+ /** The search filter. */
private final SearchFilter filter;
@@ -198,9 +190,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(final Object obj)
{
@@ -220,9 +210,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -231,9 +219,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean matches(final Entry entry)
{
@@ -251,9 +237,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public StringBuilder toString(final StringBuilder builder)
{
@@ -271,10 +255,10 @@
*/
public static final class ItemRefinement extends Refinement
{
- // The item's object class.
+ /** The item's object class. */
private final String objectClass;
- // The item's normalized object class.
+ /** The item's normalized object class. */
private final String normalizedObjectClass;
@@ -294,9 +278,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(final Object obj)
{
@@ -318,9 +300,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -329,9 +309,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean matches(final Entry entry)
{
@@ -341,9 +319,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public StringBuilder toString(final StringBuilder builder)
{
@@ -363,7 +339,7 @@
*/
public static final class NotRefinement extends Refinement
{
- // The inverted refinement.
+ /** The inverted refinement. */
private final Refinement refinement;
@@ -381,9 +357,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(final Object obj)
{
@@ -404,9 +378,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -415,9 +387,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean matches(final Entry entry)
{
@@ -426,9 +396,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public StringBuilder toString(final StringBuilder builder)
{
@@ -446,7 +414,7 @@
*/
public static final class OrRefinement extends Refinement
{
- // The set of refinements of which at least one must be true.
+ /** The set of refinements of which at least one must be true. */
private final Collection<Refinement> refinementSet;
@@ -465,9 +433,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(final Object obj)
{
@@ -488,9 +454,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -499,9 +463,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean matches(final Entry entry)
{
@@ -519,9 +481,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public StringBuilder toString(final StringBuilder builder)
{
@@ -568,17 +528,13 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public abstract boolean equals(Object obj);
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public abstract int hashCode();
@@ -596,9 +552,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public final String toString()
{
@@ -628,49 +582,36 @@
*/
protected static final class Parser
{
- // Text scanner used to parse the string value.
+ /** Text scanner used to parse the string value. */
private final Scanner scanner;
- // Pattern used to detect left braces.
+ /** Pattern used to detect left braces. */
private static Pattern LBRACE = Pattern.compile("\\{.*");
-
- // Pattern used to parse left braces.
+ /** Pattern used to parse left braces. */
private static Pattern LBRACE_TOKEN = Pattern.compile("\\{");
-
- // Pattern used to detect right braces.
+ /** Pattern used to detect right braces. */
private static Pattern RBRACE = Pattern.compile("\\}.*");
-
- // Pattern used to parse right braces.
+ /** Pattern used to parse right braces. */
private static Pattern RBRACE_TOKEN = Pattern.compile("\\}");
-
- // Pattern used to detect comma separators.
+ /** Pattern used to detect comma separators. */
private static Pattern SEP = Pattern.compile(",.*");
-
- // Pattern used to parse comma separators.
+ /** Pattern used to parse comma separators. */
private static Pattern SEP_TOKEN = Pattern.compile(",");
-
- // Pattern used to detect colon separators.
+ /** Pattern used to detect colon separators. */
private static Pattern COLON = Pattern.compile(":.*");
-
- // Pattern used to parse colon separators.
+ /** Pattern used to parse colon separators. */
private static Pattern COLON_TOKEN = Pattern.compile(":");
-
- // Pattern used to detect integer values.
+ /** Pattern used to detect integer values. */
private static Pattern INT = Pattern.compile("\\d.*");
-
- // Pattern used to parse integer values.
+ /** Pattern used to parse integer values. */
private static Pattern INT_TOKEN = Pattern.compile("\\d+");
-
- // Pattern used to detect name values.
+ /** Pattern used to detect name values. */
private static Pattern NAME = Pattern.compile("[\\w_;-].*");
-
- // Pattern used to parse name values.
+ /** Pattern used to parse name values. */
private static Pattern NAME_TOKEN = Pattern.compile("[\\w_;-]+");
-
- // Pattern used to detect RFC3641 string values.
+ /** Pattern used to detect RFC3641 string values. */
private static Pattern STRING_VALUE = Pattern.compile("\".*");
-
- // Pattern used to parse RFC3641 string values.
+ /** Pattern used to parse RFC3641 string values. */
private static Pattern STRING_VALUE_TOKEN = Pattern
.compile("\"([^\"]|(\"\"))*\"");
@@ -1239,30 +1180,27 @@
- // The absolute base of the subtree.
+ /** The absolute base of the subtree. */
private final DN baseDN;
- // Optional minimum depth (<=0 means unlimited).
+ /** Optional minimum depth (<=0 means unlimited). */
private final int minimumDepth;
-
- // Optional maximum depth (<0 means unlimited).
+ /** Optional maximum depth (<0 means unlimited). */
private final int maximumDepth;
- // Optional set of chop before absolute DNs (mapping to their
- // local-names).
+ /** Optional set of chop before absolute DNs (mapping to their local-names). */
private final Map<DN, DN> chopBefore;
- // Optional set of chop after absolute DNs (mapping to their
- // local-names).
+ /** Optional set of chop after absolute DNs (mapping to their local-names). */
private final Map<DN, DN> chopAfter;
- // The root DN.
+ /** The root DN. */
private final DN rootDN;
- // The optional relative base DN.
+ /** The optional relative base DN. */
private final DN relativeBaseDN;
- // The optional specification filter refinements.
+ /** The optional specification filter refinements. */
private final Refinement refinements;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
index 7da77b4..f510a35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
@@ -95,45 +95,35 @@
public class ContinueProcessing
implements SynchronizationProviderResult
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ResultCode getResultCode()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN getMatchedDN()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public List<String> getReferralURLs()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean continueProcessing()
{
return true;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getErrorMessage()
{
@@ -147,13 +137,13 @@
public class StopProcessing
implements SynchronizationProviderResult
{
- // The matched DN for this result.
+ /** The matched DN for this result. */
private final DN matchedDN;
- // The set of referral URLs for this result.
+ /** The set of referral URLs for this result. */
private final List<String> referralURLs;
- // The result code for this result.
+ /** The result code for this result. */
private final ResultCode resultCode;
private final LocalizableMessage errorMessage;
@@ -195,45 +185,35 @@
this.referralURLs = null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ResultCode getResultCode()
{
return resultCode;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN getMatchedDN()
{
return matchedDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public List<String> getReferralURLs()
{
return referralURLs;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean continueProcessing()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getErrorMessage()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java b/opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java
index 6037bba..9bd1584 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/WritabilityMode.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -66,7 +66,7 @@
- // The human-readable name for this writability mode.
+ /** The human-readable name for this writability mode. */
private String modeName;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
index 4b6947f..4a704d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
@@ -114,9 +114,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
index 7a5f025..ef84089 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
@@ -76,20 +76,19 @@
*/
public static final String KEY_STORE_PATH_PKCS11 = "NONE";
- //Error message strings.
+ /** Error message strings. */
private static final String KEYSTORE_PATH_MSG = "key store path";
private static final String KEYSTORE_TYPE_MSG = "key store type";
private static final String SUBJECT_DN_MSG = "subject DN";
private static final String CERT_ALIAS_MSG = "certificate alias";
private static final String CERT_REQUEST_FILE_MSG =
"certificate request file";
- // The parsed key store backing this certificate manager.
+ /** The parsed key store backing this certificate manager. */
private KeyStore keyStore;
- // The path to the key store that we should be using.
+ /** The path to the key store that we should be using. */
private final String keyStorePath;
-
- // The name of the key store type we are using.
+ /** The name of the key store type we are using. */
private final String keyStoreType;
private final char[] password;
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 a3ce472..754830e 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -44,7 +44,7 @@
mayInvoke=true)
public abstract class ChangeRecordEntry
{
- // The DN for this entry.
+ /** The DN for this entry. */
private DN dn;
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 d15541c..5bc572c 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
@@ -68,9 +68,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java
index b0256bb..2e6c62a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/EMailMessage.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -82,22 +82,22 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The addresses of the recipients to whom this message should be sent.
+ /** The addresses of the recipients to whom this message should be sent. */
private List<String> recipients;
- // The set of attachments to include in this message.
+ /** The set of attachments to include in this message. */
private LinkedList<MimeBodyPart> attachments;
- // The MIME type for the message body.
+ /** The MIME type for the message body. */
private String bodyMIMEType;
- // The address of the sender for this message.
+ /** The address of the sender for this message. */
private String sender;
- // The subject for the mail message.
+ /** The subject for the mail message. */
private String subject;
- // The body for the mail message.
+ /** The body for the mail message. */
private LocalizableMessageBuilder body;
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 6e70c43..54407d5 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -57,7 +57,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The trust manager that is wrapped by this trust manager.
+ /** The trust manager that is wrapped by this trust manager. */
private X509TrustManager trustManager;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java
index 2d7abdb..e389d42 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFException.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
import org.forgerock.i18n.LocalizableMessage;
@@ -56,11 +56,13 @@
- // Indicates whether this exception is severe enough that it is no longer
- // possible to keep reading.
+ /**
+ * Indicates whether this exception is severe enough that it is no longer
+ * possible to keep reading.
+ */
private final boolean canContinueReading;
- // The line number of the last line read from the LDIF source.
+ /** The line number of the last line read from the LDIF source. */
private final long lineNumber;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
index b719f07..d687299 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
@@ -99,9 +99,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
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 a38c259..3578e52 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
@@ -45,13 +45,13 @@
mayInvoke=true)
public final class ModifyDNChangeRecordEntry extends ChangeRecordEntry
{
- // The new RDN.
+ /** The new RDN. */
private final RDN newRDN;
- // The new superior DN.
+ /** The new superior DN. */
private final DN newSuperiorDN;
- // Delete the old RDN?
+ /** Delete the old RDN? */
private final boolean deleteOldRDN;
@@ -130,9 +130,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@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 8de9021..a02ba55 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -51,7 +51,7 @@
- // The set of target output streams to which all messages will be written;
+ /** The set of target output streams to which all messages will be written. */
private final OutputStream[] targetStreams;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index c7cab58..be9bc43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -56,10 +56,10 @@
public final class Platform
{
- // Prefix that determines which security package to use.
+ /** Prefix that determines which security package to use. */
private static final String pkgPrefix;
- // The two security package prefixes (IBM and SUN).
+ /** The two security package prefixes (IBM and SUN). */
private static final String IBM_SEC = "com.ibm.security";
private static final String SUN_SEC = "sun.security";
@@ -88,24 +88,24 @@
private static abstract class PlatformIMPL
{
- // Key size, key algorithm and signature algorithms used.
+ /** Key size, key algorithm and signature algorithms used. */
private static final int KEY_SIZE = 1024;
private static final String KEY_ALGORITHM = "rsa";
private static final String SIG_ALGORITHM = "SHA1WithRSA";
- // Time values used in validity calculations.
+ /** Time values used in validity calculations. */
private static final int SEC_IN_DAY = 24 * 60 * 60;
- // Methods pulled from the classes.
+ /** Methods pulled from the classes. */
private static final String GENERATE_METHOD = "generate";
private static final String GET_PRIVATE_KEY_METHOD = "getPrivateKey";
private static final String GET_SELFSIGNED_CERT_METHOD =
"getSelfCertificate";
- // Classes needed to manage certificates.
+ /** Classes needed to manage certificates. */
private static final Class<?> certKeyGenClass, X500NameClass;
- // Constructors for each of the above classes.
+ /** Constructors for each of the above classes. */
private static Constructor<?> certKeyGenCons, X500NameCons;
static
@@ -458,7 +458,7 @@
- // Prevent instantiation.
+ /** Prevent instantiation. */
private Platform()
{
}
@@ -551,9 +551,9 @@
*/
private static class DefaultPlatformIMPL extends PlatformIMPL
{
- // normalize method.
+ /** Normalize method. */
private static final Method NORMALIZE;
- // Normalized form method.
+ /** Normalized form method. */
private static final Object FORM_NFKC;
static
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
index d75ad73..09eb4fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/SelectableCertificateKeyManager.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.util;
@@ -53,10 +54,10 @@
public final class SelectableCertificateKeyManager
extends X509ExtendedKeyManager
{
- // The alias of the certificate that should be selected from the key manager.
+ /** The alias of the certificate that should be selected from the key manager. */
private final String alias;
- // The key manager that is wrapped by this key manager.
+ /** The key manager that is wrapped by this key manager. */
private final X509KeyManager keyManager;
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 4d47c31..61b773a 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.util;
@@ -52,9 +53,7 @@
this.readLimit = readLimit;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int available() throws IOException
{
int streamAvail = parentStream.available();
@@ -62,18 +61,14 @@
return limitedAvail < streamAvail ? limitedAvail : streamAvail;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public synchronized void mark(int readlimit)
{
parentStream.mark(readlimit);
markBytesRead = bytesRead;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int read() throws IOException
{
if(bytesRead >= readLimit)
@@ -89,9 +84,7 @@
return b;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int read(byte b[], int off, int len) throws IOException
{
if(off < 0 || len < 0 || off+len > b.length)
@@ -122,18 +115,14 @@
return readLen;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public synchronized void reset() throws IOException
{
parentStream.reset();
bytesRead = markBytesRead;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public long skip(long n) throws IOException
{
if(bytesRead + n > readLimit)
@@ -145,16 +134,12 @@
return parentStream.skip(n);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean markSupported() {
return parentStream.markSupported();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void close() throws IOException {
parentStream.close();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java b/opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java
index cd5a0de..4db14fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/TimeThread.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.util;
@@ -130,9 +130,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -168,9 +166,7 @@
ThreadFactory
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Thread newThread(Runnable r)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 748a402..978070e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -102,7 +102,7 @@
/** Indicate if we need to display the heading. */
private boolean isHeadingDisplayed;
- /** the Console application. */
+ /** The console application. */
private ConsoleApplication app;
/** Indicate if the trust store in in memory. */
diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
index 7a57a65..f64235f 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
@@ -53,14 +53,16 @@
*/
public final class AdminTestCaseUtils {
- // The relation name which will be used for dummy configurations. A
- // deliberately obfuscated name is chosen to avoid clashes.
+ /**
+ * The relation name which will be used for dummy configurations. A
+ * deliberately obfuscated name is chosen to avoid clashes.
+ */
private static final String DUMMY_TEST_RELATION = "*dummy*test*relation*";
- // Indicates if the dummy relation profile has been registered.
+ /** Indicates if the dummy relation profile has been registered. */
private static boolean isProfileRegistered;
- // Prevent instantiation.
+ /** Prevent instantiation. */
private AdminTestCaseUtils() {
// No implementation required.
}
@@ -103,15 +105,13 @@
- // Construct a dummy path.
+ /** Construct a dummy path. */
private static synchronized <C extends ConfigurationClient, S extends Configuration>
ManagedObjectPath<C, S> getPath(AbstractManagedObjectDefinition<C, S> d) {
if (!isProfileRegistered) {
LDAPProfile.Wrapper profile = new LDAPProfile.Wrapper() {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
if (r.getName().equals(DUMMY_TEST_RELATION)) {
@@ -120,7 +120,6 @@
return null;
}
}
-
};
LDAPProfile.getInstance().pushWrapper(profile);
diff --git a/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java b/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java
index 793467b..444e61c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java
@@ -23,7 +23,6 @@
*
* Copyright 2008 Sun Microsystems, Inc.
*/
-
package org.opends.quicksetup;
import org.testng.annotations.BeforeSuite;
@@ -31,9 +30,6 @@
import java.io.IOException;
-/**
- *
- */
public class QuickSetupTestCase extends DirectoryServerTestCase {
@BeforeSuite
public final void initServer()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
index 8e292d0..9ce0e8e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server;
@@ -110,7 +110,7 @@
}
/**
- * null out all test parameters except the ones used in failed tests
+ * Null out all test parameters except the ones used in failed tests
* since we might need these again.
*/
@AfterClass(alwaysRun = true)
@@ -174,7 +174,7 @@
}
}
- // Accessed by listener on test class completion.
+ /** Accessed by listener on test class completion. */
long startTime;
long endTime;
List<String> threadNamesBeforeClass;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 96ea7b0..7dc8b64 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2013 Manuel Gaupp
*/
package org.opends.server;
@@ -481,7 +481,7 @@
config.setConfigClass(ConfigFileHandler.class);
config.setConfigFile(new File(testConfigDir, "config.ldif"));
- /** Initialize the configuration framework for DSConfig. */
+ // Initialize the configuration framework for DSConfig.
ConfigurationFramework.getInstance()
.initialize(testInstallRoot.getAbsolutePath(),
testInstanceRoot.getAbsolutePath());
@@ -1158,9 +1158,7 @@
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
- //
// Various methods for converting LDIF Strings to Entries
- //
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
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 f7df151..1bb31dd 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server;
@@ -33,7 +34,7 @@
public class TestTextWriter implements TextWriter
{
- // The list that will hold the messages logged.
+ /** The list that will hold the messages logged. */
private final LinkedList<String> messageList;
public TestTextWriter()
@@ -46,28 +47,22 @@
messageList.add(record);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void flush()
{
// No implementation is required.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void shutdown()
{
messageList.clear();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public long getBytesWritten()
{
- // No implemention is required. Just return 0;
+ // No implementation is required. Just return 0;
return 0;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
index 9033326..82bf43c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.server.admin;
-
-
import static org.testng.Assert.*;
import org.opends.server.TestCaseUtils;
@@ -39,8 +37,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
-
/**
* AttributeTypePropertyDefinition Tester.
*/
@@ -62,7 +58,7 @@
/**
- * Tests validateValue() with valid data
+ * Tests validateValue() with valid data.
*/
@Test
public void testValidateValue() {
@@ -84,7 +80,7 @@
/**
- * Tests decodeValue()
+ * Tests decodeValue().
*
* @param value
* to decode
@@ -100,7 +96,7 @@
/**
- * Tests encodeValue()
+ * Tests encodeValue().
*
* @param value
* to decode/encode
@@ -125,7 +121,7 @@
/**
- * Tests decodeValue() with illegal data
+ * Tests decodeValue() with illegal data.
*
* @param value
* to decode
@@ -159,7 +155,7 @@
- // Create a new definition.
+ /** Create a new definition. */
private AttributeTypePropertyDefinition createPropertyDefinition() {
AttributeTypePropertyDefinition.Builder builder = AttributeTypePropertyDefinition
.createBuilder(RootCfgDefn.getInstance(), "test-property");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
index 6e7c7e9..4e84338 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
@@ -60,7 +60,7 @@
}
/**
- * Tests validateValue() with valid data
+ * Tests validateValue() with valid data.
*/
@Test
public void testValidateValue1() {
@@ -69,7 +69,7 @@
}
/**
- * Tests validateValue() with illegal data
+ * Tests validateValue() with illegal data.
*/
@Test(expectedExceptions = NullPointerException.class)
public void testValidateValue2() {
@@ -89,7 +89,7 @@
}
/**
- * Tests decodeValue()
+ * Tests decodeValue().
* @param value to decode
* @param expected value
*/
@@ -110,7 +110,7 @@
}
/**
- * Tests decodeValue() with illegal data
+ * Tests decodeValue() with illegal data.
* @param value to decode
*/
@Test(dataProvider = "testDecodeValueData2",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
index 5e00a32..3fe9dc6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -43,7 +43,7 @@
*/
public class ClassPropertyDefinitionTest extends DirectoryServerTestCase {
- // Dummy class for testing.
+ /** Dummy class for testing. */
public static final class Dummy
{
public class X {}
@@ -63,7 +63,7 @@
ClassPropertyDefinition.Builder builder;
/**
- * Sets up tests
+ * Sets up tests.
*/
@BeforeClass
public void setUp() {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
index 8f810bd..7a1f069 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -55,7 +55,7 @@
}
/**
- * Tests creation of builder succeeds
+ * Tests creation of builder succeeds.
*/
@Test
public void testCreateBuilder() {
@@ -64,7 +64,7 @@
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testLowerLimit1() {
@@ -75,7 +75,7 @@
}
/**
- * Creates data for testing string-based limit values
+ * Creates data for testing string-based limit values.
* @return data
*/
@DataProvider(name = "longLimitData")
@@ -87,7 +87,7 @@
}
/**
- * Creates data for testing limit values
+ * Creates data for testing limit values.
* @return data
*/
@DataProvider(name = "illegalLimitData")
@@ -102,7 +102,7 @@
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit unit limit
* @param expectedValue to compare
*/
@@ -115,7 +115,7 @@
}
/**
- * Creates data for testing string-based limit values
+ * Creates data for testing string-based limit values.
*
* @return data
*/
@@ -151,7 +151,7 @@
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testUpperLimit1() {
@@ -162,7 +162,7 @@
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit upper limit
* @param expectedValue to compare
*/
@@ -175,7 +175,7 @@
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param upper upper limit
* @param lower lower limit
* @param lowerFirst when true sets the lower limit property first
@@ -193,7 +193,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test
public void testIsAllowUnlimited1() {
@@ -204,7 +204,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited2() {
@@ -215,7 +215,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited3() {
@@ -226,7 +226,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "validateValueData")
@@ -241,7 +241,7 @@
}
/**
- * Tests that validateValue works
+ * Tests that validateValue works.
* @param allowUnlimited when true allows unlimited
* @param high upper limit
* @param low lower limit
@@ -258,7 +258,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "illegalValidateValueData")
@@ -272,7 +272,7 @@
}
/**
- * Tests that validateValue throws exceptions
+ * Tests that validateValue throws exceptions.
* @param low lower limit
* @param high upper limit
* @param allowUnlimited when true allows unlimited
@@ -290,7 +290,7 @@
}
/**
- * Creates encode test data
+ * Creates encode test data.
* @return data
*/
@DataProvider(name = "encodeValueData")
@@ -311,7 +311,7 @@
}
/**
- * Tests encode value
+ * Tests encode value.
* @param value to encode
* @param expectedValue to compare
*/
@@ -324,7 +324,7 @@
}
/**
- * Test that accept doesn't throw and exception
+ * Test that accept doesn't throw and exception.
*/
@Test
public void testAccept() {
@@ -352,7 +352,7 @@
}
/**
- * Make sure toString doesn't barf
+ * Make sure toString doesn't barf.
*/
@Test
public void testToString() {
@@ -363,7 +363,7 @@
}
/**
- * Make sure toString doesn't barf
+ * Make sure toString doesn't barf.
*/
@Test
public void testToString2() {
@@ -409,7 +409,7 @@
}
/**
- * Creates encode test data
+ * Creates encode test data.
* @return data
*/
@DataProvider(name = "decodeValueData")
@@ -437,7 +437,7 @@
}
/**
- * Tests decodeValue()
+ * Tests decodeValue().
* @param value to decode
* @param expectedValue for comparison
*/
@@ -455,7 +455,7 @@
}
/**
- * Creates encode test data
+ * Creates encode test data.
* @return data
*/
@DataProvider(name = "decodeValueData2")
@@ -483,7 +483,7 @@
}
/**
- * Tests decodeValue()
+ * Tests decodeValue().
* @param value to decode
*/
@Test(dataProvider = "decodeValueData2",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
index de298b2..2515077 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
@@ -57,8 +57,7 @@
}
/**
- * Tests that exception thrown when no enum class
- * specified by builder
+ * Tests that exception thrown when no enum class specified by builder.
*/
@Test
public void testBuildInstance() {
@@ -67,8 +66,7 @@
}
/**
- * Tests that exception thrown when no enum class
- * specified by builder
+ * Tests that exception thrown when no enum class specified by builder.
*/
@Test(expectedExceptions = {IllegalStateException.class})
public void testBuildInstance2() {
@@ -79,7 +77,7 @@
}
/**
- * Creates data decodeValue test
+ * Creates data decodeValue test.
* @return data
*/
@DataProvider(name = "decodeValueData")
@@ -90,7 +88,7 @@
}
/**
- * Tests decodeValue()
+ * Tests decodeValue().
* @param value to decode
* @param expectedValue enum expected
*/
@@ -101,7 +99,7 @@
}
/**
- * Creates illegal data for decode value test
+ * Creates illegal data for decode value test.
* @return data
*/
@DataProvider(name = "decodeValueData2")
@@ -113,7 +111,7 @@
}
/**
- * Tests decodeValue()
+ * Tests decodeValue().
* @param value to decode
*/
@Test(dataProvider = "decodeValueData2",
@@ -125,7 +123,7 @@
}
/**
- * Tests normalization
+ * Tests normalization.
*/
@Test
public void testNormalizeValue() {
@@ -134,7 +132,7 @@
}
/**
- * Tests validation
+ * Tests validation.
*/
@Test
public void testValidateValue() {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java
index e1065e3..3d8c9de 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.server.admin;
import static org.testng.Assert.*;
@@ -40,7 +40,7 @@
/**
* Tests execution of getObjectClasses() and makes sure the
- * returned list contains "top"
+ * returned list contains "top".
*/
@Test
public void testGetObjectClasses() {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
index f5eef44..83afa0e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
@@ -41,7 +41,7 @@
ManagedObjectDefinitionI18NResource modr;
/**
- * Creates the resource
+ * Creates the resource.
*/
@BeforeClass
public void setUp() {
@@ -49,7 +49,7 @@
}
/**
- * Tests ability to get a message
+ * Tests ability to get a message.
*/
@Test
public void testGetMessage() {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java
index bc51efc..6e407a6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.admin;
@@ -39,9 +40,7 @@
// No implementation required.
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getAttributeName(AbstractManagedObjectDefinition<?, ?> d,
PropertyDefinition<?> pd) {
@@ -90,9 +89,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRelationChildRDNType(
InstantiableRelationDefinition<?, ?> r) {
@@ -107,9 +104,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getObjectClass(AbstractManagedObjectDefinition<?, ?> d) {
if (d == TestParentCfgDefn.getInstance()) {
@@ -124,9 +119,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
if (r == TestCfg.getTestOneToManyParentRelationDefinition()) {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
index 7f2994d..9d15688 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
@@ -22,20 +22,16 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.server.admin;
-
-
import static org.testng.Assert.assertEquals;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.DirectoryServerTestCase;
import org.testng.annotations.Test;
-
-
/**
* StringPropertyDefinition Tester.
*/
@@ -96,7 +92,7 @@
- // Create a string property definition.
+ /** Create a string property definition. */
private StringPropertyDefinition getDefinition(
boolean isCaseInsensitive, String pattern) {
StringPropertyDefinition.Builder builder = StringPropertyDefinition
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
index de34a3b..18575a0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
@@ -55,7 +55,7 @@
*/
private static final OptionalRelationDefinition<TestParentCfgClient, TestParentCfg> RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT;
- // Create a one-to-many relation for test-parent components.
+ /** Create a one-to-many relation for test-parent components. */
static {
InstantiableRelationDefinition.Builder<TestParentCfgClient, TestParentCfg> builder = new InstantiableRelationDefinition.Builder<TestParentCfgClient, TestParentCfg>(
RootCfgDefn.getInstance(), "test-one-to-many-parent",
@@ -63,7 +63,7 @@
RD_TEST_ONE_TO_MANY_PARENT = builder.getInstance();
}
- // Create a one-to-many relation for test-parent components.
+ /** Create a one-to-many relation for test-parent components. */
static {
OptionalRelationDefinition.Builder<TestParentCfgClient, TestParentCfg> builder = new OptionalRelationDefinition.Builder<TestParentCfgClient, TestParentCfg>(
RootCfgDefn.getInstance(), "test-one-to-zero-or-one-parent",
@@ -71,10 +71,10 @@
RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT = builder.getInstance();
}
- // Test parent object class definition.
+ /** Test parent object class definition. */
private static ObjectClass TEST_PARENT_OCD;
- // Test child object class definition.
+ /** Test child object class definition. */
private static ObjectClass TEST_CHILD_OCD;
@@ -270,7 +270,7 @@
- // Prevent instantiation.
+ /** Prevent instantiation. */
private TestCfg() {
// No implementation required.
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
index a56ad1f..1aabf26 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.admin;
@@ -70,42 +71,26 @@
*/
public final class TestChildCfgDefn extends ManagedObjectDefinition<TestChildCfgClient, TestChildCfg> {
- // The singleton configuration definition instance.
+ /** The singleton configuration definition instance. */
private static final TestChildCfgDefn INSTANCE = new TestChildCfgDefn();
-
-
- // The "aggregation-property" property definition.
+ /** The "aggregation-property" property definition. */
private static final AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg> PD_AGGREGATION_PROPERTY;
-
- // The "mandatory-boolean-property" property definition.
+ /** The "mandatory-boolean-property" property definition. */
private static final BooleanPropertyDefinition PD_MANDATORY_BOOLEAN_PROPERTY;
-
-
-
- // The "mandatory-class-property" property definition.
+ /** The "mandatory-class-property" property definition. */
private static final ClassPropertyDefinition PD_MANDATORY_CLASS_PROPERTY;
-
-
-
- // The "mandatory-read-only-attribute-type-property" property definition.
+ /** The "mandatory-read-only-attribute-type-property" property definition. */
private static final AttributeTypePropertyDefinition PD_MANDATORY_READ_ONLY_ATTRIBUTE_TYPE_PROPERTY;
-
-
-
- // The "optional-multi-valued-dn-property1" property definition.
+ /** The "optional-multi-valued-dn-property1" property definition. */
private static final DNPropertyDefinition PD_OPTIONAL_MULTI_VALUED_DN_PROPERTY1;
-
-
-
- // The "optional-multi-valued-dn-property2" property definition.
+ /** The "optional-multi-valued-dn-property2" property definition. */
private static final DNPropertyDefinition PD_OPTIONAL_MULTI_VALUED_DN_PROPERTY2;
-
- // Build the "aggregation-property" property definition.
+ /** Build the "aggregation-property" property definition. */
static {
AggregationPropertyDefinition.Builder<ConnectionHandlerCfgClient, ConnectionHandlerCfg> builder = AggregationPropertyDefinition.createBuilder(INSTANCE, "aggregation-property");
builder.setOption(PropertyOption.MULTI_VALUED);
@@ -120,7 +105,7 @@
- // Build the "mandatory-boolean-property" property definition.
+ /** Build the "mandatory-boolean-property" property definition. */
static {
BooleanPropertyDefinition.Builder builder = BooleanPropertyDefinition.createBuilder(INSTANCE, "mandatory-boolean-property");
builder.setOption(PropertyOption.MANDATORY);
@@ -132,7 +117,7 @@
- // Build the "mandatory-class-property" property definition.
+ /** Build the "mandatory-class-property" property definition. */
static {
ClassPropertyDefinition.Builder builder = ClassPropertyDefinition.createBuilder(INSTANCE, "mandatory-class-property");
builder.setOption(PropertyOption.MANDATORY);
@@ -146,7 +131,7 @@
- // Build the "mandatory-read-only-attribute-type-property" property definition.
+ /** Build the "mandatory-read-only-attribute-type-property" property definition. */
static {
AttributeTypePropertyDefinition.Builder builder = AttributeTypePropertyDefinition.createBuilder(INSTANCE, "mandatory-read-only-attribute-type-property");
builder.setOption(PropertyOption.READ_ONLY);
@@ -159,7 +144,7 @@
- // Build the "optional-multi-valued-dn-property1" property definition.
+ /** Build the "optional-multi-valued-dn-property1" property definition. */
static {
DNPropertyDefinition.Builder builder = DNPropertyDefinition.createBuilder(INSTANCE, "optional-multi-valued-dn-property1");
builder.setOption(PropertyOption.MULTI_VALUED);
@@ -172,7 +157,7 @@
- // Build the "optional-multi-valued-dn-property2" property definition.
+ /** Build the "optional-multi-valued-dn-property2" property definition. */
static {
DNPropertyDefinition.Builder builder = DNPropertyDefinition.createBuilder(INSTANCE, "optional-multi-valued-dn-property2");
builder.setOption(PropertyOption.MULTI_VALUED);
@@ -206,9 +191,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfgClient createClientConfiguration(
ManagedObject<? extends TestChildCfgClient> impl) {
return new TestChildCfgClientImpl(impl);
@@ -216,9 +199,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfg createServerConfiguration(
ServerManagedObject<? extends TestChildCfg> impl) {
return new TestChildCfgServerImpl(impl);
@@ -226,9 +207,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<TestChildCfg> getServerConfigurationClass() {
return TestChildCfg.class;
}
@@ -321,148 +300,88 @@
private static class TestChildCfgClientImpl implements
TestChildCfgClient {
- // Private implementation.
+ /** Private implementation. */
private ManagedObject<? extends TestChildCfgClient> impl;
- // Private constructor.
+ /** Private constructor. */
private TestChildCfgClientImpl(
ManagedObject<? extends TestChildCfgClient> impl) {
this.impl = impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<String> getAggregationProperty() {
return impl.getPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setAggregationProperty(Collection<String> values) {
impl.setPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition(), values);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryBooleanProperty(boolean value) {
impl.setPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryClassProperty(String value) {
impl.setPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryReadOnlyAttributeTypeProperty(AttributeType value) throws PropertyException {
impl.setPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty1() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setOptionalMultiValuedDNProperty1(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition(), values);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty2() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setOptionalMultiValuedDNProperty2(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition(), values);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ManagedObjectDefinition<? extends TestChildCfgClient, ? extends TestChildCfg> definition() {
return INSTANCE;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public PropertyProvider properties() {
return impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void commit() throws ManagedObjectAlreadyExistsException,
MissingMandatoryPropertiesException, ConcurrentModificationException,
OperationRejectedException, AuthorizationException,
@@ -480,116 +399,71 @@
private static class TestChildCfgServerImpl implements
TestChildCfg {
- // Private implementation.
+ /** Private implementation. */
private ServerManagedObject<? extends TestChildCfg> impl;
- // Private constructor.
+ /** Private constructor. */
private TestChildCfgServerImpl(ServerManagedObject<? extends TestChildCfg> impl) {
this.impl = impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addChangeListener(
ConfigurationChangeListener<TestChildCfg> listener) {
impl.registerChangeListener(listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeChangeListener(
ConfigurationChangeListener<TestChildCfg> listener) {
impl.deregisterChangeListener(listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<String> getAggregationProperty() {
return impl.getPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty1() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty2() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<? extends TestChildCfg> configurationClass() {
return TestChildCfg.class;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ServerManagedObject<? extends TestChildCfg> managedObject() {
return impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public DN dn() {
return impl.getDN();
}
-
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
index 1179439..89ebcac 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -74,42 +74,24 @@
*/
public final class TestParentCfgDefn extends ManagedObjectDefinition<TestParentCfgClient, TestParentCfg> {
- // The singleton configuration definition instance.
+ /** The singleton configuration definition instance. */
private static final TestParentCfgDefn INSTANCE = new TestParentCfgDefn();
-
- // The "mandatory-boolean-property" property definition.
+ /** The "mandatory-boolean-property" property definition. */
private static final BooleanPropertyDefinition PD_MANDATORY_BOOLEAN_PROPERTY;
-
-
-
- // The "mandatory-class-property" property definition.
+ /** The "mandatory-class-property" property definition. */
private static final ClassPropertyDefinition PD_MANDATORY_CLASS_PROPERTY;
-
-
-
- // The "mandatory-read-only-attribute-type-property" property definition.
+ /** The "mandatory-read-only-attribute-type-property" property definition. */
private static final AttributeTypePropertyDefinition PD_MANDATORY_READ_ONLY_ATTRIBUTE_TYPE_PROPERTY;
-
-
-
- // The "optional-multi-valued-dn-property" property definition.
+ /** The "optional-multi-valued-dn-property" property definition. */
private static final DNPropertyDefinition PD_OPTIONAL_MULTI_VALUED_DN_PROPERTY;
-
-
-
- // The "test-children" relation definition.
+ /** The "test-children" relation definition. */
private static final InstantiableRelationDefinition<TestChildCfgClient, TestChildCfg> RD_TEST_CHILDREN;
-
-
-
- // The "optional-test-child" relation definition.
+ /** The "optional-test-child" relation definition. */
private static final OptionalRelationDefinition<TestChildCfgClient, TestChildCfg> RD_OPTIONAL_TEST_CHILD;
-
-
- // Build the "mandatory-boolean-property" property definition.
+ /** Build the "mandatory-boolean-property" property definition. */
static {
BooleanPropertyDefinition.Builder builder = BooleanPropertyDefinition.createBuilder(INSTANCE, "mandatory-boolean-property");
builder.setOption(PropertyOption.MANDATORY);
@@ -121,7 +103,7 @@
- // Build the "mandatory-class-property" property definition.
+ /** Build the "mandatory-class-property" property definition. */
static {
ClassPropertyDefinition.Builder builder = ClassPropertyDefinition.createBuilder(INSTANCE, "mandatory-class-property");
builder.setOption(PropertyOption.MANDATORY);
@@ -135,7 +117,7 @@
- // Build the "mandatory-read-only-attribute-type-property" property definition.
+ /** Build the "mandatory-read-only-attribute-type-property" property definition. */
static {
AttributeTypePropertyDefinition.Builder builder = AttributeTypePropertyDefinition.createBuilder(INSTANCE, "mandatory-read-only-attribute-type-property");
builder.setOption(PropertyOption.READ_ONLY);
@@ -148,7 +130,7 @@
- // Build the "optional-multi-valued-dn-property" property definition.
+ /** Build the "optional-multi-valued-dn-property" property definition. */
static {
DNPropertyDefinition.Builder builder = DNPropertyDefinition.createBuilder(INSTANCE, "optional-multi-valued-dn-property");
builder.setOption(PropertyOption.MULTI_VALUED);
@@ -161,7 +143,7 @@
- // Build the "test-children" relation definition.
+ /** Build the "test-children" relation definition. */
static {
InstantiableRelationDefinition.Builder<TestChildCfgClient, TestChildCfg> builder =
new InstantiableRelationDefinition.Builder<TestChildCfgClient, TestChildCfg>(
@@ -173,7 +155,7 @@
- // Build the "optional-test-child" relation definition.
+ /** Build the "optional-test-child" relation definition. */
static {
OptionalRelationDefinition.Builder<TestChildCfgClient, TestChildCfg> builder =
new OptionalRelationDefinition.Builder<TestChildCfgClient, TestChildCfg>(
@@ -205,9 +187,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestParentCfgClient createClientConfiguration(
ManagedObject<? extends TestParentCfgClient> impl) {
return new TestParentCfgClientImpl(impl);
@@ -215,9 +195,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestParentCfg createServerConfiguration(
ServerManagedObject<? extends TestParentCfg> impl) {
return new TestParentCfgServerImpl(impl);
@@ -225,9 +203,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<TestParentCfg> getServerConfigurationClass() {
return TestParentCfg.class;
}
@@ -315,104 +291,64 @@
private static class TestParentCfgClientImpl implements
TestParentCfgClient {
- // Private implementation.
+ /** Private implementation. */
private ManagedObject<? extends TestParentCfgClient> impl;
- // Private constructor.
+ /** Private constructor. */
private TestParentCfgClientImpl(
ManagedObject<? extends TestParentCfgClient> impl) {
this.impl = impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryBooleanProperty(boolean value) {
impl.setPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryClassProperty(String value) {
impl.setPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setMandatoryReadOnlyAttributeTypeProperty(AttributeType value) throws PropertyException {
impl.setPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition(), value);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setOptionalMultiValuedDNProperty(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition(), values);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String[] listTestChildren() throws ConcurrentModificationException,
AuthorizationException, CommunicationException {
return impl.listChildren(INSTANCE.getTestChildrenRelationDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfgClient getTestChild(String name)
throws DefinitionDecodingException, ManagedObjectDecodingException,
ManagedObjectNotFoundException, ConcurrentModificationException,
@@ -420,42 +356,26 @@
return impl.getChild(INSTANCE.getTestChildrenRelationDefinition(), name).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public <M extends TestChildCfgClient> M createTestChild(
ManagedObjectDefinition<M, ? extends TestChildCfg> d, String name, Collection<PropertyException> exceptions) throws IllegalManagedObjectNameException {
return impl.createChild(INSTANCE.getTestChildrenRelationDefinition(), d, name, exceptions).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeTestChild(String name)
throws ManagedObjectNotFoundException, ConcurrentModificationException,
OperationRejectedException, AuthorizationException, CommunicationException {
impl.removeChild(INSTANCE.getTestChildrenRelationDefinition(), name);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean hasOptionalTestChild() throws ConcurrentModificationException,
AuthorizationException, CommunicationException {
return impl.hasChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfgClient getOptionalChild()
throws DefinitionDecodingException, ManagedObjectDecodingException,
ManagedObjectNotFoundException, ConcurrentModificationException,
@@ -463,50 +383,30 @@
return impl.getChild(INSTANCE.getOptionalTestChildRelationDefinition()).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public <M extends TestChildCfgClient> M createOptionalTestChild(
ManagedObjectDefinition<M, ? extends TestChildCfg> d, Collection<PropertyException> exceptions) {
return impl.createChild(INSTANCE.getOptionalTestChildRelationDefinition(), d, exceptions).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeOptionalTestChild()
throws ManagedObjectNotFoundException, ConcurrentModificationException,
OperationRejectedException, AuthorizationException, CommunicationException {
impl.removeChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ManagedObjectDefinition<? extends TestParentCfgClient, ? extends TestParentCfg> definition() {
return INSTANCE;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public PropertyProvider properties() {
return impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void commit() throws ManagedObjectAlreadyExistsException,
MissingMandatoryPropertiesException, ConcurrentModificationException,
OperationRejectedException, AuthorizationException,
@@ -524,214 +424,129 @@
private static class TestParentCfgServerImpl implements
TestParentCfg {
- // Private implementation.
+ /** Private implementation. */
private ServerManagedObject<? extends TestParentCfg> impl;
- // Private constructor.
+ /** Private constructor. */
private TestParentCfgServerImpl(ServerManagedObject<? extends TestParentCfg> impl) {
this.impl = impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addChangeListener(
ConfigurationChangeListener<TestParentCfg> listener) {
impl.registerChangeListener(listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeChangeListener(
ConfigurationChangeListener<TestParentCfg> listener) {
impl.deregisterChangeListener(listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public SortedSet<DN> getOptionalMultiValuedDNProperty() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String[] listTestChildren() {
return impl.listChildren(INSTANCE.getTestChildrenRelationDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfg getTestChild(String name) throws ConfigException {
return impl.getChild(INSTANCE.getTestChildrenRelationDefinition(), name).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addTestChildAddListener(
ConfigurationAddListener<TestChildCfg> listener) throws ConfigException {
impl.registerAddListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeTestChildAddListener(
ConfigurationAddListener<TestChildCfg> listener) {
impl.deregisterAddListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addTestChildDeleteListener(
ConfigurationDeleteListener<TestChildCfg> listener) throws ConfigException {
impl.registerDeleteListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeTestChildDeleteListener(
ConfigurationDeleteListener<TestChildCfg> listener) {
impl.deregisterDeleteListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean hasOptionalTestChild() {
return impl.hasChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public TestChildCfg getOptionalTestChild() throws ConfigException {
return impl.getChild(INSTANCE.getOptionalTestChildRelationDefinition()).getConfiguration();
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addOptionalTestChildAddListener(
ConfigurationAddListener<TestChildCfg> listener) throws ConfigException {
impl.registerAddListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeOptionalTestChildAddListener(
ConfigurationAddListener<TestChildCfg> listener) {
impl.deregisterAddListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addOptionalChildTestDeleteListener(
ConfigurationDeleteListener<TestChildCfg> listener) throws ConfigException {
impl.registerDeleteListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void removeOptionalTestChildDeleteListener(
ConfigurationDeleteListener<TestChildCfg> listener) {
impl.deregisterDeleteListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<? extends TestParentCfg> configurationClass() {
return TestParentCfg.class;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ServerManagedObject<? extends TestParentCfg> managedObject() {
return impl;
}
-
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public DN dn() {
return impl.getDN();
}
-
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
index 4eb8eaa..971a587 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
@@ -54,10 +54,7 @@
TestCaseUtils.startServer();
}
- /**
- * Returns all AbstractManagedObjectDefinition objects that are
- * defined in
- */
+ /** Returns all AbstractManagedObjectDefinition objects that are defined in. */
@DataProvider
public Object[][] enumrateManageObjectDefns() throws Exception {
TopCfgDefn topCfgDefn = TopCfgDefn.getInstance();
@@ -72,7 +69,7 @@
return params;
}
- // Exceptions to config objects having a different objectclass
+ /** Exceptions to config objects having a different objectclass. */
private static final List<String> CLASS_OBJECT_CLASS_EXCEPTIONS =
Arrays.asList(
"org.opends.server.admin.std.meta.RootCfgDefn",
@@ -110,13 +107,13 @@
"The configuration definition for " + objectDef.getName() + " has the following problems: " + EOL + errors);
}
- // Exceptions to properties ending in -class being exactly 'java-class'.
+ /** Exceptions to properties ending in -class being exactly 'java-class'. */
private static final List<String> CLASS_PROPERTY_EXCEPTIONS =
Arrays.asList(
// e.g. "prop-name-ending-with-class"
);
- // Exceptions to properties ending in -enabled being exactly 'enabled'.
+ /** Exceptions to properties ending in -enabled being exactly 'enabled'. */
private static final List<String> ENABLED_PROPERTY_EXCEPTIONS =
Arrays.asList(
"index-filter-analyzer-enabled",
@@ -124,7 +121,7 @@
// e.g. "prop-name-ending-with-enabled"
);
- // Exceptions to properties not starting with the name of their config object
+ /** Exceptions to properties not starting with the name of their config object. */
private static final List<String> OBJECT_PREFIX_PROPERTY_EXCEPTIONS =
Arrays.asList(
"backend-id",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
index 896434e..78c4d6d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.admin.client.ldap;
@@ -63,7 +64,7 @@
@Test(sequential = true)
public class AggregationClientTest extends AdminTestCase {
- // Test LDIF.
+ /** Test LDIF. */
private static final String[] TEST_LDIF = new String[] {
// Base entries.
"dn: cn=config",
@@ -363,7 +364,7 @@
- // Retrieve the named test parent managed object.
+ /** Retrieve the named test parent managed object. */
private TestParentCfgClient getTestParent(ManagementContext context,
String name) throws DefinitionDecodingException,
ManagedObjectDecodingException, AuthorizationException,
@@ -377,7 +378,7 @@
- // Asserts that the actual set of DNs contains the expected values.
+ /** Asserts that the actual set of DNs contains the expected values. */
private void assertSetEquals(SortedSet<String> actual, String... expected) {
SortedSet<String> values = new TreeSet<String>(TestChildCfgDefn
.getInstance().getAggregationPropertyPropertyDefinition());
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
index 94bce04..bc3a4cb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
@@ -51,14 +51,13 @@
*/
public final class CreateEntryMockLDAPConnection extends MockLDAPConnection {
- // Detect multiple calls.
+ /** Detect multiple calls. */
private boolean alreadyAdded;
- // The expected set of attributes (attribute name -> list of
- // values).
+ /** The expected set of attributes (attribute name -> list of values). */
private final Map<String, List<String>> attributes = new HashMap<String, List<String>>();
- // The expected DN.
+ /** The expected DN. */
private final LdapName expectedDN;
@@ -106,9 +105,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void createEntry(LdapName dn, Attributes attributes)
throws NamingException {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
index c8ed905..6cf95f8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
@@ -42,10 +42,10 @@
*/
public final class DeleteSubtreeMockLDAPConnection extends MockLDAPConnection {
- // Detect multiple calls.
+ /** Detect multiple calls. */
private boolean alreadyDeleted;
- // The expected DN.
+ /** The expected DN. */
private final LdapName expectedDN;
@@ -75,9 +75,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void deleteSubtree(LdapName dn) throws NamingException {
Assert.assertFalse(alreadyDeleted);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java
index c116691..1525a9e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -74,7 +74,7 @@
@Test(sequential=true)
public final class LDAPClientTest extends AdminTestCase {
- // Test LDIF.
+ /** Test LDIF. */
private static final String[] TEST_LDIF = new String[] {
// Base entries.
"dn: cn=config",
@@ -332,9 +332,7 @@
Class<? extends Exception> expected) {
MockLDAPConnection c = new MockLDAPConnection() {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void createEntry(LdapName dn, Attributes attributes)
throws NamingException {
@@ -454,9 +452,7 @@
Class<? extends Exception> expected) {
MockLDAPConnection c = new MockLDAPConnection() {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Attributes readEntry(LdapName dn, Collection<String> attrIds)
throws NamingException {
@@ -996,7 +992,7 @@
- // Asserts that the actual set of DNs contains the expected values.
+ /** Asserts that the actual set of DNs contains the expected values. */
private void assertDNSetEquals(SortedSet<DN> actual, String... expected) {
String[] actualStrings = new String[actual.size()];
int i = 0;
@@ -1009,7 +1005,7 @@
- // Create the named test parent managed object.
+ /** Create the named test parent managed object. */
private TestParentCfgClient createTestParent(ManagementContext context,
String name) throws ManagedObjectDecodingException,
AuthorizationException, ManagedObjectAlreadyExistsException,
@@ -1023,7 +1019,7 @@
- // Retrieve the named test parent managed object.
+ /** Retrieve the named test parent managed object. */
private TestParentCfgClient getTestParent(ManagementContext context,
String name) throws DefinitionDecodingException,
ManagedObjectDecodingException, AuthorizationException,
@@ -1037,7 +1033,7 @@
- // List test parent managed objects.
+ /** List test parent managed objects. */
private String[] listTestParents(ManagementContext context)
throws AuthorizationException, ConcurrentModificationException,
CommunicationException {
@@ -1048,7 +1044,7 @@
- // Remove the named test parent managed object.
+ /** Remove the named test parent managed object. */
private void removeTestParent(ManagementContext context, String name)
throws AuthorizationException, ManagedObjectNotFoundException,
OperationRejectedException, ConcurrentModificationException,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java
index 4aa86f6..beb2306 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -54,9 +54,7 @@
*/
private class Handler extends ClientConstraintHandler {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isAddAcceptable(ManagementContext context,
ManagedObject<?> managedObject, Collection<LocalizableMessage> unacceptableReasons)
@@ -70,9 +68,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isDeleteAcceptable(ManagementContext context,
ManagedObjectPath<?, ?> path, Collection<LocalizableMessage> unacceptableReasons)
@@ -86,9 +82,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isModifyAcceptable(ManagementContext context,
ManagedObject<?> managedObject, Collection<LocalizableMessage> unacceptableReasons)
@@ -102,13 +96,13 @@
}
- // Determines if add operations are allowed.
+ /** Determines if add operations are allowed. */
private final boolean allowAdds;
- // Determines if modify operations are allowed.
+ /** Determines if modify operations are allowed. */
private final boolean allowModifies;
- // Determines if delete operations are allowed.
+ /** Determines if delete operations are allowed. */
private final boolean allowDeletes;
@@ -132,18 +126,14 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
return Collections.<ClientConstraintHandler> singleton(new Handler());
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.emptySet();
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java
index 30527a9..37dfaa0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -65,13 +65,13 @@
*/
private static final class MockEntry {
- // The entry's attributes.
+ /** The entry's attributes. */
private final Attributes attributes;
- // The entry's children.
+ /** The entry's children. */
private final List<MockEntry> children;
- // The name of this mock entry.
+ /** The name of this mock entry. */
private final DN dn;
@@ -125,9 +125,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
@@ -139,10 +137,10 @@
}
}
- // All the entries.
+ /** All the entries. */
private final Map<DN, MockEntry> entries;
- // The single root entry.
+ /** The single root entry. */
private final MockEntry rootEntry;
@@ -158,9 +156,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void createEntry(LdapName dn, Attributes attributes)
throws NamingException {
@@ -169,9 +165,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void deleteSubtree(LdapName dn) throws NamingException {
throw new UnsupportedOperationException("deleteSubtree");
@@ -179,9 +173,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean entryExists(LdapName dn) throws NamingException {
return getEntry(dn) != null;
@@ -207,9 +199,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Collection<LdapName> listEntries(LdapName dn, String filter) throws NamingException {
MockEntry entry = getEntry(dn);
@@ -227,9 +217,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void modifyEntry(LdapName dn, Attributes mods) throws NamingException {
throw new UnsupportedOperationException("modifyEntry");
@@ -237,9 +225,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Attributes readEntry(LdapName dn, Collection<String> attrIds)
throws NamingException {
@@ -360,9 +346,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void unbind() {
// nothing to do
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
index 94c67f2..97a5fe2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
@@ -51,14 +51,13 @@
*/
public final class ModifyEntryMockLDAPConnection extends MockLDAPConnection {
- // Detect multiple calls.
+ /** Detect multiple calls. */
private boolean alreadyModified;
- // The expected DN.
+ /** The expected DN. */
private final LdapName expectedDN;
- // The expected set of modifications (attribute name -> list of
- // values).
+ /** The expected set of modifications (attribute name -> list of values). */
private final Map<String, List<String>> modifications = new HashMap<String, List<String>>();
@@ -109,9 +108,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void modifyEntry(LdapName dn, Attributes mods) throws NamingException {
Assert.assertFalse(alreadyModified);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
index 7f6f13f..0e0dafa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -49,16 +49,18 @@
*/
public final class AdminTestCaseUtils {
- // The relation name which will be used for dummy configurations. A
- // deliberately obfuscated name is chosen to avoid clashes.
+ /**
+ * The relation name which will be used for dummy configurations. A
+ * deliberately obfuscated name is chosen to avoid clashes.
+ */
private static final String DUMMY_TEST_RELATION = "*dummy*test*relation*";
- // Indicates if the dummy relation profile has been registered.
+ /** Indicates if the dummy relation profile has been registered. */
private static boolean isProfileRegistered;
- // Prevent instantiation.
+ /** Prevent instantiation. */
private AdminTestCaseUtils() {
// No implementation required.
}
@@ -107,15 +109,13 @@
- // Construct a dummy path.
+ /** Construct a dummy path. */
private static synchronized <C extends ConfigurationClient, S extends Configuration>
ManagedObjectPath<C, S> getPath(AbstractManagedObjectDefinition<C, S> d) {
if (!isProfileRegistered) {
LDAPProfile.Wrapper profile = new LDAPProfile.Wrapper() {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
if (r.getName().equals(DUMMY_TEST_RELATION)) {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
index 9698ced..a3ada17 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
@@ -66,9 +66,7 @@
private static final class DummyChangeListener implements
ConfigurationChangeListener<TestChildCfg> {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(
TestChildCfg configuration) {
@@ -77,9 +75,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
@@ -96,9 +92,7 @@
private static final class DummyDeleteListener implements
ConfigurationDeleteListener<TestChildCfg> {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(
TestChildCfg configuration) {
@@ -107,9 +101,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isConfigurationDeleteAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java
index 778a6fe..6144062 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -128,9 +128,7 @@
final SingletonRelationDefinition<TestChildCfgClient, TestChildCfg> r2 = b.getInstance();
LDAPProfile.Wrapper wrapper = new LDAPProfile.Wrapper() {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
if (r == r2) {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
index ef6d7aa..3165bf4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -59,7 +59,7 @@
private static class AddListener implements
ConfigurationAddListener<TestChildCfg> {
- // The child configuration that was added.
+ /** The child configuration that was added. */
private TestChildCfg child;
@@ -73,9 +73,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationAdd(TestChildCfg configuration) {
return new ConfigChangeResult();
}
@@ -98,9 +96,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationAddAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
child = configuration;
@@ -117,7 +113,7 @@
private static class ChangeListener implements
ConfigurationChangeListener<TestChildCfg> {
- // The child configuration that was changed.
+ /** The child configuration that was changed. */
private TestChildCfg child;
@@ -131,9 +127,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationChange(TestChildCfg configuration) {
return new ConfigChangeResult();
}
@@ -156,9 +150,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationChangeAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
child = configuration;
@@ -167,7 +159,7 @@
}
- // Test child 1 LDIF.
+ /** Test child 1 LDIF. */
private static final String[] TEST_CHILD_1 = new String[] {
"dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"objectclass: top",
@@ -179,7 +171,7 @@
"ds-cfg-conflict-behavior: virtual-overrides-real"
};
- // Test child 2 LDIF.
+ /** Test child 2 LDIF. */
private static final String[] TEST_CHILD_2 = new String[] {
"dn: cn=test child 2,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"objectclass: top",
@@ -193,7 +185,7 @@
"ds-cfg-base-dn: dc=default value c2v2,dc=com"
};
- // Test child 3 LDIF.
+ /** Test child 3 LDIF. */
private static final String[] TEST_CHILD_3 = new String[] {
"dn: cn=test child 3,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"objectclass: top",
@@ -209,7 +201,7 @@
"ds-cfg-group-dn: dc=default value c3v4,dc=com"
};
- // Test child 4 LDIF.
+ /** Test child 4 LDIF. */
private static final String[] TEST_CHILD_4 = new String[] {
"dn: cn=test child 4,cn=test children,cn=test parent 2,cn=test parents,cn=config",
"objectclass: top",
@@ -221,7 +213,7 @@
"ds-cfg-conflict-behavior: virtual-overrides-real"
};
- // Test LDIF.
+ /** Test LDIF. */
private static final String[] TEST_LDIF = new String[] {
// Base entries.
"dn: cn=test parents,cn=config",
@@ -266,7 +258,7 @@
""
};
- // JNDI LDAP context.
+ /** JNDI LDAP context. */
private JNDIDirContextAdaptor adaptor;
@@ -748,7 +740,7 @@
- // Assert that the values of child 1 are correct.
+ /** Assert that the values of child 1 are correct. */
private void assertChild1(TestChildCfg child) {
Assert.assertEquals(child.getMandatoryClassProperty(),
"org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
@@ -762,7 +754,7 @@
- // Assert that the values of child 2 are correct.
+ /** Assert that the values of child 2 are correct. */
private void assertChild2(TestChildCfg child) {
Assert.assertEquals(child.getMandatoryClassProperty(),
"org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
@@ -776,7 +768,7 @@
- // Assert that the values of child 3 are correct.
+ /** Assert that the values of child 3 are correct. */
private void assertChild3(TestChildCfg child) {
Assert.assertEquals(child.getMandatoryClassProperty(),
"org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
@@ -790,7 +782,7 @@
- // Assert that the values of child 4 are correct.
+ /** Assert that the values of child 4 are correct. */
private void assertChild4(TestChildCfg child) {
Assert.assertEquals(child.getMandatoryClassProperty(),
"org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
@@ -804,7 +796,7 @@
- // Asserts that the actual set of DNs contains the expected values.
+ /** Asserts that the actual set of DNs contains the expected values. */
private void assertDNSetEquals(SortedSet<DN> actual, String... expected) {
String[] actualStrings = new String[actual.size()];
int i = 0;
@@ -817,14 +809,14 @@
- // Deletes the named sub-tree.
+ /** Deletes the named sub-tree. */
private void deleteSubtree(String dn) throws Exception {
getAdaptor().deleteSubtree(new LdapName(dn));
}
- // Gets the JNDI connection for the test server instance.
+ /** Gets the JNDI connection for the test server instance. */
private synchronized JNDIDirContextAdaptor getAdaptor() throws Exception {
if (adaptor == null) {
adaptor = JNDIDirContextAdaptor.simpleSSLBind("127.0.0.1", TestCaseUtils
@@ -835,7 +827,7 @@
- // Gets the named parent configuration.
+ /** Gets the named parent configuration. */
private TestParentCfg getParent(String name) throws IllegalArgumentException,
ConfigException {
ServerManagementContext ctx = ServerManagementContext.getInstance();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java
index 4c994ce..49b17fb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java
@@ -54,13 +54,11 @@
*/
public final class ListenerTest extends AdminTestCase {
- // Add listener implementation.
+ /** Add listener implementation. */
private static final class TestParentAddListener implements
ConfigurationAddListener<TestParentCfg> {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationAdd(TestParentCfg configuration) {
// No implementation required.
return null;
@@ -68,9 +66,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationAddAcceptable(TestParentCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
// No implementation required.
@@ -80,13 +76,11 @@
- // Delete listener implementation.
+ /** Delete listener implementation. */
private static final class TestParentDeleteListener implements
ConfigurationDeleteListener<TestParentCfg> {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ConfigChangeResult applyConfigurationDelete(
TestParentCfg configuration) {
// No implementation required.
@@ -95,9 +89,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isConfigurationDeleteAcceptable(TestParentCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
// No implementation required.
@@ -542,7 +534,7 @@
- // Attempt to extract an add listener from the provided adaptor.
+ /** Attempt to extract an add listener from the provided adaptor. */
private ConfigurationAddListener<?> extractListener(
ConfigAddListenerAdaptor<?> al) {
ServerManagedObjectAddListener<?> al2 = al
@@ -557,7 +549,7 @@
- // Attempt to extract a delete listener from the provided adaptor.
+ /** Attempt to extract a delete listener from the provided adaptor. */
private ConfigurationDeleteListener<?> extractListener(
ConfigDeleteListenerAdaptor<?> al) {
ServerManagedObjectDeleteListener<?> al2 = al
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java
index 9f6fc6c..37cb247 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -53,9 +53,7 @@
*/
private class Handler extends ServerConstraintHandler {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isDeleteAllowed(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -69,9 +67,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isUsable(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -84,9 +80,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void performPostAdd(ServerManagedObject<?> managedObject)
throws ConfigException {
@@ -98,9 +92,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void performPostDelete(ServerManagedObject<?> managedObject)
throws ConfigException {
@@ -112,9 +104,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void performPostModify(ServerManagedObject<?> managedObject)
throws ConfigException {
@@ -126,10 +116,10 @@
}
- // Determines if delete operations are allowed.
+ /** Determines if delete operations are allowed. */
private final boolean isDeleteAllowed;
- // Determines if configurations can be decoded.
+ /** Determines if configurations can be decoded. */
private final boolean isUsable;
@@ -149,18 +139,14 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
return Collections.emptySet();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.<ServerConstraintHandler> singleton(new Handler());
}
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 44aef6d..889e058 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
@@ -118,9 +118,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public DN getDN()
{
return policyDN;
@@ -128,18 +126,14 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AuthenticationPolicyState createAuthenticationPolicyState(
Entry userEntry, long time) throws DirectoryException
{
return new AuthenticationPolicyState(userEntry)
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean passwordMatches(ByteString password)
throws DirectoryException
{
@@ -149,9 +143,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean isDisabled()
{
return MockPolicy.this.isDisabled;
@@ -159,9 +151,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void finalizeStateAfterBind() throws DirectoryException
{
isStateFinalized = true;
@@ -169,9 +159,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public AuthenticationPolicy getAuthenticationPolicy()
{
return MockPolicy.this;
@@ -181,9 +169,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void finalizeAuthenticationPolicy()
{
isPolicyFinalized = true;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java b/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java
index b7ef0d7..be2e4b9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.api;
@@ -84,9 +85,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processBackupBegin(Backend backend, BackupConfig config)
{
backupBeginCount.incrementAndGet();
@@ -94,9 +93,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processBackupEnd(Backend backend, BackupConfig config,
boolean successful)
{
@@ -105,9 +102,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processRestoreBegin(Backend backend, RestoreConfig config)
{
restoreBeginCount.incrementAndGet();
@@ -115,9 +110,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processRestoreEnd(Backend backend, RestoreConfig config,
boolean successful)
{
@@ -126,9 +119,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processExportBegin(Backend backend, LDIFExportConfig config)
{
exportBeginCount.incrementAndGet();
@@ -136,9 +127,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processExportEnd(Backend backend, LDIFExportConfig config,
boolean successful)
{
@@ -147,9 +136,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processImportBegin(Backend backend, LDIFImportConfig config)
{
importBeginCount.incrementAndGet();
@@ -157,9 +144,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void processImportEnd(Backend backend, LDIFImportConfig config,
boolean successful)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
index 4aebee9..6d1b963 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
@@ -93,16 +93,20 @@
// TODO: Test ldap:///parent
// TODO: Test userattr
- // Tests are disabled this way because a class-level @Test(enabled=false)
- // doesn't appear to work.
+ /**
+ * Tests are disabled this way because a class-level @Test(enabled=false)
+ * doesn't appear to work.
+ */
private static final boolean TESTS_ARE_DISABLED = false;
- // This is used to lookup the day of the week from the calendar field.
- // The calendar field is 1 based and starts with sun. We make [0] point
- // to 'sat' instead of a bogus value since we need to be able to find the set of days without a
- // specific day. It needs to be at the top since it's used by other
- // static initialization.
+ /**
+ * This is used to lookup the day of the week from the calendar field.
+ * The calendar field is 1 based and starts with sun. We make [0] point
+ * to 'sat' instead of a bogus value since we need to be able to find the set of days without a
+ * specific day. It needs to be at the top since it's used by other
+ * static initialization.
+ */
private static final String[] DAYS_OF_WEEK =
{"sat", "sun", "mon", "tue", "wed", "thu", "fri", "sat"};
@@ -151,7 +155,7 @@
private static final String OU_GROUP_1_DN = "cn=group1," + OU_GROUPS_DN;
private static final String OU_GROUP_2_DN = "cn=group2," + OU_GROUPS_DN;
//End group entries.
- //Used by modrdn new superior
+ /** Used by modrdn new superior */
private static final String MANAGER_NEW_DN =
"cn=new managers," + OU_BASE_DN;
private static final String MGR_NEW_DN_URL = "ldap:///" + MANAGER_NEW_DN;
@@ -167,7 +171,6 @@
private static final String SALES_USER_3 = "cn=sales3 person," + SALES_DN;
private static final String LEVEL_1_USER_URL =
"ldap:///??base?(cn=level1 user)";
- private static final String LDAP_URL_OU_BASE = "ldap:///" + OU_BASE_DN;
//End userattr entries.
private static final String OU_INNER_DN = "ou=inner," + OU_BASE_DN;
private static final String LDAP_URL_OU_INNER = "ldap:///" + OU_INNER_DN;
@@ -178,11 +181,13 @@
private static final String LEVEL_1_USER_DN = "cn=level1 user," + OU_BASE_DN;
private static final String LEVEL_2_USER_DN = "cn=level2 user," + OU_INNER_DN;
private static final String LEVEL_3_USER_DN = "cn=level3 user," + OU_LEAF_DN;
- //The proxy DN.
+ /** The proxy DN. */
private static final String PROXY_USER_DN = "cn=proxy user," + OU_BASE_DN;
- // We need to delete all of these between each test. This list needs to be
- // bottom up so that it can be handed to LDAPDelete.
+ /**
+ * We need to delete all of these between each test. This list needs to be
+ * bottom up so that it can be handed to LDAPDelete.
+ */
private static final String[] ALL_TEST_ENTRY_DNS_BOTTOM_UP = {
SALES_USER_1,
SALES_USER_2,
@@ -208,7 +213,7 @@
private static final String BIND_RULE_USERDN_ALL = "userdn=\"ldap:///all\"";
private static final String BIND_RULE_USERDN_ADMIN = "userdn=\"ldap:///" + ADMIN_DN + "\"";
private static final String BIND_RULE_USERDN_LEVEL_1 = "userdn=\"ldap:///" + LEVEL_1_USER_DN + "\"";
- //The proxy userdn bind rule.
+ /** The proxy userdn bind rule. */
private static final String BIND_RULE_USERDN_PROXY =
"userdn=\"ldap:///" + PROXY_USER_DN + "\"";
@@ -218,7 +223,8 @@
private static final String BIND_RULE_USERDN_NOT_UID_RDN = "userdn!=\"ldap:///uid=*,dc=example,dc=com\"";
private static final String BIND_RULE_USERDN_UID_OR_CN_RDN = "userdn=\"ldap:///uid=*,dc=example,dc=com || ldap:///cn=*,dc=example,dc=com\"";
private static final String BIND_RULE_USERDN_ALL_CN_ADMINS = "userdn=\"ldap:///dc=example,dc=com??sub?(cn=*admin*)\"";
- private static final String BIND_RULE_USERDN_TOP_LEVEL_CN_ADMINS = "userdn=\"ldap:///dc=example,dc=com??one?(cn=*admin*)\""; // TODO: this might be invalid?
+ /** TODO: this might be invalid? */
+ private static final String BIND_RULE_USERDN_TOP_LEVEL_CN_ADMINS = "userdn=\"ldap:///dc=example,dc=com??one?(cn=*admin*)\"";
private static final String BIND_RULE_GROUPDN_GROUP_1 =
"groupdn=\"ldap:///" + OU_GROUP_1_DN + "\"";
private static final String BIND_RULE_IP_LOCALHOST = "ip=\"127.0.0.1\"";
@@ -239,7 +245,7 @@
private static final String BIND_RULE_AUTHMETHOD_SSL = "authmethod=\"ssl\"";
private static final String BIND_RULE_AUTHMETHOD_SASL_DIGEST_MD5 = "authmethod=\"sasl DIGEST-MD5\"";
- // Admin, but not anonymous
+ /** Admin, but not anonymous. */
private static final String BIND_RULE_USERDN_NOT_ADMIN = and(not(BIND_RULE_USERDN_ADMIN), BIND_RULE_AUTHMETHOD_SIMPLE);
private static final String BIND_RULE_TODAY = "dayofweek=\"" + getThisDayOfWeek() + "\"";
@@ -306,8 +312,6 @@
"targetattr", "cn || sn", "deny(read)", BIND_RULE_USERDN_ALL);
//The ACIs for the proxy tests.
-
-
private static final String ALLOW_PROXY_CONTROL_TO_LEVEL_1=
buildAciValue("name", "allow proxy control", "targetcontrol",
OID_PROXIED_AUTH_V2, "allow(read)",
@@ -504,7 +508,7 @@
private static final String DENY_ALL_NOT_LOCALHOST_OR_ADMIN =
buildAciValue("name", "deny if not localhost or admin", "targetattr", "*", "deny(all)", BIND_RULE_IP_NOT_LOCALHOST_OR_USERDN_ADMIN);
- // This makes more sense as an allow all.
+ /** This makes more sense as an allow all. */
private static final String DENY_ALL_TO_ADMIN_AND_LOCALHOST_OR_SSL =
buildAciValue("name", "deny if admin and localhost or ssl", "targetattr", "*", "deny(all)", BIND_RULE_ADMIN_AND_LOCALHOST_OR_SSL);
@@ -571,7 +575,7 @@
"userpassword: " + ADMIN_PW,
"ds-privilege-name: modify-acl" );
- // By default aci admin can do anything!
+ /** By default aci admin can do anything! */
private static final String OU_LDIF_VALDITY_TESTS = TestCaseUtils.makeLdif(
"dn: " + OU_BASE_DN,
"objectclass: organizationalunit",
@@ -746,17 +750,19 @@
// </PASSES>
};
- // This is a little bit confusing. The first element of each array of two elements contains
- // the aci that is valid but becomes invalid if any single character is removed.
- // There has to be a lot of redundancy between the two arrays because of what
- // it takes for an aci to be minimally valid, and hence we end up doing a lot of
- // work twice. This takes time and also reports some identical failures.
- // Therefore, we also provide a mask in the second element in the array
- // But since the aci has \" characters that are single characters, taking up
- // the space of two, we have to use another "two-column" character in the mask.
- // By convention, a character is removed if the corresponding mask character
- // is a - or a \" characer. X and \' imply that it was previously tested and
- // does not need to be tested again.
+ /**
+ * This is a little bit confusing. The first element of each array of two elements contains
+ * the aci that is valid but becomes invalid if any single character is removed.
+ * There has to be a lot of redundancy between the two arrays because of what
+ * it takes for an aci to be minimally valid, and hence we end up doing a lot of
+ * work twice. This takes time and also reports some identical failures.
+ * Therefore, we also provide a mask in the second element in the array
+ * But since the aci has \" characters that are single characters, taking up
+ * the space of two, we have to use another "two-column" character in the mask.
+ * By convention, a character is removed if the corresponding mask character
+ * is a - or a \" character. X and \' imply that it was previously tested and
+ * does not need to be tested again.
+ */
private static final String[][] INVALID_ACIS_IF_ANY_CHAR_REMOVED =
{
// TODO: this generates some failures.
@@ -813,8 +819,10 @@
return buildAciValidationParams(acis, false /*test once per aci*/);
}
- // This makes sure that all of the acis in the INVALID_ACIS_IF_ANY_CHAR_REMOVED
- // tests are valid acis.
+ /**
+ * This makes sure that all of the acis in the INVALID_ACIS_IF_ANY_CHAR_REMOVED
+ * tests are valid acis.
+ */
@Test(dataProvider = "validBasisOfValidityTests")
public void testBasisOfInvalidityTestsAreValid(String modifierDn, String modifierPw, String aciModLdif) throws Throwable {
if (TESTS_ARE_DISABLED) { // This is a hack to make sure we can disable the tests.
@@ -841,9 +849,11 @@
return buildAciValidationParams(invalid, false /*test once per aci*/);
}
- // We use this with acis that are crafted in such a way so that they are
- // invalid if any character is removed. By convention, the character
- // is only removed if the corresponding mask character is a - or \"
+ /**
+ * We use this with acis that are crafted in such a way so that they are
+ * invalid if any character is removed. By convention, the character
+ * is only removed if the corresponding mask character is a - or \"
+ */
protected List<String> getAciMissingCharCombos(String aci, String mask) {
List <String> acisMissingOneChar = new ArrayList<String>();
for (int i = 0; i < aci.length(); i++) {
@@ -860,7 +870,7 @@
- // Common between validAcis and invalidAcis
+ /** Common between validAcis and invalidAcis. */
private Object[][] buildAciValidationParams(List<String> acis, boolean testMultipleCombos) {
List<String[]> paramsList = new ArrayList<String[]>();
@@ -1114,16 +1124,16 @@
GLOBAL_DSE_ACI, GLOBAL_USER_OP_ATTRS_ACI,
GLOBAL_CONTROL_ACI, GLOBAL_EXT_OP_ACI);
- // ACI used to test LDAP compare.
+ /** ACI used to test LDAP compare. */
private static final String COMPARE_ACI = makeAddAciLdif(OU_LEAF_DN, ALLOW_ALL_TO_COMPARE);
- // ACI used to test LDAP search with attributes.
+ /** ACI used to test LDAP search with attributes. */
private static final String SEARCH_ATTRIBUTES_ALLOW_ACI = makeAddAciLdif(
OU_LEAF_DN, ALLOW_ALL_TO_ALL);
private static final String SEARCH_ATTRIBUTES_DENY_ACI = makeAddAciLdif(
OU_LEAF_DN, DENY_READ_CN_SN_IF_PERSON);
- //ACI used to test selfwrite
+ /** ACI used to test selfwrite. */
private static final String SELFWRITE_ACI = makeAddAciLdif(
OU_GROUP_1_DN, ALLOW_ALL_TO_SELFWRITE);
@@ -1174,28 +1184,28 @@
private static final String ACI_PROXY_MOVED_ENTRY =
makeAddAciLdif(SALES_USER_1, ALLOW_PROXY_TO_MOVED_ENTRY);
-//ACI used in testing the groupdn bind rule keywords.
+/** ACI used in testing the groupdn bind rule keywords. */
private static final
String GROUP1_GROUPDN_MODS = makeAddAciLdif(OU_LEAF_DN,
ALLOW_SEARCH_TO_GROUP1_GROUPDN);
- //Aci to test dns="*".
+ /** Aci to test dns="*". */
private static final
String DNS_ALL_ACI = makeAddAciLdif(OU_LEAF_DN, ALLOW_ALL_TO_DNS_ALL);
- // ou=leaf,ou=inner,ou=acitest,dc=example,dc=com and everything under it
+ /** ou=leaf,ou=inner,ou=acitest,dc=example,dc=com and everything under it */
private static final String LEAF_OU_FULL_LDIF__SEARCH_TESTS =
LEAF_OU_LDIF__SEARCH_TESTS +
LEVEL_3_USER_LDIF__SEARCH_TESTS;
- // ou=inner,ou=acitest,dc=example,dc=com and everything under it
+ /** ou=inner,ou=acitest,dc=example,dc=com and everything under it */
private static final String INNER_OU_FULL_LDIF__SEARCH_TESTS =
INNER_OU_LDIF__SEARCH_TESTS +
LEVEL_2_USER_LDIF__SEARCH_TESTS +
LEAF_OU_FULL_LDIF__SEARCH_TESTS;
- // ou=acitest,dc=example,dc=com and everything under it
+ /** ou=acitest,dc=example,dc=com and everything under it */
private static final String BASE_OU_FULL_LDIF__SEARCH_TESTS =
BASE_OU_LDIF__SEARCH_TESTS +
LEVEL_1_USER_LDIF__SEARCH_TESTS +
@@ -1454,7 +1464,6 @@
// Potential dimensions
// * Who sets the ACIs to start with
// * Whether the entries were created with the ACIs or they were added later. LDIFModify would work here.
- //
private static List<SearchTestParams> SEARCH_TEST_PARAMS = new ArrayList<SearchTestParams>();
private static SearchTestParams registerNewTestParams(String initialDitLdif, String... aciLdif) {
@@ -1467,10 +1476,8 @@
static {
SearchTestParams testParams;
- //
// ACIs that allow 'cn=Directory Manager' but deny the searches below to everyone else
// in some way.
- //
testParams = registerNewTestParams(BASIC_LDIF__SEARCH_TESTS,
NO_ACIS_LDIF,
ALLOW_ALL_BASE_DENY_ALL_BASE_LDIF,
@@ -1494,10 +1501,8 @@
// ------------------------------------------------------------------------
- //
// ACIs that allow 'cn=Directory Manager' but deny the searches below to everyone else
// in some way.
- //
testParams = registerNewTestParams(BASIC_LDIF__SEARCH_TESTS,
// These ACIs are all equivalent for the single search test cases below
// (but most likely not equivalent in general).
@@ -1555,11 +1560,8 @@
// ------------------------------------------------------------------------
- //
// ACIs that allow cn=admin, but deny the searches below to anonymous
// in some way.
- //
-
testParams = registerNewTestParams(BASIC_LDIF__SEARCH_TESTS,
ALLOW_ALL_BASE_TO_ADMIN,
ALLOW_ALL_BASE_TO_LOCALHOST,
@@ -1585,7 +1587,7 @@
}
- // TODO: add explicit attribute list support to this.
+ /** TODO: add explicit attribute list support to this. */
private static class SingleSearchParams {
private final String _bindDn;
private final String _bindPw;
@@ -1693,7 +1695,7 @@
return args.toArray(new String[args.size()]);
}
- // This is primarily used for debug output on a failure.
+ /** This is primarily used for debug output on a failure. */
public String getCombinedSearchArgs() {
return "-h 127.0.0.1" +
" -p " + getServerLdapPort() +
@@ -2439,7 +2441,7 @@
return stripAttrs(ldif, "userpassword");
}
- // This won't catch attrs that wrap to the next line, but that shouldn't happen.
+ /** This won't catch attrs that wrap to the next line, but that shouldn't happen. */
private static String stripAttrs(String ldif, String... attrs) {
// Generate "((cn)|(givenname))"
String anyAttr = "(";
@@ -2455,7 +2457,7 @@
return pattern.matcher(ldif).replaceAll("");
}
- // This won't catch passwords that wrap to the next line, but that shouldn't happen.
+ /** This won't catch passwords that wrap to the next line, but that shouldn't happen. */
private static final Pattern COMMENTS_REGEX = Pattern.compile("#.*", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
private static String stripComments(String ldif) {
return COMMENTS_REGEX.matcher(ldif).replaceAll("");
@@ -2463,9 +2465,11 @@
private static ThreadLocal<Map<String,File>> _tempLdifFilesByName = new ThreadLocal<Map<String,File>>();
- // To avoid a proliferation of temporary files, use the same ones over and over.
- // We expect to use a single thread for the tests, but use a threadlocal
- // just in case.
+ /**
+ * To avoid a proliferation of temporary files, use the same ones over and over.
+ * We expect to use a single thread for the tests, but use a threadlocal
+ * just in case.
+ */
private File getTemporaryLdifFile(String name) throws IOException {
Map<String,File> tempFilesForThisThread = _tempLdifFilesByName.get();
if (tempFilesForThisThread == null) {
@@ -2481,7 +2485,7 @@
return tempFile;
}
- // Convenience for when we only need one at time.
+ /** Convenience for when we only need one at time. */
private File getTemporaryLdifFile() throws IOException {
return getTemporaryLdifFile("aci-tests");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
index 16c4403..aa7ca0e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
@@ -54,7 +54,7 @@
"(version 3.0; acl \"proxy" + user3 + "\";" +
"allow (proxy) userdn=\"ldap:///" + user3 + "\";)";
- /** Need an ACI to allow proxy control */
+ /** Need an ACI to allow proxy control. */
private static final
String controlACI = "(targetcontrol=\"" + OID_PROXIED_AUTH_V2 + "\")" +
"(version 3.0; acl \"control\";" +
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
index cacf04b..55b73e4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
@@ -49,8 +49,9 @@
private static final String peopleBase="ou=People,o=test";
private static final String adminBase="ou=Admins,o=test";
- //Allow either reportauthzID or passwordpolicy controls. Used in the
- //bind tests.
+ /**
+ * Allow either reportauthzID or passwordpolicy controls. Used in the bind tests.
+ */
private static final
String pwdControls =
"(targetcontrol=\"" + OID_AUTHZID_REQUEST + "||" +
@@ -59,7 +60,7 @@
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Allow only password modify extended op.
+ /** Allow only password modify extended op. */
private static final
String extOp =
"(extop=\"" + OID_PASSWORD_MODIFY_REQUEST + "\")" +
@@ -67,7 +68,7 @@
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Allow all extended ops based on extop = *.
+ /** Allow all extended ops based on extop = *. */
private static final
String extOpWC =
"(extop=\"" + "*" + "\")" +
@@ -75,7 +76,7 @@
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Dis-allow all extended ops based on extop != *"
+ /** Dis-allow all extended ops based on extop != *" */
private static final
String extOpNotWC =
"(extop!=\"" + "*" + "\")" +
@@ -83,14 +84,14 @@
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Allow all attributes to be modified - so the password can be changed.
+ /** Allow all attributes to be modified - so the password can be changed. */
private static final
String ALLOW_ALL = "(targetattr=\"*\")" +
"(version 3.0;acl \"all access\";" +
"allow (all) " +
"userdn=\"ldap:///self\";)";
- //Allow pwd modify to people branch.
+ /** Allow pwd modify to people branch. */
private static final
String extOpPeople = "(extop=\"" +
OID_PASSWORD_MODIFY_REQUEST + "\")" +
@@ -98,7 +99,7 @@
"(version 3.0; acl \"extended op\";" +
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Dis-allow pwd modify to admin branch.
+ /** Dis-allow pwd modify to admin branch. */
private static final
String extOpAdmin =
"(extop!=\"" + OID_PASSWORD_MODIFY_REQUEST + "\")" +
@@ -106,8 +107,7 @@
"(version 3.0; acl \"extended op\";" +
"allow(read) userdn=\"ldap:///" + "anyone" + "\";)";
- //Test for side effect -- targetattr rule gives access to denied extended
- //op.
+ /** Test for side effect -- targetattr rule gives access to denied extended op. */
private static final
String complicated =
"(extop = \"1.2.3.4\")" +
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java
index 581c323..0b34b66 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java
@@ -22,10 +22,8 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
-
-
package org.opends.server.authorization.dseecompat;
import org.testng.annotations.Test;
@@ -35,6 +33,7 @@
/**
* Test of IP bind rule address decoding and address matching.
*/
+@SuppressWarnings("javadoc")
public class IPTestCase extends AciTestCase {
//Various patterns and addresses that can be put in IP bind rule
@@ -59,8 +58,10 @@
mixed="::ffff:72.56.78.9,45.*.33.*,[12ab:0:0:cd30::]/60," +
"56.56.78.0+255.255.255.0";
- //Providers that test the above expressions.
- //Mix of Ipv6 and Ipv4 addresses.
+ /**
+ * Providers that test the above expressions.
+ * Mix of Ipv6 and Ipv4 addresses.
+ */
@DataProvider(name = "mixedMatches")
public Object[][] mixedData() {
return new Object[][] {
@@ -72,7 +73,7 @@
};
}
- //Ipv6 addresses in long and various compressed forms.
+ /** Ipv6 addresses in long and various compressed forms. */
@DataProvider(name = "v6Matches")
public Object[][] v6MatchData() {
return new Object[][] {
@@ -82,7 +83,7 @@
};
}
- //Ipv6 addresses used in cidr tests.
+ /** Ipv6 addresses used in cidr tests. */
@DataProvider(name = "v6Matches1")
public Object[][] v6MatchData1() {
return new Object[][] {
@@ -91,7 +92,7 @@
};
}
- //Ipv4 addresses.
+ /** Ipv4 addresses. */
@DataProvider(name = "v4Matches")
public Object[][] v4MatchData() {
return new Object[][] {
@@ -100,7 +101,7 @@
};
}
- //Valid IPv4 expressions.
+ /** Valid IPv4 expressions. */
@DataProvider(name = "validRules")
public Object[][] validData() {
return new Object[][] {
@@ -115,7 +116,7 @@
};
}
- //Valid IPv6 expressions.
+ /** Valid IPv6 expressions. */
@DataProvider(name = "valid6Rules")
public Object[][] valid6Data() {
return new Object[][] {
@@ -132,7 +133,7 @@
};
}
- //Invalid Ipv4 expressions.
+ /** Invalid Ipv4 expressions. */
@DataProvider(name = "invalidRules")
public Object[][] inValidData() {
return new Object[][] {
@@ -152,7 +153,7 @@
};
}
- //Invalid IPv6 expressions.
+ /** Invalid IPv6 expressions. */
@DataProvider(name = "invalid6Rules")
public Object[][] inValid6Data() {
return new Object[][] {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
index 22112aa..7e30a8d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
@@ -24,12 +24,6 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2011-2015 ForgeRock AS.
*/
-
-/**
- * Unit test to test the proxy bind functionality.
- */
-
-
package org.opends.server.authorization.dseecompat;
import java.util.Hashtable;
@@ -41,11 +35,10 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-/*
- * This test tests the proxy bind access control support added to allow
- * authzid's in Sasl Binds.
+/**
+ * Tests the proxy bind functionality, via the proxy bind access control support
+ * added to allow authzid's in Sasl Binds.
*/
-
public class ProxyBindTestCase extends AciTestCase {
private static final String factory = "com.sun.jndi.ldap.LdapCtxFactory";
private static final String aciEntry = "o=test";
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
index 2ef13ca..fb0fd89 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
@@ -52,21 +52,21 @@
"uid=smart referral admin,uid=proxyuser,ou=admins," + suffix;
private static final String ctrlString = OID_MANAGE_DSAIT_CONTROL + ":false";
- //Allow based on plus operator.
+ /** Allow based on plus operator. */
private static final
String ALLOW_OC_PLUS = "(targetattr=\"objectclass || +\")" +
"(version 3.0;acl \"plus\";" +
"allow (search, read) " +
"userdn=\"ldap:///" + level5User + "\";)";
- //Allow based on ref name.
+ /** Allow based on ref name. */
private static final
String ALLOW_OC = "(targetattr=\"objectclass || ref\")" +
"(version 3.0;acl \"ref name\";" +
"allow (search, read) " +
"userdn=\"ldap:///" + level5User + "\";)";
- //Allow based on target keyword.
+ /** Allow based on target keyword. */
private static final
String ALLOW_PEOPLE =
"(target=\"ldap:///" + peopleBase + "\")" +
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
index 24e2dff..a00e63c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
@@ -24,11 +24,6 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2011-2015 ForgeRock AS
*/
-
-/**
- * Unit test to test the ssf ACI bind rule keyword.
- */
-
package org.opends.server.authorization.dseecompat;
import java.util.Hashtable;
@@ -40,6 +35,9 @@
import org.testng.annotations.*;
import static org.opends.server.config.ConfigConstants.*;
+/**
+ * Unit test to test the ssf ACI bind rule keyword.
+ */
public class SSFTestCase extends AciTestCase {
private static final String newUser="uid=new.user,ou=People,o=test";
@@ -137,7 +135,7 @@
}
- //Valid ssf statements. Not the complete ACI.
+ /** Valid ssf statements. Not the complete ACI. */
@DataProvider(name = "validStatements")
public Object[][] valids() {
return new Object[][] {
@@ -150,7 +148,7 @@
};
}
- //Invalid ssf statements. Not the complete ACI.
+ /** Invalid ssf statements. Not the complete ACI. */
@DataProvider(name = "invalidStatements")
public Object[][] invalids() {
return new Object[][] {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
index 58222a3..e46ef16 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.server.authorization.dseecompat;
import org.testng.annotations.DataProvider;
@@ -35,7 +35,7 @@
*/
public class TargAttrFiltersTestCase extends AciTestCase {
- //Valid targattrfilters statements. Not the complete ACI.
+ /** Valid targattrfilters statements. Not the complete ACI. */
@DataProvider(name = "validStatements")
public Object[][] valids() {
return new Object[][] {
@@ -46,7 +46,7 @@
};
}
- //Invalid targattrfilters statements.
+ /** Invalid targattrfilters statements. */
@DataProvider(name = "invalidStatements")
public Object[][] invalids() {
return new Object[][] {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index be5a0f5..b4dbdca 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -1208,7 +1208,7 @@
return new ModifyDNMsg(localOp);
}
- //TODO : share this code with other classes ?
+ /** TODO : share this code with other classes ? */
private void waitForSearchOpResult(Operation operation, ResultCode expectedResult) throws Exception
{
int i = 0;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
index 350712b..05bbeac 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
@@ -50,7 +50,7 @@
*/
public class SchemaTestMatchingRuleImpl implements MatchingRuleImpl
{
- // The matching rule impl that will do all the real work behind the scenes.
+ /** The matching rule impl that will do all the real work behind the scenes. */
private final MatchingRule caseIgnoreMatchingRule;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
index c75cc05..472ae0d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -565,8 +565,10 @@
TestCaseUtils.disableBackend("importRoot");
}
- // Note: this test has been rewritten to avoid expectedException in the test annotation because
- // it was skipping all tests that depends on this method
+ /**
+ * Note: this test has been rewritten to avoid expectedException in the test annotation because
+ * it was skipping all tests that depends on this method
+ */
@Test
public void testAddNoParent() throws Exception {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java
index 8556a31..316c378 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -65,38 +65,28 @@
private String beID="indexRoot";
private BackendImpl be;
- // The DN for "Aaccf Johnson"
+ /** The DN for "Aaccf Johnson". */
private DN aaccfJohnsonDN;
-
- // The DN for "Aaron Zimmerman"
+ /** The DN for "Aaron Zimmerman". */
private DN aaronZimmermanDN;
-
- // The DN for "Albert Smith"
+ /** The DN for "Albert Smith". */
private DN albertSmithDN;
-
- // The DN for "Albert Zimmerman"
+ /** The DN for "Albert Zimmerman". */
private DN albertZimmermanDN;
-
- // The DN for "lowercase mcgee"
+ /** The DN for "lowercase mcgee". */
private DN lowercaseMcGeeDN;
-
- // The DN for "Mararet Jones"
+ /** The DN for "Mararet Jones". */
private DN margaretJonesDN;
-
- // The DN for "Mary Jones"
+ /** The DN for "Mary Jones". */
private DN maryJonesDN;
-
- // The DN for "Sam Zweck"
+ /** The DN for "Sam Zweck". */
private DN samZweckDN;
-
- // The DN for "Zorro"
+ /** The DN for "Zorro". */
private DN zorroDN;
-
- // The DN for suffix
+ /** The DN for suffix. */
private DN suffixDN;
private TreeSet<SortValues> expectedSortedValues;
-
private List<Entry> entries;
@BeforeClass
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java
index bc44a1c..7e528fb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java
@@ -43,7 +43,7 @@
{
/**
- * Create values for External Changelog Request Control
+ * Create values for External Changelog Request Control.
*/
@DataProvider(name = "eclRequestControl")
public Object[][] createECLRequestControlTest()
@@ -59,7 +59,7 @@
}
/**
- * Test ExternalChangelogRequestControl
+ * Test ExternalChangelogRequestControl.
*/
@Test(dataProvider = "eclRequestControl")
public void checkECLRequestControlTest(boolean critical, String value)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
index fbf8792..e0dd983 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
@@ -44,14 +44,14 @@
import static org.testng.Assert.*;
/**
- * Test password control
+ * Test password control.
*/
public class PasswordControlTest
extends ControlsTestCase
{
/**
- * Create values for PasswordPolicyErrorType
+ * Create values for PasswordPolicyErrorType.
*/
@DataProvider(name = "passwordPolicyErrorTypeData")
public Object[][] createPasswordPolicyErrorTypeData()
@@ -73,7 +73,7 @@
}
/**
- * Test if int value are ok
+ * Test if int value are ok.
*/
@Test(dataProvider = "passwordPolicyErrorTypeData")
public void checkIntValuePasswordPolicyErrorTypeTest(
@@ -89,7 +89,7 @@
/**
- * Test If we have only the required values
+ * Test If we have only the required values.
*/
@Test(dataProvider = "passwordPolicyErrorTypeData")
public void checkRequiredValuesPasswordPolicyErrorTypeTest(
@@ -109,7 +109,7 @@
}
/**
- * Test invalid int values
+ * Test invalid int values.
*/
@Test(dataProvider = "passwordPolicyErrorTypeData")
public void checkInvalidIntPasswordPolicyErrorTypeTest(
@@ -124,7 +124,7 @@
}
/**
- * Create correct values
+ * Create correct values.
*/
@DataProvider(name = "passwordPolicyWarningTypeData")
public Object[][] createPasswordPolicyWarningTypeData()
@@ -139,7 +139,7 @@
}
/**
- * Test if byte values are ok
+ * Test if byte values are ok.
*/
@Test(dataProvider = "passwordPolicyWarningTypeData")
public void checkIntValuePasswordPolicyWarningTypeTest(
@@ -157,7 +157,7 @@
/**
- * Test If we have only the required values
+ * Test If we have only the required values.
*/
@Test(dataProvider = "passwordPolicyWarningTypeData")
public void checkRequiredValuesPasswordPolicyWarningTypeTest(
@@ -177,7 +177,7 @@
}
/**
- * Test invalid int values
+ * Test invalid int values.
*/
@Test(dataProvider = "passwordPolicyWarningTypeData")
public void checkInvalidIntPasswordPolicyWarningTypeTest(
@@ -202,7 +202,7 @@
}
/**
- * Create values for PasswordExpiredControl
+ * Create values for PasswordExpiredControl.
*/
@DataProvider(name = "passwordExpiredControlData")
public Object[][] createPasswordExpiredControlData()
@@ -215,7 +215,7 @@
}
/**
- * Test OID
+ * Test OID.
*/
@Test
public void checkPasswordOID() throws Exception
@@ -226,7 +226,7 @@
}
/**
- * Test "Netscape password expired control" implementation
+ * Test "Netscape password expired control" implementation.
*/
@Test(dataProvider = "passwordExpiredControlData")
public void passwordExpiredControlTest(
@@ -283,7 +283,7 @@
}
/**
- * Create values for PasswordControl
+ * Create values for PasswordControl.
*/
@DataProvider(name = "passwordExpiringControlData")
public Object[][] createPasswordExpiringControlData()
@@ -296,7 +296,7 @@
}
/**
- * Test "Netscape password expired control" implementation
+ * Test "Netscape password expired control" implementation.
*/
@Test(dataProvider = "passwordExpiringControlData")
public void passwordExpiringControlTest(
@@ -361,7 +361,7 @@
}
/**
- * Create values for PasswordControl
+ * Create values for PasswordControl.
*/
@DataProvider(name = "passwordPolicyRequestControlData")
public Object[][] createPasswordPolicyRequestControlData()
@@ -374,7 +374,7 @@
}
/**
- * Test PasswordPolicyRequestControl
+ * Test PasswordPolicyRequestControl.
*/
@Test(dataProvider = "passwordPolicyRequestControlData")
public void passwordPolicyRequestControlTest(
@@ -425,7 +425,7 @@
/**
- * Create values for PasswordControl
+ * Create values for PasswordControl.
*/
@DataProvider(name = "passwordPolicyResponseControl")
public Object[][] createPasswordPolicyResponseControlData()
@@ -440,7 +440,7 @@
}
/**
- * Test PasswordPolicyResponseControl
+ * Test PasswordPolicyResponseControl.
*/
@Test(dataProvider = "passwordPolicyResponseControl")
public void passwordPolicyResponseControlTest(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
index 478b41d..93f31d9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
@@ -69,7 +69,7 @@
"Cannot decode the provided persistent search control because it does not have a value";
/**
- * Create correct values
+ * Create correct values.
*/
@DataProvider(name = "persistentSearchChangeTypeData")
public Object[][] createPersistentSearchChangeTypeData()
@@ -83,7 +83,7 @@
}
/**
- * Test if int value are ok
+ * Test if int value are ok.
*/
@Test(dataProvider = "persistentSearchChangeTypeData")
public void checkIntValueTest(Map<Integer, String> expectedValues)
@@ -99,7 +99,7 @@
/**
- * Test If we have only the required values
+ * Test If we have only the required values.
*/
@Test(dataProvider = "persistentSearchChangeTypeData")
public void checkRequiredValuesTest(Map<Integer, String> exceptedValues)
@@ -119,7 +119,7 @@
}
/**
- * Test invalid int values
+ * Test invalid int values.
*/
@Test(dataProvider = "persistentSearchChangeTypeData")
public void checkInvalidIntTest(Map<Integer, String> exceptedValues)
@@ -144,7 +144,7 @@
}
/**
- * Test int to type
+ * Test int to type.
*/
@Test(dataProvider = "persistentSearchChangeTypeData")
public void checkIntToTypeTest(Map<Integer, String> exceptedValues)
@@ -203,7 +203,7 @@
}
/**
- * Test type to int
+ * Test type to int.
*/
@Test(dataProvider = "persistentSearchChangeTypeData", dependsOnMethods= {"checkIntToTypeTest"})
public void checkTypesToIntTest(Map<Integer, String> exceptedValues)
@@ -230,7 +230,7 @@
}
/**
- * Create values for PersistentSearchControl
+ * Create values for PersistentSearchControl.
*/
@DataProvider(name = "persistentSearchControl")
public Object[][] createPasswordPolicyResponseControlData()
@@ -243,7 +243,7 @@
}
/**
- * Test PersistentSearchControl
+ * Test PersistentSearchControl.
*/
@Test(dataProvider = "persistentSearchControl")
public void checkPersistentSearchControlTest(
@@ -342,7 +342,7 @@
/**
- * Create values for EntryChangeNotificationControl
+ * Create values for EntryChangeNotificationControl.
*/
@DataProvider(name = "entryChangeNotificationControl")
public Object[][] createEntryChangeNotificationControlData()
@@ -355,7 +355,7 @@
{ false, 4, "cn= new test, dc=example,dc=com" } };
}
/**
- * Test EntryChangeNotificationControl
+ * Test EntryChangeNotificationControl.
*/
@Test(dataProvider = "entryChangeNotificationControl")
public void checkEntryChangeNotificationControlTest(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
index ead5996..2473501 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.controls;
@@ -60,37 +60,28 @@
public class ServerSideSortControlTestCase
extends ControlsTestCase
{
- // The givenName attribute type.
+ /** The givenName attribute type. */
private AttributeType givenNameType;
-
- // The sn attribute type.
+ /** The sn attribute type. */
private AttributeType snType;
- // The DN for "Aaccf Johnson"
+ /** The DN for "Aaccf Johnson". */
DN aaccfJohnsonDN;
-
- // The DN for "Aaron Zimmerman"
+ /** The DN for "Aaron Zimmerman". */
DN aaronZimmermanDN;
-
- // The DN for "Albert Smith"
+ /** The DN for "Albert Smith". */
DN albertSmithDN;
-
- // The DN for "Albert Zimmerman"
+ /** The DN for "Albert Zimmerman". */
DN albertZimmermanDN;
-
- // The DN for "lowercase mcgee"
+ /** The DN for "lowercase mcgee". */
DN lowercaseMcGeeDN;
-
- // The DN for "Mararet Jones"
+ /** The DN for "Mararet Jones". */
DN margaretJonesDN;
-
- // The DN for "Mary Jones"
+ /** The DN for "Mary Jones". */
DN maryJonesDN;
-
- // The DN for "Sam Zweck"
+ /** The DN for "Sam Zweck". */
DN samZweckDN;
-
- // The DN for "Zorro"
+ /** The DN for "Zorro". */
DN zorroDN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
index 301e654..9800bc0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
@@ -59,37 +59,28 @@
public class VLVControlTestCase
extends ControlsTestCase
{
- // The givenName attribute type.
+ /** The givenName attribute type. */
private AttributeType givenNameType;
-
- // The sn attribute type.
+ /** The sn attribute type. */
private AttributeType snType;
- // The DN for "Aaccf Johnson"
+ /** The DN for "Aaccf Johnson". */
private DN aaccfJohnsonDN;
-
- // The DN for "Aaron Zimmerman"
+ /** The DN for "Aaron Zimmerman". */
private DN aaronZimmermanDN;
-
- // The DN for "Albert Smith"
+ /** The DN for "Albert Smith". */
private DN albertSmithDN;
-
- // The DN for "Albert Zimmerman"
+ /** The DN for "Albert Zimmerman". */
private DN albertZimmermanDN;
-
- // The DN for "lowercase mcgee"
+ /** The DN for "lowercase mcgee". */
private DN lowercaseMcGeeDN;
-
- // The DN for "Mararet Jones"
+ /** The DN for "Mararet Jones". */
private DN margaretJonesDN;
-
- // The DN for "Mary Jones"
+ /** The DN for "Mary Jones". */
private DN maryJonesDN;
-
- // The DN for "Sam Zweck"
+ /** The DN for "Sam Zweck". */
private DN samZweckDN;
-
- // The DN for "Zorro"
+ /** The DN for "Zorro". */
private DN zorroDN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
index 5ecc68f..8811d85 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
@@ -52,14 +52,12 @@
import static org.testng.Assert.*;
/**
- * A set of test cases for abandon operations
+ * A set of test cases for abandon operations.
*/
public class AbandonOperationTestCase
extends OperationTestCase
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected Operation[] createTestOperations()
throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
index 679f061..aa38307 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
@@ -179,7 +179,7 @@
configHandler.addEntry(new LinkedHashMapEntry(DN_CORE_SCHEMA));
}
- // TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN.
+ /** TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN. */
@Test(enabled=false, expectedExceptions=DirectoryException.class)
public void testAddEntryParentUnknown() throws Exception
{
@@ -252,7 +252,7 @@
assertFalse(configHandler.hasEntry(DN_CORE_SCHEMA));
}
- // TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN.
+ /** TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN. */
@Test(enabled=false, expectedExceptions=DirectoryException.class)
public void testDeleteEntryUnexistingEntry() throws Exception
{
@@ -267,7 +267,7 @@
configHandler.deleteEntry(DN_SCHEMA_PROVIDERS);
}
- // TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN.
+ /** TODO : disabled because fail when converting to server DN. Re-enable once migrated to SDK DN. */
@Test(enabled=false, expectedExceptions=DirectoryException.class)
public void testDeleteEntryUnknownParent() throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
index d611576..b2a69ad 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
@@ -41,7 +41,7 @@
import org.testng.annotations.Test;
/**
- * A set of generic test cases for operations
+ * A set of generic test cases for operations.
*/
public abstract class OperationTestCase
extends CoreTestCase
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
index 6f9bd81..6fa81d4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
@@ -1251,7 +1251,7 @@
}
- //Sets a value of the allid threshold.
+ /** Sets a value of the allid threshold. */
private void setAllIdThreshold(int value) throws Exception
{
//Change the allid threshold value.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java
index 171108a..6cad65a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.server.core;
import java.util.HashMap;
@@ -40,7 +40,7 @@
* An abstract base class for all subtree specification tests.
*/
public abstract class SubtreeSpecificationTestCase extends CoreTestCase {
- // Cached set of entry object classes.
+ /** Cached set of entry object classes. */
private Set<ObjectClass> objectClasses;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
index 85d3500..c401c45 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
@@ -230,9 +230,7 @@
// assertEquals(InvocationCounterPlugin.getPostResponseCount(), 1);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected Operation[] createTestOperations() throws Exception
{
@@ -336,7 +334,7 @@
/**
* Test if it's possible to modify an rdn to a value that matches the current value
- * by changing the case of some characters
+ * by changing the case of some characters.
*/
@Test
public void testModifySameDN() throws Exception
@@ -390,7 +388,7 @@
}
/**
- * Add another attribute to the RDN and change case of the existing value
+ * Add another attribute to the RDN and change case of the existing value.
*/
@Test
public void testModifyDNchangeCaseAndAddValue() throws Exception
@@ -441,7 +439,7 @@
}
/**
- * Add a value to the RDN which is already part of the entry, but with another string representation
+ * Add a value to the RDN which is already part of the entry, but with another string representation.
*/
@Test
public void testModifyDNchangeCaseOfExistingEntryValue() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
index e29bc81..0525461 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
@@ -41,7 +41,7 @@
import static org.testng.Assert.*;
/**
- * A set of test cases for unbind operations
+ * A set of test cases for unbind operations.
*/
public class UnbindOperationTestCase extends OperationTestCase
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
index 33606a1..dec3be3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2014 ForgeRock AS.
+ * Portions Copyright 2010-2015 ForgeRock AS.
* Portions Copyright 2012 Dariusz Janny <dariusz.janny@gmail.com>
*/
package org.opends.server.extensions;
@@ -47,7 +47,7 @@
public class CryptPasswordStorageSchemeTestCase
extends ExtensionsTestCase
{
- // Names of all the crypt algorithms we want to test.
+ /** Names of all the crypt algorithms we want to test. */
private static final String[] names = { "unix", "md5", "sha256", "sha512" };
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index f27017d..5410d45 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -66,7 +66,7 @@
Entry cacheSoftReferenceConfigEntry;
Entry cacheFIFOConfigEntry;
- // The entry cache order map sorted by the cache level.
+ /** The entry cache order map sorted by the cache level. */
private SortedMap<Integer, EntryCache<? extends EntryCacheCfg>>
cacheOrderMap = new TreeMap<Integer,
EntryCache<? extends EntryCacheCfg>>();
@@ -228,9 +228,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testContainsEntry()
@@ -241,9 +239,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry1()
@@ -254,9 +250,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry2()
@@ -267,9 +261,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry3()
@@ -280,9 +272,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntryID()
@@ -293,9 +283,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntry()
@@ -306,9 +294,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntryIfAbsent()
@@ -319,9 +305,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testRemoveEntry()
@@ -332,9 +316,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClear()
@@ -345,9 +327,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearBackend()
@@ -358,9 +338,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearSubtree()
@@ -371,9 +349,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testHandleLowMemory()
@@ -467,9 +443,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test(groups = { "slow", "testDefaultCacheConcurrency" },
threadPoolSize = 10,
invocationCount = 10,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index e19c6d8..c4695fc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -57,7 +57,7 @@
public class EntryDNVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
- // The attribute type for the entryDN attribute.
+ /** The attribute type for the entryDN attribute. */
private AttributeType entryDNType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 8948cae..4982138 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -55,7 +55,7 @@
public class EntryUUIDVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
- // The attribute type for the entryUUID attribute.
+ /** The attribute type for the entryUUID attribute. */
private AttributeType entryUUIDType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
index 84aadcd..3a79d87 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -135,9 +135,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testContainsEntry()
@@ -148,9 +146,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry1()
@@ -161,9 +157,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry2()
@@ -174,9 +168,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry3()
@@ -187,9 +179,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntryID()
@@ -200,9 +190,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntry()
@@ -213,9 +201,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntryIfAbsent()
@@ -226,9 +212,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testRemoveEntry()
@@ -239,9 +223,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClear()
@@ -252,9 +234,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearBackend()
@@ -265,9 +245,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearSubtree()
@@ -278,9 +256,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testHandleLowMemory()
@@ -335,9 +311,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test(groups = { "slow", "testFIFOCacheConcurrency" },
threadPoolSize = 10,
invocationCount = 10,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index a1b9d79..6087e69 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -62,7 +62,7 @@
public class GoverningStructureRuleVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
- // The attribute type for the governingStructureRule attribute.
+ /** The attribute type for the governingStructureRule attribute. */
private AttributeType governingStructureRuleType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index a1b5fd4..cc50a67 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -54,7 +54,7 @@
@SuppressWarnings("javadoc")
public class HasSubordinatesVirtualAttributeProviderTestCase extends DirectoryServerTestCase {
- // The attribute type for the hasSubordinates attribute.
+ /** The attribute type for the hasSubordinates attribute. */
private AttributeType hasSubordinatesType;
private List<Entry> entries;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index abbe9c6..7584f91 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -85,9 +85,7 @@
this.getConnectionEvent = getConnectionEvent;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
boolean matchesEvent(final Event<?> event)
{
@@ -101,9 +99,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
StringBuilder toString(final StringBuilder builder)
{
@@ -170,9 +166,7 @@
this.resultCode = resultCode;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
DirectoryException getResult()
{
@@ -185,9 +179,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
boolean matchesEvent(final Event<?> event)
{
@@ -201,9 +193,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
StringBuilder toString(final StringBuilder builder)
{
@@ -233,9 +223,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
boolean matchesEvent(final Event<?> event)
{
@@ -251,9 +239,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
StringBuilder toString(final StringBuilder builder)
{
@@ -285,9 +271,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void close()
{
@@ -297,9 +281,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ByteString search(final DN baseDN, final SearchScope scope,
final SearchFilter filter) throws DirectoryException
@@ -319,9 +301,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void simpleBind(final ByteString username, final ByteString password)
throws DirectoryException
@@ -357,9 +337,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void close()
{
@@ -368,9 +346,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Connection getConnection() throws DirectoryException
{
@@ -400,7 +376,8 @@
private MappingPolicy mappingPolicy = MappingPolicy.UNMAPPED;
private final SortedSet<String> primaryServers = new TreeSet<String>();
private final SortedSet<String> secondaryServers = new TreeSet<String>();
- private int timeoutMS; // unlimited
+ /** Unlimited. */
+ private int timeoutMS;
private DN mappedSearchBindDN = searchBindDN;
private String mappedSearchBindPassword = "searchPassword";
private String mappedSearchBindPasswordEnvVar;
@@ -700,9 +677,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getMappedSearchBindPasswordEnvironmentVariable()
{
@@ -711,9 +686,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getMappedSearchBindPasswordFile()
{
@@ -722,9 +695,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getMappedSearchBindPasswordProperty()
{
@@ -733,9 +704,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long getCachedPasswordTTL()
{
@@ -744,9 +713,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getCachedPasswordStorageScheme()
{
@@ -755,9 +722,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN getCachedPasswordStorageSchemeDN()
{
@@ -773,9 +738,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isUsePasswordCaching()
{
@@ -872,7 +835,7 @@
private final List<MockScheduledFuture> monitorRunnables = new LinkedList<MockScheduledFuture>();
private String currentTime = TimeThread.getGMTTime();
- // All methods unused excepted scheduleWithFixedDelay.
+ /** All methods unused excepted scheduleWithFixedDelay. */
private final ScheduledExecutorService mockScheduler = new ScheduledExecutorService()
{
@@ -1027,9 +990,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ConnectionFactory getLDAPConnectionFactory(final String host,
final int port, final LDAPPassThroughAuthenticationPolicyCfg options)
@@ -1042,9 +1003,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ScheduledExecutorService getScheduledExecutorService()
{
@@ -1053,9 +1012,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getCurrentTime()
{
@@ -1064,9 +1021,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long getCurrentTimeMS()
{
@@ -1137,7 +1092,7 @@
final class MockServer
{
- // Waits for an incoming client connection.
+ /** Waits for an incoming client connection. */
class AcceptAction extends Action
{
@Override
@@ -1156,7 +1111,7 @@
- // Blocks the server until it is released.
+ /** Blocks the server until it is released. */
class BlockAction extends Action
{
private final CountDownLatch latch = new CountDownLatch(1);
@@ -1179,7 +1134,7 @@
- // Close the client socket.
+ /** Close the client socket. */
class CloseAction extends Action
{
@Override
@@ -1191,7 +1146,7 @@
- // Read the next message and check it matches the expected message.
+ /** Read the next message and check it matches the expected message. */
class ReceiveAction extends Action
{
private final int messageID;
@@ -1231,7 +1186,7 @@
- // Sends a message.
+ /** Sends a message. */
class SendAction extends Action
{
private final int messageID;
@@ -1296,9 +1251,7 @@
{
serverThread = new Thread(new Runnable()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -1459,9 +1412,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
Object getResult()
{
@@ -1471,9 +1422,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
boolean matchesEvent(final Event<?> event)
{
@@ -1490,9 +1439,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
StringBuilder toString(final StringBuilder builder)
{
@@ -1540,9 +1487,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
DirectoryException getResult()
{
@@ -1556,9 +1501,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
boolean matchesEvent(final Event<?> event)
{
@@ -1574,9 +1517,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
StringBuilder toString(final StringBuilder builder)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 13b8a5d..f3c54a7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -51,9 +51,8 @@
@SuppressWarnings("javadoc")
public class NumSubordinatesVirtualAttributeProviderTestCase extends DirectoryServerTestCase {
- // The attribute type for the numSubordinates attribute.
+ /** The attribute type for the numSubordinates attribute. */
private AttributeType numSubordinatesType;
-
private List<Entry> entries;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
index 60f7133..5b06fec 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
@@ -132,9 +132,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testContainsEntry()
@@ -145,9 +143,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry1()
@@ -158,9 +154,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry2()
@@ -171,9 +165,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntry3()
@@ -184,9 +176,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testGetEntryID()
@@ -197,9 +187,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntry()
@@ -210,9 +198,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testPutEntryIfAbsent()
@@ -223,9 +209,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testRemoveEntry()
@@ -236,9 +220,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClear()
@@ -249,9 +231,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearBackend()
@@ -262,9 +242,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testClearSubtree()
@@ -275,9 +253,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test
@Override
public void testHandleLowMemory()
@@ -309,9 +285,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Test(groups = { "slow", "testSoftRefCacheConcurrency" },
threadPoolSize = 10,
invocationCount = 10,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 63a37e8..2e114f6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -59,7 +59,7 @@
public class StructuralObjectClassVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
- // The attribute type for the structuralobjectclass attribute.
+ /** The attribute type for the structuralobjectclass attribute. */
private AttributeType structuralObjectClassType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index 0de64cc..bc7f50d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -58,7 +58,7 @@
public class SubschemaSubentryVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
- // The attribute type for the subschemaSubentry attribute.
+ /** The attribute type for the subschemaSubentry attribute. */
private AttributeType subschemaSubentryType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
index 13108d3..73072e1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012-2013 ForgeRock AS
+ * Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -58,7 +58,7 @@
{
/**
- * Cipher suite hardcoded from the IANA registry on internet
+ * Cipher suite hardcoded from the IANA registry on internet.
*/
static final String[][] HARDCODED_CIPHER_SUITE = new String[][] {
{ "TLS_NULL_WITH_NULL_NULL" },
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 4fafee0..9796bef 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
@@ -22,11 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.extensions;
-
-
import java.util.concurrent.atomic.AtomicInteger;
import org.opends.server.admin.std.server.
@@ -35,11 +34,8 @@
import org.opends.server.types.AccountStatusNotification;
import static org.testng.Assert.*;
-
import static org.opends.server.types.AccountStatusNotificationProperty.*;
-
-
/**
* This class implements a simple account status notification handler that may
* be used to ensure that all notifications are generated properly.
@@ -47,7 +43,7 @@
public class TestAccountStatusNotificationHandler
extends AccountStatusNotificationHandler<AccountStatusNotificationHandlerCfg>
{
- // The number of notifications that this handler has processed.
+ /** The number of notifications that this handler has processed. */
private static AtomicInteger notificationsProcessed = new AtomicInteger(0);
@@ -62,9 +58,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void initializeStatusNotificationHandler(
AccountStatusNotificationHandlerCfg configuration)
{
@@ -73,9 +67,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void handleStatusNotification(AccountStatusNotification notification)
{
notificationsProcessed.incrementAndGet();
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 4459633..11a65b2 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -50,13 +50,13 @@
- // The DN of the "configuration entry" for this alert generator.
+ /** The DN of the "configuration entry" for this alert generator. */
private DN configEntryDN;
- // The alert description used for testing purposes.
+ /** The alert description used for testing purposes. */
private String alertDescription;
- // The alert type used for testing purposes.
+ /** The alert type used for testing purposes. */
private String alertType;
@@ -88,9 +88,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public DN getComponentEntryDN()
{
return configEntryDN;
@@ -98,9 +96,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getClassName()
{
return CLASS_NAME;
@@ -108,9 +104,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public LinkedHashMap<String,String> getAlerts()
{
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
index a864b1e..6be5c86 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
@@ -53,24 +53,26 @@
- // The next value to return from the passwordIsAcceptable method.
+ /** The next value to return from the passwordIsAcceptable method. */
private boolean nextReturnValue;
- // The last new password provided to the passwordIsAcceptable method.
+ /** The last new password provided to the passwordIsAcceptable method. */
private ByteString lastNewPassword;
- // The last user entry provided to the passwordIsAcceptable method.
+ /** The last user entry provided to the passwordIsAcceptable method. */
private Entry lastUserEntry;
- // The last operation provided to the passwordIsAcceptable method.
+ /** The last operation provided to the passwordIsAcceptable method. */
private Operation lastOperation;
- // The last set of current passwords provided to the passwordIsAcceptable
- // method.
+ /**
+ * The last set of current passwords provided to the passwordIsAcceptable method.
+ */
private Set<ByteString> lastCurrentPasswords;
- // The next invalid reason that should be used in the passwordIsAcceptable
- // method.
+ /**
+ * The next invalid reason that should be used in the passwordIsAcceptable method.
+ */
private String nextInvalidReason;
@@ -85,9 +87,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePasswordValidator(
PasswordValidatorCfg configuration)
@@ -105,9 +105,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean passwordIsAcceptable(ByteString newPassword,
Set<ByteString> currentPasswords,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index c61243a..f7efed9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -209,16 +209,16 @@
- // The attribute type for the member attribute.
+ /** The attribute type for the member attribute. */
private AttributeType memberType;
- // The attribute type for the uniqueMember attribute.
+ /** The attribute type for the uniqueMember attribute. */
private AttributeType uniqueMemberType;
- // The server group manager.
+ /** The server group manager. */
private GroupManager groupManager;
- // The DNs of the various entries in the data set.
+ /** The DNs of the various entries in the data set. */
private DN u1;
private DN u2;
private DN u3;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
index 77eaa35..e32b6a1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -48,7 +48,7 @@
public abstract class GenericMonitorTestCase
extends MonitorTestCase
{
- // The configuration entry for this test case.
+ /** The configuration entry for this test case. */
protected ConfigEntry configEntry;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
index f856db6..3168921 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -77,9 +77,7 @@
private static final class Decoder
implements ControlDecoder<DelayRequestControl>
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DelayRequestControl decode(boolean isCritical, ByteString value)
throws DirectoryException
@@ -172,9 +170,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
@@ -204,9 +200,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -216,9 +210,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationBindOperation bindOperation)
@@ -236,9 +228,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationCompareOperation compareOperation)
@@ -248,9 +238,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationDeleteOperation deleteOperation)
@@ -260,9 +248,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationExtendedOperation extendedOperation)
@@ -272,9 +258,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -284,9 +268,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -296,9 +278,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationSearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
index 1ccf3a0..75f6f1d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -90,9 +90,7 @@
private static final class Decoder
implements ControlDecoder<DisconnectClientControl>
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DisconnectClientControl decode(boolean isCritical, ByteString value) throws DirectoryException
{
@@ -168,9 +166,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
@@ -229,9 +225,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(
PreParseAbandonOperation abandonOperation)
@@ -242,9 +236,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
throws CanceledOperationException {
@@ -257,9 +249,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
{
@@ -269,9 +259,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseCompareOperation compareOperation)
@@ -285,9 +273,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseDeleteOperation deleteOperation)
@@ -301,9 +287,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseExtendedOperation extendedOperation)
@@ -317,9 +301,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyOperation modifyOperation)
@@ -333,9 +315,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyDNOperation modifyDNOperation)
@@ -349,9 +329,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseSearchOperation searchOperation)
@@ -365,9 +343,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseUnbindOperation unbindOperation)
@@ -378,9 +354,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -394,9 +368,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationBindOperation bindOperation)
@@ -407,9 +379,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationCompareOperation compareOperation)
@@ -423,9 +393,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationDeleteOperation deleteOperation)
@@ -439,9 +407,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationExtendedOperation extendedOperation)
@@ -455,9 +421,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -471,9 +435,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -487,9 +449,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationSearchOperation searchOperation)
@@ -503,9 +463,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationAbandonOperation abandonOperation)
@@ -516,9 +474,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationAddOperation addOperation)
@@ -529,9 +485,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationBindOperation bindOperation)
@@ -542,9 +496,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationCompareOperation compareOperation)
@@ -555,9 +507,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationDeleteOperation deleteOperation)
@@ -568,9 +518,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationExtendedOperation extendedOperation)
@@ -581,9 +529,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -594,9 +540,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
@@ -607,9 +551,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationSearchOperation searchOperation)
@@ -620,9 +562,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationUnbindOperation unbindOperation)
@@ -633,9 +573,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseAddOperation addOperation)
@@ -646,9 +584,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseBindOperation bindOperation)
@@ -659,9 +595,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseCompareOperation compareOperation)
@@ -672,9 +606,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseDeleteOperation deleteOperation)
@@ -685,9 +617,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseExtendedOperation extendedOperation)
@@ -698,9 +628,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseModifyOperation modifyOperation)
@@ -711,9 +639,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
@@ -724,9 +650,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseSearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
index 9c0bf0b..822ea5e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -107,9 +107,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
@@ -119,9 +117,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseAbandonOperation abandonOperation)
@@ -132,9 +128,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
{
@@ -144,9 +138,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
{
@@ -156,9 +148,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseCompareOperation compareOperation)
@@ -169,9 +159,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseDeleteOperation deleteOperation)
@@ -182,9 +170,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseExtendedOperation extendedOperation)
@@ -195,9 +181,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyOperation modifyOperation)
@@ -208,9 +192,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyDNOperation modifyDNOperation)
@@ -221,9 +203,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseSearchOperation searchOperation)
@@ -234,9 +214,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseUnbindOperation unbindOperation)
@@ -273,9 +251,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -286,9 +262,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationBindOperation bindOperation)
@@ -299,9 +273,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationCompareOperation compareOperation)
@@ -312,9 +284,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationDeleteOperation deleteOperation)
@@ -325,9 +295,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationExtendedOperation extendedOperation)
@@ -338,9 +306,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -351,9 +317,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -364,9 +328,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationSearchOperation searchOperation)
@@ -403,9 +365,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationAbandonOperation abandonOperation)
@@ -416,9 +376,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationAddOperation addOperation)
@@ -429,9 +387,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationBindOperation bindOperation)
@@ -442,9 +398,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationCompareOperation compareOperation)
@@ -455,9 +409,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationDeleteOperation deleteOperation)
@@ -468,9 +420,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationExtendedOperation extendedOperation)
@@ -481,9 +431,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -494,9 +442,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
@@ -507,9 +453,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationSearchOperation searchOperation)
@@ -520,9 +464,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostOperation
doPostOperation(PostOperationUnbindOperation unbindOperation)
@@ -559,9 +501,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseAddOperation addOperation)
@@ -572,9 +512,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseBindOperation bindOperation)
@@ -585,9 +523,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseCompareOperation compareOperation)
@@ -598,9 +534,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseDeleteOperation deleteOperation)
@@ -611,9 +545,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseExtendedOperation extendedOperation)
@@ -624,9 +556,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseModifyOperation modifyOperation)
@@ -637,9 +567,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
@@ -650,9 +578,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostResponse
doPostResponse(PostResponseSearchOperation searchOperation)
@@ -689,9 +615,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void doPostSynchronization(PostSynchronizationAddOperation
addOperation)
@@ -701,9 +625,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void doPostSynchronization(PostSynchronizationModifyOperation
modifyOperation)
@@ -713,9 +635,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void doPostSynchronization(PostSynchronizationModifyDNOperation
modifyDNOperation)
@@ -752,9 +672,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.IntermediateResponse
processSearchEntry(SearchEntrySearchOperation searchOperation,
@@ -793,9 +711,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.IntermediateResponse
processSearchReference(SearchReferenceSearchOperation searchOperation,
@@ -834,9 +750,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.SubordinateModifyDN processSubordinateModifyDN(
SubordinateModifyDNOperation modifyDNOperation, Entry oldEntry,
@@ -876,9 +790,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.IntermediateResponse processIntermediateResponse(
IntermediateResponse intermediateResponse)
@@ -916,9 +828,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostConnect doPostConnect(ClientConnection
clientConnection)
@@ -955,9 +865,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PostDisconnect doPostDisconnect(
ClientConnection clientConnection, DisconnectReason disconnectReason,
@@ -995,9 +903,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.ImportLDIF doLDIFImport(LDIFImportConfig importConfig,
Entry entry)
@@ -1034,9 +940,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.ImportLDIF doLDIFExport(LDIFExportConfig exportConfig,
Entry entry)
@@ -1096,9 +1000,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.Startup doStartup()
{
@@ -1132,9 +1034,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void doShutdown(LocalizableMessage reason)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
index 531f54b..8b7cf1c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
@@ -58,9 +58,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
index 2261cb5..5a2bf3b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -80,9 +80,7 @@
private static final class Decoder
implements ControlDecoder<ShortCircuitRequestControl>
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ShortCircuitRequestControl decode(boolean isCritical, ByteString value)
throws DirectoryException
@@ -197,9 +195,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
@@ -239,9 +235,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseAbandonOperation abandonOperation)
@@ -261,9 +255,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
{
@@ -282,9 +274,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
{
@@ -303,9 +293,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseCompareOperation compareOperation)
@@ -325,9 +313,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseDeleteOperation deleteOperation)
@@ -347,9 +333,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseExtendedOperation extendedOperation)
@@ -369,9 +353,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyOperation modifyOperation)
@@ -391,9 +373,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseModifyDNOperation modifyDNOperation)
@@ -413,9 +393,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseSearchOperation searchOperation)
@@ -435,9 +413,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreParse
doPreParse(PreParseUnbindOperation unbindOperation)
@@ -457,9 +433,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -479,9 +453,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationBindOperation bindOperation)
@@ -501,9 +473,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationCompareOperation compareOperation)
@@ -523,9 +493,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationDeleteOperation deleteOperation)
@@ -545,9 +513,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationExtendedOperation extendedOperation)
@@ -567,9 +533,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -589,9 +553,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -611,9 +573,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationSearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
index 8346f79..49f3d12 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -63,20 +63,22 @@
- // The set of attributes to set in the next add operation.
+ /** The set of attributes to set in the next add operation. */
private ArrayList<Attribute> setAttributes;
- // The set of attribute types for attributes to remove from the next add
- // operation.
+ /**
+ * The set of attribute types for attributes to remove from the next add
+ * operation.
+ */
private ArrayList<AttributeType> removeAttributes;
- // The set of objectclasses to add to the next add operation.
+ /** The set of objectclasses to add to the next add operation. */
private ArrayList<ObjectClass> addObjectClasses;
- // The set of objectclasses to remove from the next add operation.
+ /** The set of objectclasses to remove from the next add operation. */
private ArrayList<ObjectClass> removeObjectClasses;
- // The set of modifications to add to the next modify operation.
+ /** The set of modifications to add to the next modify operation. */
private ArrayList<Modification> modifications;
@@ -95,9 +97,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializePlugin(Set<PluginType> pluginTypes,
PluginCfg configuration)
@@ -130,9 +130,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationAddOperation addOperation)
@@ -164,9 +162,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public PluginResult.PreOperation
doPreOperation(PreOperationModifyOperation modifyOperation)
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 9d1c7b5..6390bbf 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.protocols.internal;
@@ -42,10 +43,10 @@
public class TestInternalSearchListener
implements InternalSearchListener
{
- // The list of search result entries returned.
+ /** The list of search result entries returned. */
private ArrayList<SearchResultEntry> searchEntries;
- // The list of search result references returned.
+ /** The list of search result references returned. */
private ArrayList<SearchResultReference> searchReferences;
@@ -61,9 +62,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void handleInternalSearchEntry(InternalSearchOperation searchOperation,
SearchResultEntry searchEntry)
{
@@ -72,9 +71,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void handleInternalSearchReference(
InternalSearchOperation searchOperation,
SearchResultReference searchReference)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
index 1767c55..27ccd6f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -286,7 +286,6 @@
// Create a new JMX connector for this test.
// This will allow to use the old one if this test fails.
- //
ServerSocket serverJmxSocket = new ServerSocket();
serverJmxSocket.setReuseAddress(true);
serverJmxSocket.bind(new InetSocketAddress("127.0.0.1", 0));
@@ -350,7 +349,7 @@
/**
- * Test changing JMX port through LDAP
+ * Test changing JMX port through LDAP.
*/
@Test(enabled = false)
public void changePort() throws Exception {
@@ -476,10 +475,6 @@
- /**
- * @param config
- * @throws Exception
- */
private void configureJmx(Entry entry) throws Exception {
ArrayList<LocalizableMessage> reasons = new ArrayList<LocalizableMessage>();
@@ -511,7 +506,6 @@
// Provide the credentials required by the server to successfully
// perform user authentication
- //
String[] credentials;
if ((user == null) && (password == null)) {
credentials = null;
@@ -523,7 +517,6 @@
// Create an RMI connector client and
// connect it to the RMI connector server
- //
OpendsJmxConnector opendsConnector;
try {
opendsConnector = new OpendsJmxConnector("localhost", jmxPort, env);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
index 4ec6bbd..2b16fdb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -36,7 +36,7 @@
import java.nio.channels.IllegalBlockingModeException;
/**
- * Test class for ASN1ByteChannelReader
+ * Test class for ASN1ByteChannelReader.
*/
public class ASN1ByteChannelReaderTestCase extends ASN1ReaderTestCase
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index 5566d2a..374d01b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -70,9 +70,7 @@
*/
private static final LocalizableMessage resultMsg = LocalizableMessage.raw("Test Successful");
- /**
- * The DN to use for add result operations
- */
+ /** The DN to use for add result operations. */
private DN dn;
@BeforeClass
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index b1897bc..b1999e8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -36,7 +36,6 @@
import org.forgerock.opendj.io.ASN1Writer;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
-//import org.testng.Reporter;
public class TestBindRequestProtocolOp extends LdapTestCase {
private static String dn="cn=some dn, dc=example, dc=com";
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
index 198b932..03d2e4d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -44,42 +44,21 @@
*/
public class TestCompareRequestProtocolOp extends LdapTestCase
{
- /**
- * 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 DN for compare requests in this test case.
- */
+ /** The DN for compare requests in this test case. */
private static final ByteString dn =
ByteString.valueOf("dc=example,dc=com");
- /**
- * The alternative DN for compare requests in this test case.
- */
- private static final ByteString dnAlt =
- ByteString.valueOf("dc=sun,dc=com");
+ /** The assertion value for this compare request. */
+ private ByteString assertionValue = ByteString.valueOf("=test");
- // The assertion value for this compare request.
- private ByteString assertionValue =
- ByteString.valueOf("=test");
-
- // The assertion value for this compare request.
- private ByteString assertionValueAlt =
- ByteString.valueOf("=testAlt");
-
- // The attribute type for this compare request.
+ /** The attribute type for this compare request. */
private String attributeType = "testAttribute";
- // The alternate attribute type for this compare request.
- private String attributeTypeAlt = "testAttributeAlt";
-
/**
* Test to make sure the class processes the right LDAP op type.
*
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index eb09b87..37e3076 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -66,7 +66,7 @@
private static final LocalizableMessage resultMsg = LocalizableMessage.raw("Test Successful");
/**
- * The DN to use for compare result operations
+ * The DN to use for compare result operations.
*/
private DN dn;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index c9094c4..a0fc89c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -68,7 +68,7 @@
private static final LocalizableMessage resultMsg = LocalizableMessage.raw("Test Successful");
/**
- * The DN to use for delete result operations
+ * The DN to use for delete result operations.
*/
private DN dn;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index e135113..0c6771e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -72,7 +72,7 @@
private static final LocalizableMessage resultMsg = LocalizableMessage.raw("Test Successful");
/**
- * The DN to use for compare result operations
+ * The DN to use for compare result operations.
*/
private DN dn;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 945099f..0b6d934 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -68,7 +68,7 @@
private static final LocalizableMessage resultMsg = LocalizableMessage.raw("Test Successful");
/**
- * The DN to use for add result operations
+ * The DN to use for add result operations.
*/
private DN dn;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
index 6e9f89e..f7ee69e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication;
@@ -254,10 +254,7 @@
try
{
- //
// Create replication server, replication domain and broker.
- //
-
String entryldif = "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
+ "objectClass: organization\n";
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
index c50ea2f..11cb018 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication;
@@ -82,7 +82,7 @@
@SuppressWarnings("javadoc")
public class GenerationIdTest extends ReplicationTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final String baseDnStr = TEST_ROOT_DN_STRING;
@@ -910,8 +910,7 @@
}
/**
- * testMultiRS tests basic features of generationID
- * with more than one Replication Server.
+ * Tests basic features of generationID with more than one Replication Server.
* The following test focus on:
* - genId checking across multiple starting RS (replication servers)
* - genId setting propagation from one RS to the others
@@ -1034,7 +1033,7 @@
}
/**
- * Disconnect broker and remove entries from the local DB
+ * Disconnect broker and remove entries from the local DB.
*/
private void postTest() throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
index 84a6862..aba0dbe 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication;
@@ -85,9 +85,7 @@
@SuppressWarnings("javadoc")
public class InitOnLineTest extends ReplicationTestCase
{
- /**
- * The tracer object for the debug logger
- */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final int WINDOW_SIZE = 10;
@@ -724,8 +722,8 @@
}
}
- /**
- * Tests the import side of the InitializeTarget task
+ /**
+ * Tests the import side of the InitializeTarget task.
*/
@Test(enabled=true, groups="slow")
public void initializeTargetImport() throws Exception
@@ -774,7 +772,7 @@
}
/**
- * Tests the import side of the InitializeTarget task
+ * Tests the import side of the InitializeTarget task.
*/
@Test(enabled=false)
public void initializeTargetConfigErrors() throws Exception
@@ -823,7 +821,7 @@
}
/**
- * Tests the import side of the InitializeTarget task
+ * Tests the import side of the InitializeTarget task.
*/
@Test(enabled=true)
public void initializeConfigErrors() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
index fca2db0..7dd9442 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication;
@@ -61,7 +61,7 @@
/**
* Test the constructors, encoders and decoders of the Replication AckMsg,
- * ModifyMsg, ModifyDnMsg, AddMsg and Delete MSG
+ * ModifyMsg, ModifyDnMsg, AddMsg and Delete MSG.
*/
@SuppressWarnings("javadoc")
public class ProtocolWindowTest extends ReplicationTestCase
@@ -73,13 +73,13 @@
private static final int REPLICATION_QUEUE_SIZE = 100;
/**
- * A "person" entry
+ * A "person" entry.
*/
private Entry personEntry;
private int replServerPort;
- /** the base DN used for this test */
+ /** The base DN used for this test. */
private DN baseDN;
private ReplicationServer replicationServer;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
index 764567e..d2d0b3a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication;
@@ -48,7 +48,7 @@
@SuppressWarnings("javadoc")
public class ReSyncTest extends ReplicationTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private void debugInfo(String s)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index be90671..ebcca44 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -92,7 +92,7 @@
public abstract class ReplicationTestCase extends DirectoryServerTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
@@ -109,8 +109,8 @@
public static final long EMPTY_DN_GENID = GenerationIdChecksum.EMPTY_BACKEND_GENERATION_ID;
/**
- * The internal connection used for operation
- */
+ * The internal connection used for operation.
+ */
protected InternalClientConnection connection;
/** Created entries that will be deleted on class cleanup. */
@@ -128,7 +128,7 @@
System.getProperty(REPLICATION_DB_IMPL_PROPERTY, ReplicationDBImplementation.LOG.name()));
/**
- * Replication monitor stats
+ * Replication monitor stats.
*/
private DN monitorDN;
private String monitorAttr;
@@ -160,7 +160,7 @@
protected boolean callParanoiaCheck = true;
/**
- * The replication plugin entry
+ * The replication plugin entry.
*/
protected static final String SYNCHRO_PLUGIN_DN =
"cn=Multimaster Synchronization, cn=Synchronization Providers,cn=config";
@@ -302,7 +302,7 @@
}
/**
- * suppress all the config entries created by the tests in this class
+ * Suppress all the config entries created by the tests in this class.
*/
protected void cleanConfigEntries() throws Exception
{
@@ -319,7 +319,7 @@
}
/**
- * suppress all the real entries created by the tests in this class
+ * Suppress all the real entries created by the tests in this class.
*/
protected void cleanRealEntries() throws Exception
{
@@ -398,7 +398,7 @@
/**
* Cleanup databases of the currently instantiated replication servers in the
- * VM
+ * VM.
*/
protected void cleanUpReplicationServersDB() throws Exception
{
@@ -799,7 +799,7 @@
}
/**
- * Add to the current DB the entries necessary to the test
+ * Add to the current DB the entries necessary to the test.
*/
protected void addTestEntriesToDB(String... ldifEntries) throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
index 7dc9ea6..7753f48 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
@@ -66,9 +66,7 @@
private BrokerReader reader;
- /**
- * A "person" entry
- */
+ /** A "person" entry. */
private Entry personEntry;
private int replServerPort;
@@ -215,17 +213,13 @@
{
int count;
- /**
- * Creates a new Stress Test Reader
- */
+ /** Creates a new Stress Test Reader. */
public BrokerWriter(int count)
{
this.count = count;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -254,16 +248,14 @@
private Boolean finished = false;
/**
- * Creates a new Stress Test Reader
+ * Creates a new Stress Test Reader.
*/
public BrokerReader(ReplicationBroker broker)
{
this.broker = broker;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -291,7 +283,7 @@
}
/**
- * wait until the thread has finished its job then return the number of
+ * Wait until the thread has finished its job then return the number of
* received messages.
*/
public int getCount()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
index b91ba32..b1ecf93 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -69,7 +69,7 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
- * An entry with a entryUUID
+ * An entry with a entryUUID.
*/
private Entry personWithUUIDEntry;
private Entry personWithSecondUniqueID;
@@ -85,7 +85,7 @@
private String user1entryUUID;
/**
- * A "person" entry
+ * A "person" entry.
*/
private Entry personEntry;
private int replServerPort;
@@ -272,7 +272,7 @@
}
/**
- * Add an entry in the database
+ * Add an entry in the database.
*/
private CSN addEntry(Entry entry) throws Exception
{
@@ -283,7 +283,7 @@
}
/**
- * Delete an entry in the database
+ * Delete an entry in the database.
*/
private void delEntry(DN dn) throws Exception
{
@@ -920,11 +920,9 @@
assertConflictAutomaticallyResolved(alertCount);
- //
// Check that when a delete is conflicting with Add of some entries
// below the deleted entries, the child entry that have been added
// before the deleted is replayed gets renamed correctly.
- //
// add domain1 entry with 2 children : domain2 and domain3
addEntry(domain1);
@@ -971,10 +969,9 @@
delEntry(conflictDomain3dn);
- //
// Check that when a delete is replayed over an entry which has child
// those child are also deleted
- //
+
// add domain1 entry with 2 children : domain2 and domain3
addEntry(domain1);
domain1uid = getEntryUUID(domain1dn);
@@ -1005,11 +1002,9 @@
delEntry(conflictDomain2dn);
delEntry(conflictDomain3dn);
- //
// Check that when an entry is added on one master below an entry
// that is currently deleted on another master, the replay of the
// add on the second master cause the added entry to be renamed
- //
broker.publish(addMsg(gen, domain2, domain2uid, domain1uid));
// check that conflict entry was created
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java
index f3f427b..403b28c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -36,7 +36,7 @@
public class CSNGeneratorTest extends ReplicationTestCase
{
/**
- * Test the adjust method of CSNGenerator
+ * Test the adjust method of CSNGenerator.
*/
@Test
public void adjustTest()
@@ -68,7 +68,7 @@
/**
* Test the correct behavior of the CSNGenerator when
- * the seqnum is rolling over its limit
+ * the seqnum is rolling over its limit.
*/
@Test
public void adjustRollingSeqnum()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
index b0b190b..8feacb6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -39,14 +39,14 @@
import static org.testng.Assert.*;
/**
- * Test {@link CSN} and {@link CSNGenerator}
+ * Test {@link CSN} and {@link CSNGenerator}.
*/
@SuppressWarnings("javadoc")
public class CSNTest extends ReplicationTestCase
{
/**
- * Create CSN Data
+ * Create CSN Data.
*/
@DataProvider(name = "csnData")
public Object[][] createConstructorData() {
@@ -61,7 +61,7 @@
};
}
- /** Test CSN constructor */
+ /** Test CSN constructor. */
@Test(dataProvider = "csnData")
public void createCSN(long time, int seq, int id, String str) throws Exception
{
@@ -75,7 +75,7 @@
}
/**
- * Test toString and constructor from String
+ * Test toString and constructor from String.
*/
@Test(dataProvider = "csnData")
public void csnEncodeDecode(long time, int seq, int id, String str) throws Exception
@@ -91,7 +91,7 @@
}
/**
- * Create CSN
+ * Create CSN.
*/
@DataProvider(name = "createCSN")
public Object[][] createCSNData()
@@ -112,14 +112,14 @@
return obj;
}
- /** Test {@link CSN#hashCode()} method */
+ /** Test {@link CSN#hashCode()} method. */
@Test(dataProvider = "createCSN")
public void csnHashCode(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
assertEquals(csn1.hashCode(), csn2.hashCode());
}
- /** Test {@link CSN#equals(Object)} method */
+ /** Test {@link CSN#equals(Object)} method. */
@Test(dataProvider = "createCSN")
public void csnEquals(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -131,7 +131,7 @@
assertFalse(csn1.equals(csn5));
}
- /** Test {@link CSN#getTimeSec()} method */
+ /** Test {@link CSN#getTimeSec()} method. */
@Test(dataProvider = "createCSN")
public void csnGetTimeSec(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -143,7 +143,7 @@
assertEquals(csn5.getTime()/1000, csn5.getTimeSec());
}
- /** Test {@link CSN#compare(CSN, CSN)} method */
+ /** Test {@link CSN#compare(CSN, CSN)} method. */
@Test(dataProvider = "createCSN")
public void csnCompare(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -159,7 +159,7 @@
assertTrue(CSN.compare(csn5, csn1) > 0);
}
- /** Test {@link CSN#isOlderThan(CSN)} method */
+ /** Test {@link CSN#isOlderThan(CSN)} method. */
@Test(dataProvider = "createCSN")
public void csnOlder(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -170,7 +170,7 @@
assertTrue(csn1.isOlderThan(csn5));
}
- /** Test {@link CSN#isOlderThanOrEqualTo(CSN)} method */
+ /** Test {@link CSN#isOlderThanOrEqualTo(CSN)} method. */
@Test(dataProvider = "createCSN")
public void csnOlderOrEqual(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -181,7 +181,7 @@
assertTrue(csn1.isOlderThanOrEqualTo(csn5));
}
- /** Test {@link CSN#isNewerThan(CSN)} method */
+ /** Test {@link CSN#isNewerThan(CSN)} method. */
@Test(dataProvider = "createCSN")
public void csnNewer(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
@@ -192,7 +192,7 @@
assertFalse(csn1.isNewerThan(csn5));
}
- /** Test {@link CSN#isNewerThanOrEqualTo(CSN)} method */
+ /** Test {@link CSN#isNewerThanOrEqualTo(CSN)} method. */
@Test(dataProvider = "createCSN")
public void csnNewerOrEquals(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java
index db382e6..3a58b88 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -36,14 +36,14 @@
import static org.testng.Assert.*;
/**
- * Test the ServerState
+ * Test the ServerState.
*/
@SuppressWarnings("javadoc")
public class ServerStateTest extends ReplicationTestCase
{
/**
- * Create CSN Data
+ * Create CSN Data.
*/
@DataProvider(name = "csnData")
public Object[][] createCSNData()
@@ -55,7 +55,7 @@
}
/**
- * Create a new ServerState object
+ * Create a new ServerState object.
*/
@Test(dataProvider = "csnData")
public void serverStateTest(CSN csn) throws Exception
@@ -96,7 +96,7 @@
}
/**
- * Create a new ServerState object
+ * Create a new ServerState object.
*/
@Test(dataProvider = "csnData")
public void serverStateReloadTest(CSN csn) throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 1a1ebea..b0b1a9c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -109,13 +109,13 @@
/** The port of the replicationServer. */
private int replServerPort;
private final int RS_SERVER_ID = 90;
- /** Sleep time of the RS, before sending an ack */
+ /** Sleep time of the RS, before sending an ack. */
private static final long NO_TIMEOUT_RS_SLEEP_TIME = 2000;
private final String testName = getClass().getSimpleName();
/**
* Create two distinct base dns, one for safe data replication, the other one
- * for safe read replication
+ * for safe read replication.
*/
private final String SAFE_DATA_DN = "ou=safe-data," + TEST_ROOT_DN_STRING;
private final String SAFE_READ_DN = "ou=safe-read," + TEST_ROOT_DN_STRING;
@@ -124,10 +124,10 @@
private Entry safeReadDomainCfgEntry;
private Entry notAssuredDomainCfgEntry;
- /** The fake replication server */
+ /** The fake replication server. */
private FakeReplicationServer replicationServer;
- // Definitions for the scenario the RS supports
+ /** Definitions for the scenario the RS supports. */
private static final int NOT_ASSURED_SCENARIO = 1;
private static final int TIMEOUT_SCENARIO = 2;
private static final int NO_TIMEOUT_SCENARIO = 3;
@@ -135,7 +135,7 @@
private static final int SAFE_DATA_MANY_ERRORS = 5;
private static final int NO_READ = 6;
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private void debugInfo(String s)
@@ -148,7 +148,7 @@
}
/**
- * Before starting the tests configure some stuff
+ * Before starting the tests configure some stuff.
*/
@BeforeClass
@Override
@@ -171,7 +171,7 @@
}
/**
- * Add an entry in the database
+ * Add an entry in the database.
*/
private void addEntry(Entry entry) throws Exception
{
@@ -281,30 +281,30 @@
private boolean shutdown;
private Session session;
- // Parameters given at constructor time
+ /** Parameters given at constructor time. */
private final int port;
private int serverId = -1;
private boolean isAssured;
private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
private byte safeDataLevel = 1;
- // Predefined config parameters
+ /** Predefined config parameters. */
private final int degradedStatusThreshold = 5000;
- // Parameters set with received server start message
+ /** Parameters set with received server start message. */
private DN baseDN;
private long generationId = -1L;
private ServerState serverState;
private int windowSize = -1;
private byte groupId = -1;
private boolean sslEncryption;
- /** The scenario this RS is expecting */
+ /** The scenario this RS is expecting. */
private int scenario = -1;
- /** parameters at handshake are ok */
+ /** Parameters at handshake are ok. */
private boolean handshakeOk;
/**
- * signal that the current scenario the RS must execute reached the point
+ * Signal that the current scenario the RS must execute reached the point
* where the main code can perform test assertion.
*/
private boolean scenarioExecuted;
@@ -333,7 +333,7 @@
this.assuredMode = AssuredMode.SAFE_READ_MODE;
}
- // Constructor for RS receiving updates in SD assured mode
+ /** Constructor for RS receiving updates in SD assured mode. */
public FakeReplicationServer(byte groupId, int port, int serverId, int safeDataLevel,
String testcase)
{
@@ -367,7 +367,7 @@
}
/**
- * Wait for DS connections
+ * Wait for DS connections.
*/
@Override
public void run()
@@ -437,7 +437,7 @@
/**
* Handle the handshake processing with the connecting DS
- * returns true if handshake was performed without errors
+ * returns true if handshake was performed without errors.
*/
private boolean performHandshake() throws Exception
{
@@ -502,7 +502,7 @@
/**
* Tells the main code that the fake RS executed enough of the expected
- * scenario and can perform test assertion
+ * scenario and can perform test assertion.
*/
public boolean isScenarioExecuted()
{
@@ -510,7 +510,7 @@
}
/**
- * Handle client connection then call code specific to configured test
+ * Handle client connection then call code specific to configured test.
*/
private void handleClientConnection() throws Exception
{
@@ -566,7 +566,7 @@
/**
* Make the RS send an add message with the passed entry and return the ack
- * message it receives from the DS
+ * message it receives from the DS.
*/
private AckMsg sendAssuredAddMsg(Entry entry, String parentUid) throws Exception
{
@@ -589,7 +589,7 @@
}
/**
- * Read the coming update and check parameters are not assured
+ * Read the coming update and check parameters are not assured.
*/
private void executeNotAssuredScenario() throws Exception
{
@@ -600,7 +600,7 @@
/**
* Read the coming update and make the client time out by not sending back
- * the ack
+ * the ack.
*/
private void executeTimeoutScenario() throws Exception
{
@@ -613,7 +613,7 @@
}
/**
- * Read the coming update, sleep some time then send back an ack
+ * Read the coming update, sleep some time then send back an ack.
*/
private void executeNoTimeoutScenario() throws Exception
{
@@ -631,7 +631,7 @@
/**
* Receives an {@link UpdateMsg} and checks that received update assured
- * parameters are as defined at RS start
+ * parameters are as defined at RS start.
*/
private UpdateMsg checkAssuredParametersOnReceivedUpdateMsg() throws Exception
{
@@ -651,7 +651,7 @@
}
/**
- * Read the coming safe read mode updates and send back acks with errors
+ * Read the coming safe read mode updates and send back acks with errors.
*/
private void executeSafeReadManyErrorsScenario() throws Exception
{
@@ -689,7 +689,7 @@
}
/**
- * Read the coming safe data mode updates and send back acks with errors
+ * Read the coming safe data mode updates and send back acks with errors.
*/
private void executeSafeDataManyErrorsScenario() throws Exception
{
@@ -727,7 +727,7 @@
}
/**
- * Return various group id values
+ * Return various group id values.
*/
@DataProvider(name = "rsGroupIdProvider")
private Object[][] rsGroupIdProvider()
@@ -938,7 +938,7 @@
/**
* Tests parameters sent in session handshake and updates, when not using
- * assured replication
+ * assured replication.
*/
@Test
public void testNotAssuredSession() throws Exception
@@ -975,7 +975,7 @@
/**
* Wait for connection to the fake replication server or times out with error
- * after some seconds
+ * after some seconds.
*/
private void waitForConnectionToRs(String testCase, FakeReplicationServer rs) throws Exception
{
@@ -991,7 +991,7 @@
/**
* Wait for the scenario to be executed by the fake replication server or
- * times out with error after some seconds
+ * times out with error after some seconds.
*/
private void waitForScenarioExecutedOnRs(String testCase, FakeReplicationServer rs) throws Exception
{
@@ -1109,7 +1109,7 @@
/**
* Tests that a DS receiving an update from a RS in safe read mode effectively
- * sends an ack back (with or without error)
+ * sends an ack back (with or without error).
*/
@Test(dataProvider = "rsGroupIdProvider", groups = "slow")
public void testSafeReadModeReply(byte rsGroupId) throws Exception
@@ -1196,7 +1196,7 @@
/**
* Tests that a DS receiving an update from a RS in safe data mode does not
- * send back and ack (only safe read is taken into account in DS replay)
+ * send back and ack (only safe read is taken into account in DS replay).
*/
@Test(dataProvider = "rsGroupIdProvider", groups = "slow")
public void testSafeDataModeReply(byte rsGroupId) throws Exception
@@ -1438,7 +1438,7 @@
}
/**
- * Delete an entry from the database
+ * Delete an entry from the database.
*/
private void deleteEntry(String dn) throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java
index e0fc263..d64e46c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -42,7 +42,7 @@
import static org.testng.Assert.*;
/**
- * Test AttrInfo and AttrInfoWithOptions
+ * Test AttrInfo and AttrInfoWithOptions.
*/
@SuppressWarnings("javadoc")
public class AttrInfoTest extends ReplicationTestCase
@@ -75,7 +75,7 @@
}
/**
- * Create a AttrInfo and check the methods
+ * Create a AttrInfo and check the methods.
*/
@Test(dataProvider = "attrInfo")
public void attrInfo(ByteString att, CSN deleteTime, CSN updateTime) throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
index b2a169e..538ff53 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -58,15 +58,15 @@
private IsolationPolicy policy = IsolationPolicy.REJECT_ALL_UPDATES;
- /** Assured sub mode (used when assured is true) */
+ /** Assured sub mode (used when assured is true). */
private AssuredType assuredType = AssuredType.NOT_ASSURED;
- /** Safe Data level (used when assuredType is safe data) */
+ /** Safe Data level (used when assuredType is safe data). */
private int assuredSdLevel = 1;
- /** Timeout (in milliseconds) when waiting for acknowledgments */
+ /** Timeout (in milliseconds) when waiting for acknowledgments. */
private long assuredTimeout = 1000;
- /** Group id */
+ /** Group id. */
private final int groupId;
- /** Referrals urls to be published to other servers of the topology */
+ /** Referrals urls to be published to other servers of the topology. */
private SortedSet<String> refUrls = new TreeSet<String>();
private final SortedSet<String> fractionalExcludes = new TreeSet<String>();
@@ -78,7 +78,7 @@
/**
* Creates a new Domain with the provided information
- * (assured mode disabled, default group id)
+ * (assured mode disabled, default group id).
*/
public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers)
{
@@ -87,7 +87,7 @@
/**
* Creates a new Domain with the provided information
- * (assured mode disabled, group id provided)
+ * (assured mode disabled, group id provided).
*/
public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers,
int groupId)
@@ -100,7 +100,7 @@
/**
* Creates a new Domain with the provided information
- * (assured mode info provided as well as group id)
+ * (assured mode info provided as well as group id).
*/
public DomainFakeCfg(DN baseDN, int serverId, SortedSet<String> replServers,
AssuredType assuredType, int assuredSdLevel, int groupId,
@@ -122,36 +122,28 @@
this.refUrls = refUrls;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void addChangeListener(
ConfigurationChangeListener<ReplicationDomainCfg> listener)
{
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Class<? extends ReplicationDomainCfg> configurationClass()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long getHeartbeatInterval()
{
return heartbeatInterval ;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long getChangetimeHeartbeatInterval()
{
@@ -163,42 +155,32 @@
this.changeTimeHeartbeatInterval = changeTimeHeartbeatInterval;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN getBaseDN()
{
return baseDN;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public SortedSet<String> getReplicationServer()
{
return replicationServers;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public InetAddress getSourceAddress() { return null; }
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getServerId()
{
return serverId;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getWindowSize()
{
@@ -210,18 +192,14 @@
this.windowSize = windowSize;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void removeChangeListener(
ConfigurationChangeListener<ReplicationDomainCfg> listener)
{
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN dn()
{
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 5304986..86fa7c1 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -41,20 +41,20 @@
implements ExternalChangelogDomainCfg
{
- // The value of the "ecl-include" property.
+ /** The value of the "ecl-include" property. */
private SortedSet<String> pECLInclude;
- // The value of the "ecl-include-for-deletes" property.
+ /** The value of the "ecl-include-for-deletes" property. */
private SortedSet<String> pECLIncludeForDeletes;
- // The value of the "enabled" property.
+ /** The value of the "enabled" property. */
private boolean pEnabled;
private DN pDN;
/**
* Creates a new Domain with the provided information
- * (assured mode disabled, default group id)
+ * (assured mode disabled, default group id).
*/
public ExternalChangelogDomainFakeCfg(boolean isEnabled,
SortedSet<String> eclInclude,
@@ -65,9 +65,7 @@
this.pECLIncludeForDeletes = eclIncludeForDeletes != null ? eclIncludeForDeletes : new TreeSet<String>();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Class<? extends ExternalChangelogDomainCfg> configurationClass()
{
return null;
@@ -141,4 +139,4 @@
this.pDN = dn;
}
-}
\ No newline at end of file
+}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
index 223fd3e..876c469 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -38,7 +39,7 @@
{
/**
- * Basic usage test (reset and single update method)
+ * Basic usage test (reset and single update method).
*/
@Test
public void testResetAndSingleUpdate()
@@ -70,7 +71,7 @@
}
/**
- * Provider for testArrayUpdate method
+ * Provider for testArrayUpdate method.
*/
@DataProvider(name = "arrayUpdateProvider")
protected Object[][] arrayUpdateProvider()
@@ -92,7 +93,7 @@
}
/**
- * Test of update method, array version
+ * Test of update method, array version.
*/
@Test(dataProvider = "arrayUpdateProvider")
public void testArrayUpdate(byte[] b, int off, int len, long expectedChecksum)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index f923de2..df4da1a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -101,7 +101,7 @@
}
/**
- * Check the basic comparator on the HistoricalCsnOrderingMatchingRule
+ * Check the basic comparator on the HistoricalCsnOrderingMatchingRule.
*/
@Test
public void basicRuleTest() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
index 8f24569..d692623 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -164,7 +164,7 @@
/**
* Test that replace with null value is correctly seen as a delete
* by doing first a replace with null, then add at at previous time
- * then check that the add was ignored
+ * then check that the add was ignored.
*/
@Test
public void replaceWithNull() throws Exception
@@ -1266,7 +1266,7 @@
}
/**
- * helper function.
+ * Helper function.
*/
private void testHistoricalAndFake(Entry entry)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 525a90a..f97220c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -62,7 +62,7 @@
private ReplicationServer rs1;
private ReplicationServer rs2;
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private void debugInfo(String s)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
index e3afd91..94007b2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -50,9 +50,9 @@
*/
public class ReplicationServerLoadBalancingTest extends ReplicationTestCase
{
- /** Number of DSs */
+ /** Number of DSs. */
private static final int NDS = 20;
- /** Number of RSs */
+ /** Number of RSs. */
private static final int NRS = 4;
private final LDAPReplicationDomain rd[] = new LDAPReplicationDomain[NDS];
private final ReplicationServer rs[] = new ReplicationServer[NRS];
@@ -62,7 +62,7 @@
private static final int RS2_ID = 502;
private static final int RS3_ID = 503;
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private void debugInfo(String s)
@@ -161,7 +161,7 @@
}
/**
- * Returns a suitable RS configuration with the passed new weight
+ * Returns a suitable RS configuration with the passed new weight.
*/
private ReplicationServerCfg createReplicationServerConfigWithNewWeight
(int rsIndex, int weight, String testCase)
@@ -263,7 +263,7 @@
/**
* Return the number of DSs currently connected to the RS with the passed
- * index
+ * index.
*/
private int getNbDSsConnectedToRS(int rsIndex)
{
@@ -730,7 +730,7 @@
}
}
- /** Translate an int array into a human readable string */
+ /** Translate an int array into a human readable string. */
private static String toString(int[] ints)
{
StringBuilder sb = new StringBuilder("[");
@@ -746,7 +746,7 @@
return sb.toString();
}
- /** Translate an int[][] array into a human readable string */
+ /** Translate an int[][] array into a human readable string. */
private static String toString(int[][] ints)
{
StringBuilder sb = new StringBuilder("[");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
index b464963..6453127 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -83,7 +83,7 @@
private ReplicationBroker ds2;
private ReplicationBroker ds3;
private ReplicationServer rs1;
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private final int initWindow = 100;
@@ -193,7 +193,7 @@
/**
* Creates and starts a new ReplicationDomain configured for the replication
- * server
+ * server.
*/
@SuppressWarnings("unchecked")
private LDAPReplicationDomain createReplicationDomain(int dsId) throws Exception
@@ -218,7 +218,7 @@
/**
* Create and connect a replication broker to the replication server with the
- * given state and generation id
+ * given state and generation id.
*/
private ReplicationBroker createReplicationBroker(int dsId,
ServerState state, long generationId) throws Exception
@@ -284,7 +284,7 @@
}
}
- /** Returns various init values for test testStateMachineStatusAnalyzer */
+ /** Returns various init values for test testStateMachineStatusAnalyzer. */
@DataProvider(name="stateMachineStatusAnalyzerTestProvider")
public Object [][] stateMachineStatusAnalyzerTestProvider() throws Exception
{
@@ -714,7 +714,7 @@
/**
* Sends a reset genid message through the given replication broker, with the
- * given new generation id
+ * given new generation id.
*/
private void resetGenId(ReplicationBroker rb, long newGenId)
{
@@ -762,7 +762,7 @@
}
/**
- * Initializes a full update session by sending InitializeTargetMsg
+ * Initializes a full update session by sending InitializeTargetMsg.
*/
public void initFullUpdate(int destId, long nEntries)
{
@@ -975,7 +975,7 @@
}
/**
- * Stops the writer thread
+ * Stops the writer thread.
*/
public void shutdown()
{
@@ -1001,7 +1001,7 @@
}
/**
- * Suspends the writer thread
+ * Suspends the writer thread.
*/
public void pause()
{
@@ -1016,7 +1016,7 @@
}
/**
- * Test if the writer is suspended
+ * Test if the writer is suspended.
*/
public boolean isPaused()
{
@@ -1024,7 +1024,7 @@
}
/**
- * Resumes the writer thread until it is paused
+ * Resumes the writer thread until it is paused.
*/
public void follow()
{
@@ -1124,7 +1124,7 @@
start();
}
- /** Loop reading and throwing update messages */
+ /** Loop reading and throwing update messages. */
@Override
public void run()
{
@@ -1147,8 +1147,7 @@
}
/**
- * Returns last received message from reader When read, last value is
- * cleared
+ * Returns last received message from reader When read, last value is cleared.
*/
public ReplicationMsg getLastMsg()
{
@@ -1157,7 +1156,7 @@
return toReturn;
}
- /** Stops reader thread */
+ /** Stops reader thread. */
public void shutdown()
{
shutdown = true;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
index 321df30..21b6960 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -57,7 +57,7 @@
*/
public class TopologyViewTest extends ReplicationTestCase
{
- /** Server id definitions */
+ /** Server id definitions. */
private static final int DS1_ID = 1;
private static final int DS2_ID = 2;
private static final int DS3_ID = 3;
@@ -68,7 +68,7 @@
private static final int RS2_ID = 52;
private static final int RS3_ID = 53;
- /** Group id definitions */
+ /** Group id definitions. */
private static final int DS1_GID = 1;
private static final int DS2_GID = 1;
private static final int DS3_GID = 2;
@@ -79,7 +79,7 @@
private static final int RS2_GID = 2;
private static final int RS3_GID = 3;
- /** Assured conf definitions */
+ /** Assured conf definitions. */
private static final AssuredType DS1_AT = AssuredType.NOT_ASSURED;
private static final int DS1_SDL = -1;
private static SortedSet<String> DS1_RU = new TreeSet<String>();
@@ -136,7 +136,7 @@
private ReplicationServer rs2;
private ReplicationServer rs3;
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private void debugInfo(String s)
@@ -372,7 +372,7 @@
/**
* Creates and starts a new ReplicationDomain with the correct list of
- * know RSs according to DS id
+ * know RSs according to DS id.
*/
private LDAPReplicationDomain createReplicationDomain(int dsId)
throws Exception
@@ -456,7 +456,7 @@
return replicationDomain;
}
- /** Definitions of steps for the test case */
+ /** Definitions of steps for the test case. */
private static final int STEP_1 = 1;
private static final int STEP_2 = 2;
private static final int STEP_3 = 3;
@@ -736,7 +736,7 @@
}
/**
- * Creates RSInfo for the passed RS
+ * Creates RSInfo for the passed RS.
*/
private RSInfo createRSInfo(int rsId)
{
@@ -764,7 +764,7 @@
}
/**
- * Creates DSInfo for the passed DS, connected to the passed RS
+ * Creates DSInfo for the passed DS, connected to the passed RS.
*/
private DSInfo createDSInfo(int dsId, int rsId)
{
@@ -831,7 +831,7 @@
/**
* Creates the topo view to be checked at each step of the test (view that
- * every concerned DS should have)
+ * every concerned DS should have).
*/
private TopoView createTheoreticalTopoViewForStep(int step)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java
index bc1e5b7..a930bc2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -36,7 +36,7 @@
import static org.testng.Assert.*;
/**
- * Test of ValueInfo
+ * Test of ValueInfo.
*/
@SuppressWarnings("javadoc")
public class ValueInfoTest extends ReplicationTestCase
@@ -67,7 +67,7 @@
}
/**
- * Create a ValueInfo and check the methods
+ * Create a ValueInfo and check the methods.
*/
@Test(dataProvider = "valueInfo")
public void valueInfo(ByteString value, CSN csnUpdate, CSN csnDelete) throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index b133d1c..7575201 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -55,7 +55,7 @@
/**
* Test the constructors, encoders and decoders of the replication protocol
- * PDUs classes (message classes)
+ * PDUs classes (message classes).
*/
@SuppressWarnings("javadoc")
public class SynchronizationMsgTest extends ReplicationTestCase
@@ -918,7 +918,7 @@
}
/**
- * Provider for the ChangeStatusMsg test
+ * Provider for the ChangeStatusMsg test.
*/
@DataProvider(name = "createChangeStatusData")
public Object[][] createChangeStatusData()
@@ -1084,7 +1084,7 @@
}
/**
- * Test that InitializeRequestMsg encoding and decoding works
+ * Test that InitializeRequestMsg encoding and decoding works.
*/
@Test
public void initializeRequestMsgTest() throws Exception
@@ -1100,7 +1100,7 @@
}
/**
- * Test that InitializeTargetMsg encoding and decoding works
+ * Test that InitializeTargetMsg encoding and decoding works.
*/
@Test
public void initializeTargetMsgTest() throws Exception
@@ -1128,7 +1128,7 @@
}
/**
- * Test that DoneMsg encoding and decoding works
+ * Test that DoneMsg encoding and decoding works.
*/
@Test
public void doneMsgTest() throws Exception
@@ -1140,7 +1140,7 @@
}
/**
- * Test that ErrorMsg encoding and decoding works
+ * Test that ErrorMsg encoding and decoding works.
*/
@Test
public void errorMsgTest() throws Exception
@@ -1154,7 +1154,7 @@
}
/**
- * Test Generic UpdateMsg
+ * Test Generic UpdateMsg.
*/
@Test
public void UpdateMsgTest() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
index f00e927..4604541 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -71,7 +71,7 @@
{
private String testName = this.getClass().getSimpleName();
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private int[] rsPorts;
private static final int FDS1_ID = 1;
@@ -109,67 +109,67 @@
/**
* Small assured timeout value (timeout to be used in first RS receiving an
- * assured update from a DS)
+ * assured update from a DS).
*/
private static final int SMALL_TIMEOUT = 3000;
/**
* Long assured timeout value (timeout to use in DS when sending an assured
- * update)
+ * update).
*/
private static final int LONG_TIMEOUT = 5000;
/**
* Expected max time for sending an assured update and receive its ack
- * (without errors)
+ * (without errors).
*/
private static final int MAX_SEND_UPDATE_TIME = 2000;
- /** Default group id */
+ /** Default group id. */
private static final int DEFAULT_GID = 1;
- /** Other group ids */
+ /** Other group ids. */
private static final int OTHER_GID = 2;
private static final int OTHER_GID_BIS = 3;
- /** Default generation id */
+ /** Default generation id. */
private static final long DEFAULT_GENID = EMPTY_DN_GENID;
- /** Other generation id */
+ /** Other generation id. */
private static final long OTHER_GENID = 500L;
/*
* Definitions for the scenario of the fake DS
*/
- /** DS receives updates and replies acks with no errors to every updates */
+ /** DS receives updates and replies acks with no errors to every updates. */
private static final int REPLY_OK_DS_SCENARIO = 1;
- /** DS receives updates but does not respond (makes timeouts) */
+ /** DS receives updates but does not respond (makes timeouts). */
private static final int TIMEOUT_DS_SCENARIO = 2;
- /** DS receives updates and replies ack with replay error flags */
+ /** DS receives updates and replies ack with replay error flags. */
private static final int REPLAY_ERROR_DS_SCENARIO = 3;
/*
* Definitions for the scenario of the fake RS
*/
- /** RS receives updates and replies acks with no errors to every updates */
+ /** RS receives updates and replies acks with no errors to every updates. */
private static final int REPLY_OK_RS_SCENARIO = 11;
- /** RS receives updates but does not respond (makes timeouts) */
+ /** RS receives updates but does not respond (makes timeouts). */
private static final int TIMEOUT_RS_SCENARIO = 12;
/**
* RS is used for sending updates (with sendNewFakeUpdate()) and receive acks,
- * synchronously
+ * synchronously.
*/
private static final int SENDER_RS_SCENARIO = 13;
// Scenarios only used in safe read tests:
/**
* RS receives updates and replies ack error as if a DS was connected to it
- * and timed out
+ * and timed out.
*/
private static final int DS_TIMEOUT_RS_SCENARIO_SAFE_READ = 14;
/**
* RS receives updates and replies ack error as if a DS was connected to it
- * and was wrong status
+ * and was wrong status.
*/
private static final int DS_WRONG_STATUS_RS_SCENARIO_SAFE_READ = 15;
/**
* RS receives updates and replies ack error as if a DS was connected to it
- * and had a replay error
+ * and had a replay error.
*/
private static final int DS_REPLAY_ERROR_RS_SCENARIO_SAFE_READ = 16;
@@ -183,7 +183,7 @@
}
/**
- * Before starting the tests configure some stuff
+ * Before starting the tests configure some stuff.
*/
@BeforeClass
@Override
@@ -235,7 +235,7 @@
/**
* Creates and connects a new fake replication domain, using the passed scenario
- * (no server state constructor version)
+ * (no server state constructor version).
*/
private FakeReplicationDomain createFakeReplicationDomain(int serverId,
int groupId, int rsId, long generationId, AssuredMode assuredMode,
@@ -444,12 +444,12 @@
*/
private class FakeReplicationDomain extends ReplicationDomain
{
- /** The scenario this DS is expecting */
+ /** The scenario this DS is expecting. */
private final int scenario;
private final CSNGenerator gen;
- /** Number of received updates */
+ /** Number of received updates. */
private int nReceivedUpdates;
private int nWrongReceivedUpdates;
@@ -534,7 +534,7 @@
}
/**
- * Check that received update assured parameters are as defined at DS start
+ * Check that received update assured parameters are as defined at DS start.
*/
private void checkUpdateAssuredParameters(UpdateMsg updateMsg)
{
@@ -566,7 +566,7 @@
}
/**
- * Sends a new update from this DS
+ * Sends a new update from this DS.
* @throws TimeoutException If timeout waiting for an assured ack
*/
private void sendNewFakeUpdate() throws TimeoutException
@@ -712,34 +712,37 @@
private boolean shutdown;
private Session session;
- /** Parameters given at constructor time */
+ /** Parameters given at constructor time. */
private int port;
private int serverId = -1;
- private boolean isAssured; // Default value for config
- private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE; // Default value for config
- private byte safeDataLevel = 1; // Default value for config
+ /** Default value for config. */
+ private boolean isAssured;
+ /** Default value for config. */
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ /** Default value for config. */
+ private byte safeDataLevel = 1;
private DN baseDN;
private long generationId = -1L;
private byte groupId = -1;
private boolean sslEncryption;
- /** The scenario this RS is expecting */
+ /** The scenario this RS is expecting. */
private int scenario = -1;
private CSNGenerator gen;
- /** False if a received update had assured parameters not as expected */
+ /** False if a received update had assured parameters not as expected. */
private boolean everyUpdatesAreOk = true;
- /** Number of received updates */
+ /** Number of received updates. */
private int nReceivedUpdates;
/**
* True if an ack has been replied to a received assured update (in assured
- * mode of course) used in reply scenario
+ * mode of course) used in reply scenario.
*/
private boolean ackReplied;
/**
- * Creates a fake replication server
+ * Creates a fake replication server.
* @param port port of the real RS we will connect to
* @param serverId our server id
* @param assured do we expect incoming assured updates (also used for outgoing updates)
@@ -767,7 +770,7 @@
/**
* Make the RS send an assured message and return the ack message it
- * receives from the RS
+ * receives from the RS.
*/
public AckMsg sendNewFakeUpdate() throws Exception
{
@@ -793,7 +796,7 @@
}
/**
- * Connect to RS
+ * Connect to RS.
*/
public void connect(ServerState serverState) throws Exception
{
@@ -856,7 +859,7 @@
}
/**
- * Wait for DS connections
+ * Wait for DS connections.
*/
@Override
public void run()
@@ -976,7 +979,7 @@
}
/**
- * Check that received update assured parameters are as defined at RS start
+ * Check that received update assured parameters are as defined at RS start.
*/
private void checkUpdateAssuredParameters(UpdateMsg updateMsg)
{
@@ -1052,7 +1055,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataLevelOne test
+ * Returns possible combinations of parameters for testSafeDataLevelOne test.
*/
@DataProvider(name = "testSafeDataLevelOneProvider")
private Object[][] testSafeDataLevelOneProvider()
@@ -1210,7 +1213,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataLevelHighPrecommit test
+ * Returns possible combinations of parameters for testSafeDataLevelHighPrecommit test.
*/
@DataProvider(name = "testSafeDataLevelHighPrecommitProvider")
private Object[][] testSafeDataLevelHighPrecommitProvider()
@@ -1244,7 +1247,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataLevelHighNightly test
+ * Returns possible combinations of parameters for testSafeDataLevelHighNightly test.
*/
@DataProvider(name = "testSafeDataLevelHighNightlyProvider")
private Object[][] testSafeDataLevelHighNightlyProvider()
@@ -1297,7 +1300,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataLevelHigh test
+ * Returns possible combinations of parameters for testSafeDataLevelHigh test.
*/
@DataProvider(name = "testSafeDataLevelHighProvider")
private Object[][] testSafeDataLevelHighProvider()
@@ -1645,7 +1648,7 @@
/**
* Check the time the sending of the safe data assured update took and the monitoring
- * values according to the test configuration
+ * values according to the test configuration.
*/
private void checkTimeAndMonitoringSafeData(int nSentUpdates, int prevNAckUpdates, int prevNTimeoutUpdates, Map<Integer,Integer> prevNServerErrors, long sendUpdateTime,
int nWishedServers, List<Integer> eligibleServers, List<Integer> expectedServers)
@@ -1853,7 +1856,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataFromRS test
+ * Returns possible combinations of parameters for testSafeDataFromRS test.
*/
@DataProvider(name = "testSafeDataFromRSProvider")
private Object[][] testSafeDataFromRSProvider()
@@ -1886,7 +1889,7 @@
/**
* Test that the RS is acking or not acking a safe data update sent from another
- * (fake) RS according to passed parameters
+ * (fake) RS according to passed parameters.
*/
@Test(dataProvider = "testSafeDataFromRSProvider", groups = "slow", enabled = true)
public void testSafeDataFromRS(int sdLevel, int fakeRsGid, long fakeRsGenId, boolean sendInAssured) throws Exception
@@ -1968,7 +1971,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeDataManyRealRSs test
+ * Returns possible combinations of parameters for testSafeDataManyRealRSs test.
*/
@DataProvider(name = "testSafeDataManyRealRSsProvider")
private Object[][] testSafeDataManyRealRSsProvider()
@@ -2218,7 +2221,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeReadOneRSComplexPrecommit test
+ * Returns possible combinations of parameters for testSafeReadOneRSComplexPrecommit test.
*/
@DataProvider(name = "testSafeReadOneRSComplexPrecommitProvider")
private Object[][] testSafeReadOneRSComplexPrecommitProvider()
@@ -2249,7 +2252,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeReadOneRSComplex test
+ * Returns possible combinations of parameters for testSafeReadOneRSComplex test.
*/
@DataProvider(name = "testSafeReadOneRSComplexProvider")
private Object[][] testSafeReadOneRSComplexProvider()
@@ -2722,7 +2725,7 @@
}
}
- /** Helper method for some safe read test methods */
+ /** Helper method for some safe read test methods. */
private void checkDSReceivedAndAcked(FakeReplicationDomain fakeRd, int nPacket)
{
fakeRd.newSafeReadAssertions()
@@ -2731,7 +2734,7 @@
.runAsserts();
}
- /** Helper method for some safe read test methods */
+ /** Helper method for some safe read test methods. */
private void checkDSSentAndAcked(FakeReplicationDomain fakeRd, int nPacket)
{
fakeRd.newSafeReadAssertions()
@@ -2832,7 +2835,7 @@
}
/**
- * Returns possible combinations of parameters for testSafeReadTwoRSsProvider test
+ * Returns possible combinations of parameters for testSafeReadTwoRSsProvider test.
*/
@DataProvider(name = "testSafeReadTwoRSsProvider")
private Object[][] testSafeReadTwoRSsProvider()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
index 7bdc071..7c1e268 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
@@ -58,7 +58,7 @@
@SuppressWarnings("javadoc")
public class MonitorTest extends ReplicationTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final String baseDnStr = TEST_ROOT_DN_STRING;
@@ -220,7 +220,7 @@
}
/**
- * Disconnect DS from the replicationServer
+ * Disconnect DS from the replicationServer.
*/
private void disconnectFromReplServer() throws Exception
{
@@ -385,7 +385,7 @@
}
/**
- * Disconnect broker and remove entries from the local DB
+ * Disconnect broker and remove entries from the local DB.
*/
private void postTest() throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
index e7ecb31..1482746 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -75,7 +75,7 @@
private final ReplicationDBImplementation dbImpl;
/**
- * Constructor without group id, assured info and weight
+ * Constructor without group id, assured info and weight.
*/
public ReplServerFakeConfiguration(
int port, String dirName, ReplicationDBImplementation dbImpl, int purgeDelay,
@@ -118,7 +118,7 @@
}
/**
- * Constructor with group id and assured info
+ * Constructor with group id and assured info.
*/
public ReplServerFakeConfiguration(
int port, String dirName, ReplicationDBImplementation dbImpl, int purgeDelay,
@@ -132,7 +132,7 @@
}
/**
- * Constructor with group id, assured info and weight
+ * Constructor with group id, assured info and weight.
*/
public ReplServerFakeConfiguration(
int port, String dirName, ReplicationDBImplementation dbImpl, int purgeDelay,
@@ -144,9 +144,7 @@
this.weight = weight;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void addChangeListener(
ConfigurationChangeListener<ReplicationServerCfg> listener)
@@ -154,87 +152,67 @@
// not supported
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Class<? extends ReplicationServerCfg> configurationClass()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getReplicationDBDirectory()
{
return dirName;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getReplicationPort()
{
return port;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public long getReplicationPurgeDelay()
{
return purgeDelay;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public SortedSet<String> getReplicationServer()
{
return servers;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getReplicationServerId()
{
return serverId;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public InetAddress getSourceAddress() { return null; }
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getQueueSize()
{
return queueSize;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int getWindowSize()
{
return windowSize;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void removeChangeListener(
ConfigurationChangeListener<ReplicationServerCfg> listener)
@@ -242,18 +220,14 @@
// not supported
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DN dn()
{
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ServerManagedObject<? extends Configuration> managedObject() {
return null;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
index 554a56f..c3a47fd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
@@ -36,7 +36,7 @@
import static org.testng.Assert.*;
/**
- * Tests that we can dynamically modify the configuration of replicationServer
+ * Tests that we can dynamically modify the configuration of replicationServer.
*/
@SuppressWarnings("javadoc")
public class ReplicationServerDynamicConfTest extends ReplicationTestCase
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
index 0a3115f..093f6cf 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
@@ -67,16 +67,14 @@
@SuppressWarnings("javadoc")
public class ReplicationServerTest extends ReplicationTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private DN TEST_ROOT_DN;
private DN EXAMPLE_DN;
/** The replicationServer that will be used in this test. */
private ReplicationServer replicationServer;
- /**
- * The port of the replicationServer.
- */
+ /** The port of the replicationServer. */
private int replicationServerPort;
private CSN firstCSNServer1;
@@ -383,7 +381,7 @@
/**
* Test that a client that has already seen the first change now see the
- * second change
+ * second change.
*/
private void newClientWithFirstChanges() throws Exception
{
@@ -411,7 +409,7 @@
/**
* Test that a client that has already seen the first change from server 1
- * now see the first change from server 2
+ * now see the first change from server 2.
*/
private void newClientWithChangefromServer1() throws Exception
{
@@ -423,7 +421,7 @@
/**
* Test that a client that has already seen the first chaneg from server 2
- * now see the first change from server 1
+ * now see the first change from server 1.
*/
private void newClientWithChangefromServer2() throws Exception
{
@@ -640,7 +638,7 @@
* <li>Create and connect client 2 to replication server 2</li>
* <li>Make client1 publish changes</li>
* <li>Check that client 2 receives the changes published by client 1</li>
- * </ol>
+ * </ol>.
*/
@Test(enabled = true)
public void changelogChaining0() throws Exception
@@ -738,7 +736,7 @@
* <li>Create replication server 2 connected with replication server 1</li>
* <li>Create and connect client 2 to replication server 2</li>
* <li>Check that client 2 receives the changes published by client 1</li>
- * <ol>
+ * <ol>.
*/
@Test(enabled = true)
public void changelogChaining1() throws Exception
@@ -991,7 +989,7 @@
private String errDetails;
/**
- * Creates a new Stress Test Reader
+ * Creates a new Stress Test Reader.
*/
public BrokerReader(ReplicationBroker broker, int numMsgExpected)
{
@@ -999,9 +997,7 @@
this.numMsgExpected = numMsgExpected;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -1063,9 +1059,7 @@
this.gen = gen;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void run()
{
@@ -1105,7 +1099,7 @@
* - Change the config of replication server 1 to no more be connected
* to server 2
* - Make client 1 publish a change
- * - Check that client 2 does not receive the change
+ * - Check that client 2 does not receive the change.
*/
@Test(enabled = true, groups = "opendj-256")
public void replicationServerConnected() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
index 15f24e6..39482c7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.file;
@@ -61,7 +61,7 @@
import static org.testng.Assert.*;
/**
- * Test the FileReplicaDB class
+ * Test the FileReplicaDB class.
*/
@SuppressWarnings("javadoc")
public class FileReplicaDBTest extends ReplicationTestCase
@@ -263,10 +263,12 @@
}
}
- // TODO : this works only if we ensure that there is a rotation of ahead log file
- // at right place. Each record takes 54 bytes, so it means : 108 < max file size < 162 to have
- // the last record alone in the ahead log file
- // Re-enable this test when max file size is customizable for log
+ /**
+ * TODO : this works only if we ensure that there is a rotation of ahead log file
+ * at right place. Each record takes 54 bytes, so it means : 108 < max file size < 162 to have
+ * the last record alone in the ahead log file
+ * Re-enable this test when max file size is customizable for log
+ */
@Test(enabled=false)
public void testPurge() throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java
index b3dab49..530f1e5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
@@ -52,7 +52,7 @@
@Test(sequential=true)
public class LogTest extends DirectoryServerTestCase
{
- // Use a directory dedicated to this test class
+ /** Use a directory dedicated to this test class. */
private static final File LOG_DIRECTORY = new File(TestCaseUtils.getUnitTestRootPath(), "changelog-unit");
private static final long NO_TIME_BASED_LOG_ROTATION = 0;
@@ -472,7 +472,7 @@
}
}
- // TODO : Should be re-enabled once the issue with robot functional test replication/totalupdate.txt is solved
+ /** TODO : Should be re-enabled once the issue with robot functional test replication/totalupdate.txt is solved */
@Test(enabled=false, expectedExceptions=ChangelogException.class)
public void testClearWhenCursorIsOpened() throws Exception
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
index 1295cac..7495322 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
@@ -63,12 +63,12 @@
import static org.testng.Assert.*;
/**
- * Test the JEReplicaDB class
+ * Test the JEReplicaDB class.
*/
@SuppressWarnings("javadoc")
public class JEReplicaDBTest extends ReplicationTestCase
{
- /** The tracer object for the debug logger */
+ /** The tracer object for the debug logger. */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private DN TEST_ROOT_DN;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java
index 71c9751..72d88a1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.service;
@@ -136,7 +136,7 @@
/**
* Test with one replication server, only replication server has a non null
- * CSN for ds server id
+ * CSN for ds server id.
*/
@Test
public void testNullCSNDS() throws Exception
@@ -283,7 +283,7 @@
Assertions.assertThat(evaluations).hasSize(entries.length);
}
- /** Contains ordinal for each message */
+ /** Contains ordinal for each message. */
private Map<Integer, Integer> getOrdinal(Map<Integer, LocalizableMessage> evaluations)
{
final Map<Integer, Integer> result = new LinkedHashMap<Integer, Integer>();
@@ -482,7 +482,7 @@
}
/**
- * Test with 3 replication servers (see data provider)
+ * Test with 3 replication servers (see data provider).
*/
@Test(dataProvider = "create3ServersData")
public void test3Servers(
@@ -584,7 +584,7 @@
}
/**
- * Test with 3 replication servers (see data provider)
+ * Test with 3 replication servers (see data provider).
*/
@Test(dataProvider = "test3ServersMoreCriteria")
public void test3ServersMoreCriteria(
@@ -1303,7 +1303,7 @@
}
/**
- * Test the method that chooses the best RS using the RS weights
+ * Test the method that chooses the best RS using the RS weights.
*/
@Test(dataProvider = "testComputeBestServerForWeightProvider")
public void testComputeBestServerForWeight(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
index db50a47..b6fec1d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -537,7 +537,7 @@
}
/**
- * See comments in senderInitialize() above
+ * See comments in senderInitialize() above.
*/
@Test(enabled=false)
public void receiverInitialize() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
index f222740..f5a4dbd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -51,18 +51,14 @@
public class AttributeTypeSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new AttributeTypeSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
index fe4437a..3912a1b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -40,18 +40,14 @@
public class BitStringSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new BitStringSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
@@ -66,9 +62,7 @@
};
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@Test(dataProvider= "acceptableValues")
public void testAcceptableValues(String value, Boolean result) throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
index df6c3eb..5202bff 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -42,9 +42,7 @@
public class CertificateSyntaxTest extends BinaryAttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax<?> getRule()
{
@@ -56,8 +54,6 @@
return null;
}
-
-
public void removeChangeListener(
ConfigurationChangeListener<AttributeSyntaxCfg> listener)
{
@@ -133,9 +129,7 @@
return syntax;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
index 8e66ced..09a90cb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
* Portions Copyright 2012 Manuel Gaupp
*/
package org.opends.server.schema;
@@ -42,9 +42,7 @@
public class CountryStringSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
@@ -132,9 +130,7 @@
return syntax;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
index 639e7e9..94c2ff2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,9 +35,7 @@
public class DITContentRuleSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java
index d18c6b9..837a4a7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -79,7 +79,7 @@
}
/**
- * Test the normalization and the comparison in the warning mode
+ * Test the normalization and the comparison in the warning mode.
*/
@Test(dataProvider= "warnmodeEqualityMatchingRule")
public void warnmodeEqualityMatchingRules(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
index edaa998..a20ec54 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -43,9 +44,7 @@
public class GeneralizedTimeSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java
index deedf84..ad7c436 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class GuideSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new GuideSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java
index 0466f6b..5ffca1f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class IA5StringSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new IA5StringSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java
index 7a4ad78..ede417b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS
+ * Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,18 +34,14 @@
public class IntegerSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new IntegerSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
index 51febe9..af394d2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -42,9 +42,7 @@
public class JPEGSyntaxTest extends BinaryAttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax<?> getRule()
{
@@ -132,9 +130,7 @@
return syntax;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java
index 5a292ef..5edc571 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class MatchingRuleSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new MatchingRuleSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
index 8ce00f6..eb4cb15 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class MatchingRuleUseSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new MatchingRuleUseSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java
index 3326ccd..3be074b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class OtherMailboxSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new OtherMailboxSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java
index 9a17501..591bcc0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class TelexSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new TelexNumberSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 31746d3..fccb067 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -58,7 +58,7 @@
public final class TimeBasedMatchingRuleTest
extends SchemaTestCase
{
- //User DNs to be used in tests.
+ /** User DNs to be used in tests. */
private DN user1;
private DN user2;
private DN user3;
@@ -91,7 +91,7 @@
user5 = DN.valueOf("cn=user5,dc=example,dc=com");
user6 = DN.valueOf("cn=user6,dc=example,dc=com");
- /**
+ /*
Extend the schema and add an attribute which is based on
generalizedTimeSyntax. Since all the existing attributes based
on that syntax are read-only, let us create a new attribute and
@@ -407,7 +407,7 @@
};
}
- // validate if the args are found in the entries list.
+ /** Validate if the args are found in the entries list. */
private boolean dnFoundInEntryList(List<SearchResultEntry> entries, DN... dns)
{
for (DN dn : dns)
@@ -429,7 +429,7 @@
return false;
}
- //Creates the entries.
+ /** Creates the entries. */
private void populateEntries() throws Exception
{
//Get the current time from the TimeThread. Using the current time from new
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
index c1de20e..d27beff 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
@@ -44,9 +44,7 @@
public class UTCTimeSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java
index 8f90009..8bd77b0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -34,18 +35,14 @@
public class UUIDSyntaxTest extends AttributeSyntaxTest
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeSyntax getRule()
{
return new UUIDSyntax();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java
index 614dd36..3424c13 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tasks;
-
-
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
@@ -38,8 +36,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
-
-
/**
* This class provides an implementation of a Directory Server task always
* completes successfully. It is intended only for testing purposes.
@@ -47,24 +43,22 @@
public class DummyTask
extends Task
{
- // The length of time that the task should sleep before completing.
+ /** The length of time that the task should sleep before completing. */
private long sleepTime;
- // The task state to use when interrupting the task. This will be
- // null unless the task gets interrupted.
+ /**
+ * The task state to use when interrupting the task. This will be
+ * null unless the task gets interrupted.
+ */
private volatile TaskState interruptedState;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getDisplayName() {
return LocalizableMessage.raw("Dummy");
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void initializeTask()
throws DirectoryException
@@ -92,9 +86,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected TaskState runTask()
{
long stopTime = System.currentTimeMillis() + sleepTime;
@@ -119,9 +111,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isInterruptable()
{
@@ -130,9 +120,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void interruptTask(TaskState taskState, LocalizableMessage interruptMessage)
{
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 52c2b51..ccad90a 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
@@ -22,9 +22,8 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.tasks;
import org.opends.server.tools.makeldif.EntryWriter;
@@ -127,9 +126,7 @@
template.generateLDIF(new LdifFileWriter(ldifWriter));
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public boolean writeEntry(TemplateEntry entry)
throws IOException, MakeLDIFException
{
@@ -143,9 +140,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void closeEntryWriter()
{
try
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
index fdfb825..9de90f8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
@@ -50,13 +50,13 @@
public class EncodePasswordTestCase
extends ToolsTestCase
{
- // The path to the Directory Server configuration file.
+ /** The path to the Directory Server configuration file. */
private String configFilePath;
- // The path to the temporary file containing a clear-text password.
+ /** The path to the temporary file containing a clear-text password. */
private String passwordFilePath;
- // The path to the temporary file containing an encoded password.
+ /** The path to the temporary file containing an encoded password. */
private String encodedPasswordFilePath;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
index 06dc125..4513154 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
@@ -52,7 +52,7 @@
public class LDAPCompareTestCase
extends ToolsTestCase
{
- // The path to a file containing a valid bind password.
+ /** The path to a file containing a valid bind password. */
private String validPasswordFile;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
index eca1876..5c01612 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -46,10 +46,10 @@
public class LDAPDeleteTestCase
extends ToolsTestCase
{
- // The path to a file containing an invalid bind password.
+ /** The path to a file containing an invalid bind password. */
private String invalidPasswordFile;
- // The path to a file containing a valid bind password.
+ /** The path to a file containing a valid bind password. */
private String validPasswordFile;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index 56a9a50..2c9d32c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -51,10 +51,10 @@
public class LDAPPasswordModifyTestCase
extends ToolsTestCase
{
- // The path to a file containing the current bind password.
+ /** The path to a file containing the current bind password. */
private String currentPasswordFile;
- // The path to a file containing the new password.
+ /** The path to a file containing the new password. */
private String newPasswordFile;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
index a7f5b49..9c9fccb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
@@ -49,8 +49,10 @@
public class LDIFDiffTestCase
extends ToolsTestCase
{
- // The path to the file that will be used if there are no differences between
- // the source and target LDIF data sets.
+ /**
+ * The path to the file that will be used if there are no differences between
+ * the source and target LDIF data sets.
+ */
private String noDiffsFile =
System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT) + File.separator +
"tests" + File.separator + "unit-tests-testng" + File.separator +
@@ -73,9 +75,7 @@
}
- /**
- * Calculates the checksum of a file
- */
+ /** Calculates the checksum of a file. */
private long calcChecksum(String filename) throws Exception
{
return calcChecksum(new File(filename));
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
index 106fafb..3adf612 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
@@ -47,7 +47,7 @@
public class ListBackendsTestCase
extends ToolsTestCase
{
- // The path to the Directory Server configuration file.
+ /** The path to the Directory Server configuration file. */
private String configFilePath;
@@ -336,7 +336,7 @@
/**
* Tests the ListBackends tool with one instance of the --baseDN argument
- * and a valid DN that is not associated with any backend in the server
+ * and a valid DN that is not associated with any backend in the server.
*/
@Test
public void testSingleBaseDNNotBelowAnyBaseDN()
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
index 345beea..2ffb30d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
@@ -48,7 +48,7 @@
/**
- * A set of test cases for the rebuild-index tool (see issue #1897)
+ * A set of test cases for the rebuild-index tool (see issue #1897).
*/
public class RebuildIndexTestCase
extends ToolsTestCase
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
index daae8ec..df4d3e2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
@@ -48,7 +48,7 @@
/**
- * A set of test cases for the verify-index tool (see issue #1897)
+ * A set of test cases for the verify-index tool (see issue #1897).
*/
public class VerifyIndexTestCase
extends ToolsTestCase
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
index 0c322c1..2688d60 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
@@ -44,10 +44,10 @@
* A set of test cases for the DS service tool.
*/
public class DsconfigLdapConnectionTestCase extends DirectoryServerTestCase {
- // The path to a file containing an invalid bind password.
+ /** The path to a file containing an invalid bind password. */
private String invalidPasswordFile;
- // The path to a file containing a valid bind password.
+ /** The path to a file containing a valid bind password. */
private String validPasswordFile;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index 036dc98..411a2b9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -153,7 +153,7 @@
}
/**
- * Test for parsing escaped character in templates
+ * Test for parsing escaped character in templates.
*/
@Test(dataProvider = "validTemplates")
public void testParsingEscapeCharInTemplate(String testName, String[] lines)
@@ -312,7 +312,7 @@
}
/**
- * Test for escaped characters in templates, check LDIF output
+ * Test for escaped characters in templates, check LDIF output.
*/
@Test(dataProvider="templatesToTestLDIFOutput", dependsOnMethods = { "testParsingEscapeCharInTemplate"})
public void testLDIFOutputFromTemplate(String testName, String[] lines,
@@ -342,7 +342,7 @@
/**
* Test for escaped characters in templates, check LDIF output when
- * the templates combines escaped characters and variables
+ * the templates combines escaped characters and variables.
*/
@Test(dependsOnMethods = { "testParsingEscapeCharInTemplate"})
public void testOutputCombineEscapeCharInTemplate() throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java b/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java
index 18d51ec..395638c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java
@@ -114,7 +114,7 @@
Assert.assertEquals(regenerated, expectedToStringFilter, "original=" + originalFilter + ", expected=" + expectedToStringFilter);
}
- // These are valid filters.
+ /** These are valid filters. */
@DataProvider(name = "escapeSequenceFilters")
public Object[][] escapeSequenceFilters() {
final char[] CHAR_NIBBLES = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
@@ -172,7 +172,7 @@
}
- // These are filters with invalid escape sequences.
+ /** These are filters with invalid escape sequences. */
@DataProvider(name = "invalidEscapeSequenceFilters")
public Object[][] invalidEscapeSequenceFilters() {
final char[] VALID_NIBBLES = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
@@ -267,10 +267,7 @@
//
// -------------------------------------------------------------------------
- //
- // Invalid filters that are detected.
- //
-
+ /** Invalid filters that are detected. */
@DataProvider(name = "invalidFilters")
public Object[][] invalidFilters() {
return new Object[][]{
@@ -300,14 +297,13 @@
SearchFilter.createFilterFromString(invalidFilter).toString();
}
- //
- // This is more or less the same as what's above, but it's for invalid
- // filters that are not currently detected by the parser. To turn these
- // on, remove them from the broken group. As the code is modified to handle
- // these cases, please add these test cases to the
- // paramsCreateFilterFromStringInvalidFilters DataProvider.
- //
-
+ /**
+ * This is more or less the same as what's above, but it's for invalid
+ * filters that are not currently detected by the parser. To turn these
+ * on, remove them from the broken group. As the code is modified to handle
+ * these cases, please add these test cases to the
+ * paramsCreateFilterFromStringInvalidFilters DataProvider.
+ */
@DataProvider(name = "uncaughtInvalidFilters")
public Object[][] paramsCreateFilterFromStringUncaughtInvalidFilters() {
return new Object[][]{
@@ -1045,7 +1041,7 @@
/**
- * Dataprovider for testing different normalization for value and assertion
+ * Dataprovider for testing different normalization for value and assertion.
*/
@DataProvider(name = "differentNormalization")
public Object[][] differentNormalizationData() throws ParseException
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java
index 3b5ec26..37775ed 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -50,44 +50,39 @@
*/
private static final class AttributeTypeBuilder extends
SchemaDefinitionBuilder<AttributeType> {
- // The superior attribute type from which this attribute type
- // inherits.
+ /** The superior attribute type from which this attribute type inherits. */
private AttributeType superiorType;
- // The syntax for this attribute type.
+ /** The syntax for this attribute type. */
private AttributeSyntax syntax;
- // The approximate matching rule for this attribute type.
+ /** The approximate matching rule for this attribute type. */
private MatchingRule approximateMatchingRule;
-
- // The equality matching rule for this attribute type.
+ /** The equality matching rule for this attribute type. */
private MatchingRule equalityMatchingRule;
-
- // The ordering matching rule for this attribute type.
+ /** The ordering matching rule for this attribute type. */
private MatchingRule orderingMatchingRule;
-
- // The substring matching rule for this attribute type.
+ /** The substring matching rule for this attribute type. */
private MatchingRule substringMatchingRule;
- // The attribute usage for this attribute type.
+ /** The attribute usage for this attribute type. */
private AttributeUsage attributeUsage;
- // Indicates whether this attribute type is declared "collective".
+ /** Indicates whether this attribute type is declared "collective". */
private boolean isCollective;
- // Indicates whether this attribute type is declared
- // "no-user-modification".
+ /**
+ * Indicates whether this attribute type is declared "no-user-modification".
+ */
private boolean isNoUserModification;
-
- // Indicates whether this attribute type is declared
- // "single-value".
+ /**
+ * Indicates whether this attribute type is declared "single-value".
+ */
private boolean isSingleValue;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected void resetBuilder() {
this.superiorType = null;
@@ -127,9 +122,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected AttributeType buildInstance(String primaryName,
Collection<String> names, String oid, String description,
@@ -769,9 +762,7 @@
Assert.assertEquals(type.isOperational(), result);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected SchemaDefinitionBuilder getBuilder(String name, String oid) {
return new AttributeTypeBuilder(name, oid);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
index 5735360..2b20109 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
@@ -57,28 +57,30 @@
* The type of definition that this builder constructs.
*/
protected static abstract class SchemaDefinitionBuilder<T extends CommonSchemaElements> {
- // The primary name to use for this attribute type.
+ /** The primary name to use for this attribute type. */
private String primaryName;
- // The set of names for this attribute type.
+ /** The set of names for this attribute type. */
private List<String> names;
- // The OID that may be used to reference this attribute type.
+ /** The OID that may be used to reference this attribute type. */
private String oid;
- // The description for this attribute type.
+ /** The description for this attribute type. */
private String description;
- // Indicates whether this attribute type is declared "obsolete".
+ /** Indicates whether this attribute type is declared "obsolete". */
private boolean isObsolete;
- // The set of additional name-value pairs associated with this
- // attribute type definition.
+ /**
+ * The set of additional name-value pairs associated with this
+ * attribute type definition.
+ */
private Map<String, List<String>> extraProperties;
- // Reset the builder to its initial state.
+ /** Reset the builder to its initial state. */
private void reset() {
this.primaryName = null;
this.names = null;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
index 23b49f9..9c71f16 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
@@ -54,24 +54,20 @@
*/
private static final class ObjectClassBuilder extends
SchemaDefinitionBuilder<ObjectClass> {
- // The superior object class from which this object class
- // inherits.
+ /** The superior object class from which this object class inherits. */
private Set<ObjectClass> superior;
- // The type of object class.
+ /** The type of object class. */
private ObjectClassType objectClassType;
- // The set of required attribute types.
+ /** The set of required attribute types. */
private Set<AttributeType> requiredAttributeTypes;
-
- // The set of optional attribute types.
+ /** The set of optional attribute types. */
private Set<AttributeType> optionalAttributeTypes;
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected void resetBuilder() {
this.superior = null;
@@ -105,9 +101,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected ObjectClass buildInstance(String primaryName,
Collection<String> names, String oid, String description,
@@ -331,7 +325,7 @@
- // Array of attribute types to use in tests.
+ /** Array of attribute types to use in tests. */
private AttributeType[] types;
@@ -1618,9 +1612,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
protected SchemaDefinitionBuilder getBuilder(String name, String oid) {
return new ObjectClassBuilder(name, oid);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java
index 531dfb2..5647d2d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java
@@ -44,19 +44,14 @@
*/
public final class TestRDN extends TypesTestCase {
- // Domain component attribute type.
+ /** Domain component attribute type. */
private AttributeType AT_DC;
-
- // Common name attribute type.
+ /** Common name attribute type. */
private AttributeType AT_CN;
- // Test attribute value.
+ /** Test attribute value. */
private ByteString AV_DC_ORG;
-
- // Test attribute value.
- private ByteString AV_DC_OPENDS;
-
- // Test attribute value.
+ /** Test attribute value. */
private ByteString AV_CN;
@@ -82,7 +77,6 @@
DirectoryServer.getSchema().registerAttributeType(dummy, true);
AV_DC_ORG = ByteString.valueOf("org");
- AV_DC_OPENDS = ByteString.valueOf("opends");
AV_CN = ByteString.valueOf("hello world");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
index ef51eff..85c7bec 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -40,7 +40,7 @@
public final class TestSubtreeSpecification extends
SubtreeSpecificationTestCase {
- // Cached root DN.
+ /** Cached root DN. */
private DN rootDN = DN.rootDN();
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
index d628d32..0fb55b0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -49,7 +49,7 @@
public class VirtualAttributeRuleTestCase
extends TypesTestCase
{
- // The attribute type for the entryDN attribute.
+ /** The attribute type for the entryDN attribute. */
private AttributeType entryDNType;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
index a71cb21..da4d26a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
@@ -46,13 +46,13 @@
public class VirtualAttributeTestCase
extends TypesTestCase
{
- // The attribute type for the entryDN attribute.
+ /** The attribute type for the entryDN attribute. */
private AttributeType entryDNType;
- // The virtual attribute instance that will be used for all the testing.
+ /** The virtual attribute instance that will be used for all the testing. */
private VirtualAttribute virtualAttribute;
- // The virtual attribute rule that will be used for the testing.
+ /** The virtual attribute rule that will be used for the testing. */
private VirtualAttributeRule virtualAttributeRule;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
index 5dc9dfc..1762e89 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
@@ -57,7 +57,7 @@
CertificateManager.mayUseCertificateManager();
- // Get the build root and use it to create a test package directory.
+ /** Get the build root and use it to create a test package directory. */
public static final String BUILD_ROOT =
System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
index 7292a17..5386b25 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
@@ -49,7 +49,7 @@
public class PackageInfoTestCase
extends UtilTestCase
{
- // The directory that serves as the top-level source root.
+ /** The directory that serves as the top-level source root. */
private File sourceRoot;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java
index 8178a1a..111199e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -50,10 +50,10 @@
* been overridden.
*/
public final class TestAddChangeRecordEntry extends UtilTestCase {
- // Set of attributes.
+ /** Set of attributes. */
private Map<AttributeType, List<Attribute>> attributes;
- // The attribute being added.
+ /** The attribute being added. */
private Attribute attribute;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java
index 653da5f..84a8e27 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -38,7 +38,7 @@
* {@link org.opends.server.util.Base64} class.
*/
public final class TestBase64 extends UtilTestCase {
- // Look up table for converting hex chars to byte values.
+ /** Look up table for converting hex chars to byte values. */
private static final byte[] hexToByte = { -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
index 29cb3bc..b9b58c4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
@@ -55,9 +55,7 @@
super(dn);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ChangeOperationType getChangeOperationType() {
// Will not use.
@@ -66,9 +64,7 @@
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java
index b0ff0e8..8b04bfd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java
@@ -23,7 +23,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2007 Brighton Consulting, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -80,8 +80,10 @@
validateCryptedPassword("password", saltedPassword);
}
- // Passowrds and their corresponding crypt values for various salts.
- // These were generated using the crypt() implementation in Perl.
+ /**
+ * Passwords and their corresponding crypt values for various salts.
+ * These were generated using the crypt() implementation in Perl.
+ */
private static final Object[][] PASSWORDS_AND_CRYPTS = {
{"", "AEypjPqkpWrm."},
{"", "DEkEMk50GlpvQ"},
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
index 45227c5..fbdc196 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
@@ -51,34 +51,28 @@
* {@link org.opends.server.util.LDIFReader} class.
*/
public final class TestLDIFReader extends UtilTestCase {
- // Top object class.
+ /** Top object class. */
private ObjectClass OC_TOP;
-
- // Person object class.
+ /** Person object class. */
private ObjectClass OC_PERSON;
- // Object class attribute type.
+ /** Object class attribute type. */
private AttributeType AT_OC;
-
- // Common name attribute type.
+ /** Common name attribute type. */
private AttributeType AT_CN;
-
- // Surname attribute type.
+ /** Surname attribute type. */
private AttributeType AT_SN;
-
- // Description attribute type.
+ /** Description attribute type. */
private AttributeType AT_DESCR;
-
- // Telephone number attribute type.
+ /** Telephone number attribute type. */
private AttributeType AT_TELN;
- // Temporary file containing an attribute value.
+ /** Temporary file containing an attribute value. */
private File TEMP_FILE;
- // Temporary file content.
+ /** Temporary file content. */
private static final String TEMP_FILE_STRING = "hello world";
-
- // Temporary file LDIF.
+ /** Temporary file LDIF. */
private static final String TEMP_FILE_LDIF = "dn: cn=john smith, dc=com\n"
+ "changetype: add\n" + "objectClass: top\n"
+ "objectClass: person\n" + "cn: john\n" + "sn: smith\n"
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java
index 789aa46..57ce46d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java
@@ -58,23 +58,22 @@
*/
public final class TestLDIFWriter extends UtilTestCase {
- // Data used in writeModifyEntry tests.
+ /** Data used in writeModifyEntry tests. */
private Object[][] MODIFY_ENTRY_DATA_LDIF;
-
- // Data used in writeModifyDNEntry tests.
+ /** Data used in writeModifyDNEntry tests. */
private Object[][] MODIFY_DN_ENTRY_DATA_LDIF;
/**
* Tests will be performed against a byte array output stream.
*/
private static final class Writer {
- // The underlying output stream.
+ /** The underlying output stream. */
private final ByteArrayOutputStream stream;
- // The underlying LDIF config.
+ /** The underlying LDIF config. */
private final LDIFExportConfig config;
- // The LDIF writer.
+ /** The LDIF writer. */
private final LDIFWriter writer;
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java
index dae8443..6b7f746 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -51,10 +51,10 @@
* been overridden.
*/
public final class TestModifyChangeRecordEntry extends UtilTestCase {
- // Set of changes.
+ /** Set of changes. */
private List<RawModification> modifications;
- // The attribute being added in the modifications.
+ /** The attribute being added in the modifications. */
private Attribute attribute;
/**
--
Gitblit v1.10.0