From 3e3246e42af6979556dec66ec10ad3d3e009217c Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 01 Mar 2007 05:18:42 +0000
Subject: [PATCH] Remove blank lines at the beginning of methods left after eliminating the debugEnter and debugConstructor calls.
---
opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java | 13
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 20
opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java | 12
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java | 12
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java | 5
opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java | 14
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java | 42
opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 8
opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java | 1
opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java | 6
opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 10
opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java | 1
opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java | 32
opendj-sdk/opends/src/server/org/opends/server/types/Schema.java | 85
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java | 5
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java | 20
opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java | 4
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java | 10
opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java | 1
opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java | 12
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 41
opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java | 2
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java | 22
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java | 38
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 8
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 16
opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java | 1
opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java | 6
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/types/Modification.java | 14
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 19
opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java | 23
opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java | 15
opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java | 25
opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java | 7
opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java | 28
opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 46
opendj-sdk/opends/src/server/org/opends/server/types/Entry.java | 68
opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java | 10
opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 11
opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java | 14
opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java | 16
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 13
opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java | 26
opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java | 14
opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java | 45
opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java | 25
opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java | 15
opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java | 8
opendj-sdk/opends/src/server/org/opends/server/types/Control.java | 11
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java | 4
opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java | 6
opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 13
opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java | 7
opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java | 26
opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java | 11
opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java | 10
opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java | 13
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java | 2
opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java | 33
opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java | 28
opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java | 5
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java | 1
opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java | 36
opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java | 6
opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java | 26
opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java | 12
opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 24
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java | 5
opendj-sdk/opends/src/server/org/opends/server/core/Operation.java | 38
opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 16
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java | 12
opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java | 3
opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java | 25
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 4
opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java | 17
opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java | 5
opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 32
opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java | 12
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java | 1
opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java | 6
opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 11
opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java | 21
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 16
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 10
opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java | 4
opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java | 14
opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java | 1
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java | 6
opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java | 15
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java | 5
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java | 4
opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java | 3
opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java | 15
opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java | 1
opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java | 19
opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 14
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java | 7
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java | 7
opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java | 18
opendj-sdk/opends/src/server/org/opends/server/api/Group.java | 3
opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java | 26
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java | 14
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java | 64
opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java | 57
opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java | 24
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java | 20
opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java | 13
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java | 13
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java | 8
opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java | 1
opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java | 8
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java | 20
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 24
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java | 2
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 16
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java | 24
opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java | 10
opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java | 20
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java | 6
opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java | 12
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 58
opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java | 5
opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java | 1
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java | 37
opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java | 3
opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java | 12
opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java | 13
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java | 35
opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java | 1
opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java | 43
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java | 2
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java | 7
opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java | 6
opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java | 2
opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java | 48
opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java | 14
opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java | 14
opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java | 14
opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java | 14
opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java | 25
opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java | 1
opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java | 19
opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java | 3
opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java | 30
opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java | 9
opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/types/RDN.java | 23
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java | 3
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 24
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java | 53
opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java | 16
opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java | 14
opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java | 1
opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java | 2
opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java | 20
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 22
opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java | 6
opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java | 7
opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java | 45
opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 12
opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java | 37
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java | 40
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 270 --
opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java | 12
opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 13
opendj-sdk/opends/src/server/org/opends/server/util/Base64.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java | 7
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java | 12
opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java | 18
opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java | 15
opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java | 5
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java | 2
opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java | 26
opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java | 11
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 9
opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java | 6
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java | 24
opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java | 4
opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java | 7
opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java | 20
opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java | 4
opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 14
opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 15
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java | 7
opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 4
opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java | 3
opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java | 12
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 66
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java | 13
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java | 11
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java | 5
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java | 3
opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java | 16
opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java | 4
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 18
opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java | 6
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java | 1
opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java | 7
opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java | 2
opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java | 4
opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java | 29
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 34
opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java | 3
opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java | 11
opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java | 19
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java | 1
opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java | 12
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 1
opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java | 6
opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java | 45
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java | 3
opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java | 4
opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 5
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java | 8
opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java | 7
opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java | 2
opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java | 22
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java | 3
opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 24
opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java | 5
opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java | 10
opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java | 2
opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java | 19
opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java | 8
opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java | 4
opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java | 2
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java | 7
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 34
opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java | 41
opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java | 4
opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java | 16
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java | 1
opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java | 29
opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java | 19
opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java | 23
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java | 4
opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java | 5
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 16
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java | 2
opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java | 3
opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java | 34
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java | 2
opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java | 5
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java | 5
opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java | 22
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 16
opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java | 3
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 15
opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java | 50
opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 15
opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java | 16
opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java | 70
opendj-sdk/opends/src/server/org/opends/server/api/Backend.java | 21
opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 4
opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java | 24
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java | 8
opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 14
opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java | 68
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java | 7
opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java | 26
opendj-sdk/opends/src/server/org/opends/server/types/DN.java | 31
opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 4
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java | 1
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java | 11
opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java | 1
opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 16
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java | 10
opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java | 7
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java | 9
opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java | 1
opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java | 6
opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java | 82
opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java | 5
opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java | 4
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java | 9
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 16
opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java | 19
opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java | 7
opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java | 1
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java | 11
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java | 10
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java | 59
opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java | 1
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java | 4
opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java | 16
opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java | 10
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java | 17
opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java | 36
opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java | 6
opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java | 1
opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java | 1
413 files changed, 0 insertions(+), 5,623 deletions(-)
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
index 39c9983..c581673 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
@@ -68,7 +68,6 @@
AbandonRequest abandonRequest)
throws IOException
{
-
LDAPResult abandonResponse = objFactory.createLDAPResult();
String requestID = abandonRequest.getRequestID();
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
index 5e9ae16..88a6a98 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
@@ -82,7 +82,6 @@
CompareRequest compareRequest)
throws IOException, LDAPException, ASN1Exception
{
-
LDAPResult compareResponse = objFactory.createLDAPResult();
String requestID = compareRequest.getRequestID();
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
index 3766492..3c828a6 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
@@ -84,7 +84,6 @@
DelRequest deleteRequest)
throws IOException, LDAPException, ASN1Exception
{
-
LDAPResult delResponse = objFactory.createLDAPResult();
String requestID = deleteRequest.getRequestID();
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
index 48217ad..92aa808 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
@@ -82,7 +82,6 @@
ExtendedRequest extendedRequest)
throws IOException, LDAPException, ASN1Exception
{
-
ExtendedResponse extendedResponse = objFactory.createExtendedResponse();
String requestID = extendedRequest.getRequestID();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
index 7525fd2..ccf858b 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
@@ -194,9 +194,6 @@
private UserUninstallData getUserUninstallData(String[] args,
CurrentInstallStatus installStatus) throws UserUninstallDataException
{
-
-
-
UserUninstallData userData = new UserUninstallData();
boolean silentUninstall = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
index 5bf5a62..4ae6d22 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
@@ -80,7 +80,6 @@
*/
public void finalizeStatusNotificationHandler()
{
-
// No action is required by default.
}
@@ -115,7 +114,6 @@
public void handleStatusNotification(
AccountStatusNotification notification)
{
-
handleStatusNotification(notification.getNotificationType(),
notification.getUserDN(),
notification.getMessageID(),
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
index 86e3d2f..7909da9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
@@ -84,7 +84,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
if (approximatelyMatch(attributeValue, assertionValue))
{
return ConditionResult.TRUE;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
index 413470a..877ac8f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
@@ -74,7 +74,6 @@
*/
public void finalizeSyntax()
{
-
// No implementation required.
}
@@ -186,7 +185,6 @@
*/
public int hashCode()
{
-
int hashCode = 0;
String oidString = getOID();
@@ -215,7 +213,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -245,7 +242,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -262,7 +258,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("( ");
buffer.append(getOID());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
index 2cda421..75640d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
@@ -100,7 +100,6 @@
*/
protected Backend()
{
-
backendID = null;
parentBackend = null;
subordinateBackends = new Backend[0];
@@ -214,7 +213,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
Lock lock = null;
for (int i=0; i < 3; i++)
{
@@ -402,7 +400,6 @@
*/
public final boolean supportsControl(String controlOID)
{
-
Set<String> supportedControls = getSupportedControls();
return ((supportedControls != null) &&
supportedControls.contains(controlOID));
@@ -432,7 +429,6 @@
*/
public final boolean supportsFeature(String featureOID)
{
-
Set<String> supportedFeatures = getSupportedFeatures();
return ((supportedFeatures != null) &&
supportedFeatures.contains(featureOID));
@@ -621,7 +617,6 @@
*/
public String getBackendID()
{
-
return backendID;
}
@@ -634,7 +629,6 @@
*/
public void setBackendID(String backendID)
{
-
this.backendID = backendID;
}
@@ -648,7 +642,6 @@
*/
public boolean isPrivateBackend()
{
-
return isPrivateBackend;
}
@@ -674,7 +667,6 @@
*/
public WritabilityMode getWritabilityMode()
{
-
return writabilityMode;
}
@@ -687,7 +679,6 @@
*/
public void setWritabilityMode(WritabilityMode writabilityMode)
{
-
if (writabilityMode == null)
{
this.writabilityMode = WritabilityMode.ENABLED;
@@ -709,7 +700,6 @@
*/
public BackendMonitor getBackendMonitor()
{
-
return backendMonitor;
}
@@ -722,7 +712,6 @@
*/
public void setBackendMonitor(BackendMonitor backendMonitor)
{
-
this.backendMonitor = backendMonitor;
}
@@ -747,7 +736,6 @@
*/
public Backend getParentBackend()
{
-
return parentBackend;
}
@@ -760,7 +748,6 @@
*/
public void setParentBackend(Backend parentBackend)
{
-
synchronized (this)
{
this.parentBackend = parentBackend;
@@ -777,7 +764,6 @@
*/
public Backend[] getSubordinateBackends()
{
-
return subordinateBackends;
}
@@ -791,7 +777,6 @@
*/
public void setSubordinateBackends(Backend[] subordinateBackends)
{
-
synchronized (this)
{
this.subordinateBackends = subordinateBackends;
@@ -814,7 +799,6 @@
*/
public boolean hasSubSuffix(DN subSuffixDN)
{
-
Backend[] subBackends = subordinateBackends;
for (Backend b : subBackends)
{
@@ -854,7 +838,6 @@
public void removeSubSuffix(DN subSuffixDN, DN parentDN)
throws ConfigException
{
-
synchronized (this)
{
boolean matchFound = false;
@@ -918,7 +901,6 @@
*/
public void addSubordinateBackend(Backend subordinateBackend)
{
-
synchronized (this)
{
LinkedHashSet<Backend> backendSet =
@@ -951,7 +933,6 @@
*/
public void removeSubordinateBackend(Backend subordinateBackend)
{
-
synchronized (this)
{
ArrayList<Backend> backendList =
@@ -995,7 +976,6 @@
*/
public boolean handlesEntry(DN entryDN)
{
-
DN[] baseDNs = getBaseDNs();
for (int i=0; i < baseDNs.length; i++)
{
@@ -1037,7 +1017,6 @@
List<DN> baseDNs,
List<DN> excludeDNs)
{
-
for (DN baseDN : baseDNs)
{
if (entryDN.isDescendantOf(baseDN))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
index 47aaaf9..c0762fb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
@@ -79,7 +79,6 @@
*/
public void finalizeCertificateMapper()
{
-
// No implementation is required by default.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
index e08930e..a69474c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
@@ -128,7 +128,6 @@
*/
protected ClientConnection()
{
-
connectTime = TimeThread.getTime();
connectTimeString = TimeThread.getUTCTime();
authenticationInfo = new AuthenticationInfo();
@@ -227,7 +226,6 @@
*/
public long getConnectTime()
{
-
return connectTime;
}
@@ -242,7 +240,6 @@
*/
public String getConnectTimeString()
{
-
return connectTimeString;
}
@@ -460,8 +457,6 @@
public final boolean sendIntermediateResponse(
IntermediateResponse intermediateResponse)
{
-
-
// Invoke the intermediate response plugins for the response
// message.
PluginConfigManager pluginConfigManager =
@@ -522,7 +517,6 @@
boolean sendNotification,
int messageID, Object... arguments)
{
-
String message = getMessage(messageID, arguments);
disconnect(disconnectReason, sendNotification, message,
messageID);
@@ -572,7 +566,6 @@
*/
public boolean bindInProgress()
{
-
return bindInProgress;
}
@@ -588,7 +581,6 @@
*/
public void setBindInProgress(boolean bindInProgress)
{
-
this.bindInProgress = bindInProgress;
}
@@ -606,7 +598,6 @@
*/
public boolean mustChangePassword()
{
-
if (authenticationInfo == null)
{
return false;
@@ -631,7 +622,6 @@
*/
public void setMustChangePassword(boolean mustChangePassword)
{
-
if (authenticationInfo == null)
{
authenticationInfo = new AuthenticationInfo();
@@ -694,7 +684,6 @@
public CopyOnWriteArrayList<PersistentSearch>
getPersistentSearches()
{
-
return persistentSearches;
}
@@ -712,7 +701,6 @@
public void registerPersistentSearch(PersistentSearch
persistentSearch)
{
-
persistentSearches.add(persistentSearch);
}
@@ -730,7 +718,6 @@
public void deregisterPersistentSearch(PersistentSearch
persistentSearch)
{
-
persistentSearches.remove(persistentSearch);
}
@@ -786,7 +773,6 @@
*/
public AuthenticationInfo getAuthenticationInfo()
{
-
return authenticationInfo;
}
@@ -804,7 +790,6 @@
public void setAuthenticationInfo(AuthenticationInfo
authenticationInfo)
{
-
if (this.authenticationInfo != null)
{
Entry authNEntry =
@@ -893,7 +878,6 @@
*/
public void updateAuthenticationInfo(Entry oldEntry, Entry newEntry)
{
-
Entry authNEntry = authenticationInfo.getAuthenticationEntry();
Entry authZEntry = authenticationInfo.getAuthorizationEntry();
@@ -932,7 +916,6 @@
*/
public void setUnauthenticated()
{
-
this.authenticationInfo = new AuthenticationInfo();
this.sizeLimit = DirectoryServer.getSizeLimit();
this.timeLimit = DirectoryServer.getTimeLimit();
@@ -957,7 +940,6 @@
public boolean hasPrivilege(Privilege privilege,
Operation operation)
{
-
boolean result = privileges.contains(privilege);
if (operation == null)
{
@@ -1005,7 +987,6 @@
public boolean hasAllPrivileges(Privilege[] privileges,
Operation operation)
{
-
HashSet<Privilege> privSet = this.privileges;
boolean result = true;
StringBuilder buffer = new StringBuilder();
@@ -1070,7 +1051,6 @@
*/
private void updatePrivileges(Entry entry, boolean isRoot)
{
-
HashSet<Privilege> newPrivileges = new HashSet<Privilege>();
HashSet<Privilege> removePrivileges = new HashSet<Privilege>();
@@ -1148,7 +1128,6 @@
*/
public final Object getSASLAuthStateInfo()
{
-
return saslAuthState;
}
@@ -1164,7 +1143,6 @@
*/
public final void setSASLAuthStateInfo(Object saslAuthState)
{
-
this.saslAuthState = saslAuthState;
}
@@ -1179,7 +1157,6 @@
*/
public final int getSizeLimit()
{
-
return sizeLimit;
}
@@ -1195,7 +1172,6 @@
*/
public final void setSizeLimit(int sizeLimit)
{
-
this.sizeLimit = sizeLimit;
}
@@ -1210,7 +1186,6 @@
*/
public final int getLookthroughLimit()
{
-
return lookthroughLimit;
}
@@ -1226,7 +1201,6 @@
*/
public final void setLookthroughLimit(int lookthroughLimit)
{
-
this.lookthroughLimit = lookthroughLimit;
}
@@ -1241,7 +1215,6 @@
*/
public final int getTimeLimit()
{
-
return timeLimit;
}
@@ -1257,7 +1230,6 @@
*/
public final void setTimeLimit(int timeLimit)
{
-
this.timeLimit = timeLimit;
}
@@ -1305,7 +1277,6 @@
public boolean isMemberOf(Group group, Operation operation)
throws DirectoryException
{
-
if (operation == null)
{
return group.isMember(authenticationInfo.getAuthorizationDN());
@@ -1343,8 +1314,6 @@
public Set<Group> getGroups(Operation operation)
throws DirectoryException
{
-
-
// FIXME -- This probably isn't the most efficient implementation.
DN authzDN;
if (operation == null)
@@ -1405,7 +1374,6 @@
*/
public DN getKeyManagerProviderDN()
{
-
// In the default implementation, we'll return null.
return null;
}
@@ -1427,7 +1395,6 @@
*/
public DN getTrustManagerProviderDN()
{
-
// In the default implementation, we'll return null.
return null;
}
@@ -1459,7 +1426,6 @@
*/
public final String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
index e173d0c..aa08754 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
@@ -179,7 +179,6 @@
*/
public ConnectionHandlerMonitor getConnectionHandlerMonitor()
{
-
return monitor;
}
@@ -194,7 +193,6 @@
public void setConnectionHandlerMonitor(
ConnectionHandlerMonitor monitor)
{
-
this.monitor = monitor;
}
@@ -207,7 +205,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
index d2a85fc..9046dfe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
@@ -165,7 +165,6 @@
*/
public StackTraceElement[] getCreationStackTrace()
{
-
return creationStackTrace;
}
@@ -181,7 +180,6 @@
*/
public Thread getParentThread()
{
-
return parentThread;
}
@@ -197,7 +195,6 @@
*/
public Task getAssociatedTask()
{
-
return task;
}
@@ -212,7 +209,6 @@
*/
public void setAssociatedTask(Task task)
{
-
this.task = task;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
index 9825960..aea0a68 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
@@ -89,7 +89,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
if (areEqual(attributeValue, assertionValue))
{
return ConditionResult.TRUE;
@@ -121,7 +120,6 @@
*/
public int generateHashCode(AttributeValue attributeValue)
{
-
try
{
return attributeValue.getNormalizedValue().hashCode();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
index 483c0ae..109d6fd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
@@ -91,7 +91,6 @@
*/
public void finalizeExtendedOperationHandler()
{
-
// No implementation is required by default.
}
@@ -118,7 +117,6 @@
*/
public Set<String> getSupportedControls()
{
-
return supportedControlOIDs;
}
@@ -136,7 +134,6 @@
*/
public final boolean supportsControl(String controlOID)
{
-
return getSupportedControls().contains(controlOID);
}
@@ -151,7 +148,6 @@
*/
public Set<String> getSupportedFeatures()
{
-
return supportedFeatureOIDs;
}
@@ -169,7 +165,6 @@
*/
public final boolean supportsFeature(String featureOID)
{
-
return getSupportedFeatures().contains(featureOID);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/Group.java b/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
index 389d067..4c89272 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
@@ -98,7 +98,6 @@
*/
public void finalizeGroupImplementation()
{
-
// No implementation is required by default.
}
@@ -287,7 +286,6 @@
public MemberList getMembers()
throws DirectoryException
{
-
return getMembers(null, null, null);
}
@@ -387,7 +385,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
index 97e6571..ee7656d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
@@ -80,7 +80,6 @@
*/
public void finalizeIdentityMapper()
{
-
// No implementation is required by default.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
index 098e45c..294c030 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
@@ -97,7 +97,6 @@
*/
public String getNameOrOID()
{
-
String name = getName();
if ((name == null) || (name.length() == 0))
{
@@ -144,7 +143,6 @@
*/
public boolean isObsolete()
{
-
return false;
}
@@ -201,7 +199,6 @@
*/
public int hashCode()
{
-
int hashCode = 0;
String oidString = getOID();
@@ -228,7 +225,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -258,7 +254,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -275,7 +270,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("( ");
buffer.append(getOID());
buffer.append(" NAME '");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
index 77a388f..99144df 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
@@ -118,7 +118,6 @@
*/
public void finalizeMonitorProvider()
{
-
// Signal the monitor thread that it should stop.
stopRequested = true;
@@ -164,7 +163,6 @@
*/
public ObjectClass getMonitorObjectClass()
{
-
return DirectoryConfig.getObjectClass(OC_EXTENSIBLE_OBJECT_LC,
true);
}
@@ -217,8 +215,6 @@
*/
public final void run()
{
-
-
monitorThread = Thread.currentThread();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
index 531b0dc..9c53aa5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
@@ -107,7 +107,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
return ConditionResult.UNDEFINED;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
index e568f7f..da63dcd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
@@ -80,7 +80,6 @@
*/
public void finalizePasswordGenerator()
{
-
// No action is performed by default.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
index 2e9cc3a..ff950c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
@@ -80,7 +80,6 @@
*/
public void finalizePasswordStorageScheme()
{
-
// No implementation required by default.
}
@@ -182,7 +181,6 @@
*/
public String getAuthPasswordSchemeName()
{
-
return getStorageSchemeName();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
index f830e73..85d32a9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
@@ -80,8 +80,6 @@
*/
public void finalizePasswordValidator()
{
-
-
// No action is required by default.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
index a58364c..bf6aa0d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
@@ -77,7 +77,6 @@
*/
public void finalizeSASLMechanismHandler()
{
-
// No implementation is required by default.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
index c58c2f4..3848c87 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
@@ -120,7 +120,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
return ConditionResult.UNDEFINED;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
index 558f03a..4b92ab3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
@@ -85,7 +85,6 @@
*/
public void finalizeSynchronizationProvider()
{
-
// No implementation is required by default.
}
@@ -113,7 +112,6 @@
handleConflictResolution(AddOperation addOperation)
throws DirectoryException
{
-
// No processing is required by default.
return new SynchronizationProviderResult(true);
}
@@ -182,7 +180,6 @@
handleConflictResolution(DeleteOperation deleteOperation)
throws DirectoryException
{
-
// No processing is required by default.
return new SynchronizationProviderResult(true);
}
@@ -253,7 +250,6 @@
modifyOperation)
throws DirectoryException
{
-
// No processing is required by default.
return new SynchronizationProviderResult(true);
}
@@ -325,7 +321,6 @@
modifyDNOperation)
throws DirectoryException
{
-
// No processing is required by default.
return new SynchronizationProviderResult(true);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java b/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
index 14b9731..2d5d528 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
@@ -137,7 +137,6 @@
*/
public boolean waitUntilIdle(long timeLimit)
{
-
long stopWaitingTime;
if (timeLimit <= 0)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
index ad872f7..98a0050 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
@@ -78,7 +78,6 @@
*/
protected DirectoryServerPlugin()
{
-
}
@@ -95,7 +94,6 @@
public final void initializeInternal(DN pluginDN,
Set<PluginType> pluginTypes)
{
-
this.pluginDN = pluginDN;
this.pluginTypes = pluginTypes;
}
@@ -133,7 +131,6 @@
*/
public void finalizePlugin()
{
-
// No implementation is required by default.
}
@@ -146,7 +143,6 @@
*/
public final DN getPluginEntryDN()
{
-
return pluginDN;
}
@@ -160,7 +156,6 @@
*/
public final Set<PluginType> getPluginTypes()
{
-
return pluginTypes;
}
@@ -176,7 +171,6 @@
*/
public StartupPluginResult doStartup()
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.STARTUP.getName());
@@ -196,7 +190,6 @@
*/
public void doShutdown(String reason)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.SHUTDOWN.getName());
@@ -219,7 +212,6 @@
public PostConnectPluginResult doPostConnect(ClientConnection
clientConnection)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_CONNECT.getName());
@@ -250,7 +242,6 @@
DisconnectReason disconnectReason,
int messageID, String message)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String msg = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_DISCONNECT.getName());
@@ -274,7 +265,6 @@
public LDIFPluginResult doLDIFImport(LDIFImportConfig importConfig,
Entry entry)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.LDIF_IMPORT.getName());
@@ -296,7 +286,6 @@
public LDIFPluginResult doLDIFExport(LDIFExportConfig exportConfig,
Entry entry)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.LDIF_EXPORT.getName());
@@ -317,7 +306,6 @@
public PreParsePluginResult
doPreParse(PreParseAbandonOperation abandonOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_ABANDON.getName());
@@ -339,7 +327,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationAbandonOperation abandonOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -360,7 +347,6 @@
public PreParsePluginResult
doPreParse(PreParseAddOperation addOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_ADD.getName());
@@ -383,7 +369,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationAddOperation addOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_ADD.getName());
@@ -406,7 +391,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationAddOperation addOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_ADD.getName());
@@ -429,7 +413,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseAddOperation addOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_ADD.getName());
@@ -450,7 +433,6 @@
public PreParsePluginResult
doPreParse(PreParseBindOperation bindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_BIND.getName());
@@ -471,7 +453,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationBindOperation bindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_BIND.getName());
@@ -494,7 +475,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationBindOperation bindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_BIND.getName());
@@ -517,7 +497,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseBindOperation bindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_BIND.getName());
@@ -538,7 +517,6 @@
public PreParsePluginResult
doPreParse(PreParseCompareOperation compareOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_COMPARE.getName());
@@ -559,7 +537,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationCompareOperation compareOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_COMPARE.getName());
@@ -582,7 +559,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationCompareOperation compareOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -606,7 +582,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseCompareOperation compareOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_COMPARE.getName());
@@ -627,7 +602,6 @@
public PreParsePluginResult
doPreParse(PreParseDeleteOperation deleteOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_DELETE.getName());
@@ -650,7 +624,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationDeleteOperation deleteOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_DELETE.getName());
@@ -673,7 +646,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationDeleteOperation deleteOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_DELETE.getName());
@@ -696,7 +668,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseDeleteOperation deleteOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_DELETE.getName());
@@ -717,7 +688,6 @@
public PreParsePluginResult
doPreParse(PreParseExtendedOperation extendedOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_EXTENDED.getName());
@@ -739,7 +709,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationExtendedOperation extendedOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -765,7 +734,6 @@
doPostOperation(PostOperationExtendedOperation
extendedOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -789,7 +757,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseExtendedOperation extendedOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -811,7 +778,6 @@
public PreParsePluginResult
doPreParse(PreParseModifyOperation modifyOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_MODIFY.getName());
@@ -834,7 +800,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationModifyOperation modifyOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_MODIFY.getName());
@@ -857,7 +822,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationModifyOperation modifyOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_MODIFY.getName());
@@ -880,7 +844,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseModifyOperation modifyOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_MODIFY.getName());
@@ -901,7 +864,6 @@
public PreParsePluginResult
doPreParse(PreParseModifyDNOperation modifyDNOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_MODIFY_DN.getName());
@@ -925,7 +887,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -950,7 +911,6 @@
doPostOperation(PostOperationModifyDNOperation
modifyDNOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -974,7 +934,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -996,7 +955,6 @@
public PreParsePluginResult
doPreParse(PreParseSearchOperation searchOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_SEARCH.getName());
@@ -1017,7 +975,6 @@
public PreOperationPluginResult
doPreOperation(PreOperationSearchOperation searchOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_OPERATION_SEARCH.getName());
@@ -1046,7 +1003,6 @@
processSearchEntry(SearchEntrySearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.SEARCH_RESULT_ENTRY.getName());
@@ -1072,7 +1028,6 @@
searchOperation,
SearchResultReference searchReference)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message =
getMessage(msgID, String.valueOf(pluginDN),
@@ -1096,7 +1051,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationSearchOperation searchOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_SEARCH.getName());
@@ -1119,7 +1073,6 @@
public PostResponsePluginResult
doPostResponse(PostResponseSearchOperation searchOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_RESPONSE_SEARCH.getName());
@@ -1140,7 +1093,6 @@
public PreParsePluginResult
doPreParse(PreParseUnbindOperation unbindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.PRE_PARSE_UNBIND.getName());
@@ -1162,7 +1114,6 @@
public PostOperationPluginResult
doPostOperation(PostOperationUnbindOperation unbindOperation)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.POST_OPERATION_UNBIND.getName());
@@ -1184,7 +1135,6 @@
processIntermediateResponse(
IntermediateResponse intermediateResponse)
{
-
int msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(pluginDN),
PluginType.INTERMEDIATE_RESPONSE.getName());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
index 019c92e..61ed347 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
@@ -107,7 +107,6 @@
boolean sendIntermediateResponse,
boolean continueOperation)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
this.sendIntermediateResponse = sendIntermediateResponse;
@@ -126,7 +125,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -142,7 +140,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -158,7 +155,6 @@
*/
public boolean sendIntermediateResponse()
{
-
return sendIntermediateResponse;
}
@@ -173,7 +169,6 @@
*/
public boolean continueOperation()
{
-
return continueOperation;
}
@@ -188,7 +183,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -205,7 +199,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("IntermediateResponsePluginResult(" +
"connectionTerminated=");
buffer.append(connectionTerminated);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
index 2f127f8..2dd4ee3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
@@ -86,7 +86,6 @@
public LDIFPluginResult(boolean continuePluginProcessing,
boolean continueEntryProcessing)
{
-
this.continuePluginProcessing = continuePluginProcessing;
this.continueEntryProcessing = continueEntryProcessing;
}
@@ -103,7 +102,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -118,7 +116,6 @@
*/
public boolean continueEntryProcessing()
{
-
return continueEntryProcessing;
}
@@ -133,7 +130,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -150,7 +146,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDIFPluginResult(continuePluginProcessing=");
buffer.append(continuePluginProcessing);
buffer.append(", continueEntryProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
index 26f49a2..d8cc00c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
@@ -86,7 +86,6 @@
public PostConnectPluginResult(boolean connectionTerminated,
boolean continuePluginProcessing)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
}
@@ -102,7 +101,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -118,7 +116,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -133,7 +130,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -150,7 +146,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostConnectPluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
index f97d3d3..8aad2a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
@@ -77,7 +77,6 @@
*/
public PostDisconnectPluginResult(boolean continuePluginProcessing)
{
-
this.continuePluginProcessing = continuePluginProcessing;
}
@@ -93,7 +92,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -108,7 +106,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -125,7 +122,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostDisconnectPluginResult(" +
"continuePluginProcessing=");
buffer.append(continuePluginProcessing);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
index 2ab966f..3d45391 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
@@ -87,7 +87,6 @@
public PostOperationPluginResult(boolean connectionTerminated,
boolean continuePluginProcessing)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
}
@@ -104,7 +103,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -120,7 +118,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -135,7 +132,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -152,7 +148,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostOperationPluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
index 91f0bec..12f443b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
@@ -86,7 +86,6 @@
public PostResponsePluginResult(boolean connectionTerminated,
boolean continuePluginProcessing)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
}
@@ -103,7 +102,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -118,7 +116,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -133,7 +130,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -150,7 +146,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostResponsePluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
index 3ef2dcd..cca30a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
@@ -98,7 +98,6 @@
boolean continuePluginProcessing,
boolean sendResponseImmediately)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
this.sendResponseImmediately = sendResponseImmediately;
@@ -115,7 +114,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -131,7 +129,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -149,7 +146,6 @@
*/
public boolean sendResponseImmediately()
{
-
return sendResponseImmediately;
}
@@ -164,7 +160,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -181,7 +176,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostResponsePluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
index 8edb1bf..906ae0b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
@@ -98,7 +98,6 @@
boolean continuePluginProcessing,
boolean sendResponseImmediately)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
this.sendResponseImmediately = sendResponseImmediately;
@@ -115,7 +114,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -131,7 +129,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -149,7 +146,6 @@
*/
public boolean sendResponseImmediately()
{
-
return sendResponseImmediately;
}
@@ -164,7 +160,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -181,7 +176,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PostResponsePluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
index 4d52a48..2cee9f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
@@ -102,7 +102,6 @@
boolean sendEntry,
boolean continueSearch)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
this.sendEntry = sendEntry;
@@ -121,7 +120,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -137,7 +135,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -153,7 +150,6 @@
*/
public boolean sendEntry()
{
-
return sendEntry;
}
@@ -169,7 +165,6 @@
*/
public boolean continueSearch()
{
-
return continueSearch;
}
@@ -184,7 +179,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -201,7 +195,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchEntryPluginResult(connectionTerminated=");
buffer.append(connectionTerminated);
buffer.append(", continuePluginProcessing=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
index 8f3dda7..8c35d14 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
@@ -103,7 +103,6 @@
boolean sendReference,
boolean continueSearch)
{
-
this.connectionTerminated = connectionTerminated;
this.continuePluginProcessing = continuePluginProcessing;
this.sendReference = sendReference;
@@ -122,7 +121,6 @@
*/
public boolean connectionTerminated()
{
-
return connectionTerminated;
}
@@ -138,7 +136,6 @@
*/
public boolean continuePluginProcessing()
{
-
return continuePluginProcessing;
}
@@ -154,7 +151,6 @@
*/
public boolean sendReference()
{
-
return sendReference;
}
@@ -170,7 +166,6 @@
*/
public boolean continueSearch()
{
-
return continueSearch;
}
@@ -185,7 +180,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -202,7 +196,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchReferencePluginResult(" +
"connectionTerminated=");
buffer.append(connectionTerminated);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
index ed69938..19b3993 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
@@ -101,7 +101,6 @@
boolean continueStartup, int errorID,
String errorMessage)
{
-
this.completedSuccessfully = completedSuccessfully;
this.continueStartup = continueStartup;
this.errorID = errorID;
@@ -119,7 +118,6 @@
*/
public boolean completedSuccessfully()
{
-
return completedSuccessfully;
}
@@ -135,7 +133,6 @@
*/
public boolean continueStartup()
{
-
return continueStartup;
}
@@ -150,7 +147,6 @@
*/
public int getErrorID()
{
-
return errorID;
}
@@ -166,7 +162,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -179,7 +174,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -196,7 +190,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("StartupPluginResult(completedSuccessfully=");
buffer.append(completedSuccessfully);
buffer.append(", continueStartup=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
index a3eb8ed..a2b2c73 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
@@ -166,7 +166,6 @@
public boolean match (InetAddress theSourceAddress)
{
-
byte[] addr = theSourceAddress.getAddress();
if ((addr.length * 8) < _bits) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
index a1d7319..c7d367c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
@@ -158,8 +158,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
if (configEntry == null)
@@ -308,7 +306,6 @@
*/
public void finalizeBackend()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
try
@@ -333,7 +330,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -344,7 +340,6 @@
*/
public long getEntryCount()
{
-
int numEntries = 1;
AttributeType backupPathType =
@@ -385,7 +380,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -406,8 +400,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
// If the requested entry was null, then throw an exception.
if (entryDN == null)
{
@@ -471,8 +463,6 @@
private Entry getBackupDirectoryEntry(DN entryDN)
throws DirectoryException
{
-
-
// Make sure that the DN specifies a backup directory.
AttributeType t =
DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH, true);
@@ -573,8 +563,6 @@
private Entry getBackupEntry(DN entryDN)
throws DirectoryException
{
-
-
// First, get the backup ID from the entry DN.
AttributeType idType = DirectoryServer.getAttributeType(ATTR_BACKUP_ID,
true);
@@ -797,7 +785,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
int msgID = MSGID_BACKUP_ADD_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -823,7 +810,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
int msgID = MSGID_BACKUP_DELETE_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -849,7 +835,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
int msgID = MSGID_BACKUP_MODIFY_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -877,7 +862,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
int msgID = MSGID_BACKUP_MODIFY_DN_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -899,8 +883,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException
{
-
-
// Get the base entry for the search, if possible. If it doesn't exist,
// then this will throw an exception.
DN baseDN = searchOperation.getBaseDN();
@@ -1097,7 +1079,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -1110,7 +1091,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -1125,7 +1105,6 @@
*/
public boolean supportsLDIFExport()
{
-
// We do not support LDIF exports.
return false;
}
@@ -1149,7 +1128,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
int msgID = MSGID_BACKUP_EXPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -1167,7 +1145,6 @@
*/
public boolean supportsLDIFImport()
{
-
// This backend does not support LDIF imports.
return false;
}
@@ -1191,8 +1168,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
// This backend does not support LDIF imports.
int msgID = MSGID_BACKUP_IMPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1215,7 +1190,6 @@
*/
public boolean supportsBackup()
{
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1240,8 +1214,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1264,8 +1236,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_BACKUP_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1291,8 +1261,6 @@
String backupID)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_BACKUP_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1310,8 +1278,6 @@
*/
public boolean supportsRestore()
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1335,8 +1301,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_BACKUP_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1355,7 +1319,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1370,8 +1333,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrs = new LinkedList<ConfigAttribute>();
@@ -1408,8 +1369,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// We'll accept anything here. The only configurable attribute is the
// default set of backup directories, but that doesn't require any
// validation at this point.
@@ -1437,8 +1396,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
index a278676..2a5cf20 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
@@ -148,8 +148,6 @@
DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// We won't support anything other than exactly one base DN in this
// implementation. If we were to add such support in the future, we would
// likely want to separate the data for each base DN into a separate entry
@@ -217,7 +215,6 @@
*/
public synchronized void finalizeBackend()
{
-
clearMemoryBackend();
for (DN dn : baseDNs)
@@ -243,7 +240,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -254,7 +250,6 @@
*/
public synchronized long getEntryCount()
{
-
if (entryMap != null)
{
return entryMap.size();
@@ -270,7 +265,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -282,7 +276,6 @@
*/
public synchronized Entry getEntry(DN entryDN)
{
-
return entryMap.get(entryDN);
}
@@ -293,7 +286,6 @@
*/
public synchronized boolean entryExists(DN entryDN)
{
-
return entryMap.containsKey(entryDN);
}
@@ -305,8 +297,6 @@
public synchronized void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
-
// See if the target entry already exists. If so, then fail.
DN entryDN = entry.getDN();
if (entryMap.containsKey(entryDN))
@@ -362,8 +352,6 @@
DeleteOperation deleteOperation)
throws DirectoryException
{
-
-
// Make sure the entry exists. If not, then throw an exception.
if (! entryMap.containsKey(entryDN))
{
@@ -453,8 +441,6 @@
ModifyOperation modifyOperation)
throws DirectoryException
{
-
-
// Make sure the entry exists. If not, then throw an exception.
DN entryDN = entry.getDN();
if (! entryMap.containsKey(entryDN))
@@ -478,8 +464,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
-
// Make sure that the target entry exists.
if (! entryMap.containsKey(currentDN))
{
@@ -561,8 +545,6 @@
public synchronized void search(SearchOperation searchOperation)
throws DirectoryException
{
-
-
// Get the base DN, scope, and filter for the search.
DN baseDN = searchOperation.getBaseDN();
SearchScope scope = searchOperation.getScope();
@@ -606,7 +588,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -617,7 +598,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -628,7 +608,6 @@
*/
public boolean supportsLDIFExport()
{
-
return true;
}
@@ -641,8 +620,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
-
// Create the LDIF writer.
LDIFWriter ldifWriter;
try
@@ -704,7 +681,6 @@
*/
public boolean supportsLDIFImport()
{
-
return true;
}
@@ -717,8 +693,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
clearMemoryBackend();
LDIFReader reader;
@@ -798,7 +772,6 @@
*/
public boolean supportsBackup()
{
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -811,8 +784,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -825,8 +796,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
int msgID = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -842,8 +811,6 @@
String backupID)
throws DirectoryException
{
-
-
int msgID = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -857,8 +824,6 @@
*/
public boolean supportsRestore()
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -872,8 +837,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
int msgID = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
index c18e149..895d818 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -154,8 +154,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
if (configEntry == null)
@@ -271,7 +269,6 @@
*/
public void finalizeBackend()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
try
@@ -300,7 +297,6 @@
*/
private boolean isMonitorConfigAttribute(Attribute attribute)
{
-
AttributeType attrType = attribute.getAttributeType();
if (attrType.hasName(ATTR_COMMON_NAME) ||
attrType.hasName(ATTR_BACKEND_ENABLED.toLowerCase()) ||
@@ -324,7 +320,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -335,7 +330,6 @@
*/
public long getEntryCount()
{
-
return DirectoryServer.getMonitorProviders().size() + 1;
}
@@ -352,7 +346,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -373,8 +366,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
// If the requested entry was null, then throw an exception.
if (entryDN == null)
{
@@ -464,7 +455,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
if (entryDN.equals(baseMonitorDN))
{
return true;
@@ -497,8 +487,6 @@
*/
public Entry getBaseMonitorEntry()
{
-
-
HashMap<ObjectClass,String> monitorClasses =
new LinkedHashMap<ObjectClass,String>(3);
monitorClasses.putAll(monitorObjectClasses);
@@ -671,7 +659,6 @@
*/
private Entry getMonitorEntry(DN entryDN, MonitorProvider monitorProvider)
{
-
HashMap<ObjectClass,String> monitorClasses =
new LinkedHashMap<ObjectClass,String>(3);
monitorClasses.putAll(monitorObjectClasses);
@@ -738,7 +725,6 @@
private Attribute createAttribute(String name, String lowerName,
String value)
{
-
AttributeType type = DirectoryServer.getAttributeType(lowerName);
if (type == null)
{
@@ -770,7 +756,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
int msgID = MSGID_MONITOR_ADD_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entry.getDN()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -796,7 +781,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
int msgID = MSGID_MONITOR_DELETE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -822,7 +806,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
int msgID = MSGID_MONITOR_MODIFY_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entry.getDN()),
String.valueOf(configEntryDN));
@@ -851,7 +834,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
int msgID = MSGID_MONITOR_MODIFY_DN_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(currentDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -873,8 +855,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException
{
-
-
// Get the base entry for the search, if possible. If it doesn't exist,
// then this will throw an exception.
DN baseDN = searchOperation.getBaseDN();
@@ -943,7 +923,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -956,7 +935,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -971,7 +949,6 @@
*/
public boolean supportsLDIFExport()
{
-
// We can export all the monitor entries as a point-in-time snapshot.
return true;
}
@@ -995,8 +972,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
-
// Create the LDIF writer.
LDIFWriter ldifWriter;
try
@@ -1110,7 +1085,6 @@
*/
public boolean supportsLDIFImport()
{
-
// This backend does not support LDIF imports.
return false;
}
@@ -1134,8 +1108,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
// This backend does not support LDIF imports.
int msgID = MSGID_MONITOR_IMPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1158,7 +1130,6 @@
*/
public boolean supportsBackup()
{
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1183,8 +1154,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1207,8 +1176,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_MONITOR_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1234,8 +1201,6 @@
String backupID)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_MONITOR_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1253,8 +1218,6 @@
*/
public boolean supportsRestore()
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1278,8 +1241,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_MONITOR_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1298,7 +1259,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1313,7 +1273,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
// There are no configurable attributes that will be explicitly advertised.
return new LinkedList<ConfigAttribute>();
}
@@ -1337,8 +1296,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// We'll pretty much accept anything here as long as it isn't one of our
// private attributes.
return true;
@@ -1365,8 +1322,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
index d0a1695..f4f790a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -179,8 +179,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
if (configEntry == null)
@@ -370,7 +368,6 @@
*/
public void finalizeBackend()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -387,7 +384,6 @@
*/
private boolean isDSEConfigAttribute(Attribute attribute)
{
-
AttributeType attrType = attribute.getAttributeType();
if (attrType.hasName(ATTR_ROOT_DSE_SUBORDINATE_BASE_DN.toLowerCase()) ||
attrType.hasName(ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES.toLowerCase()) ||
@@ -408,7 +404,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -419,7 +414,6 @@
*/
public synchronized long getEntryCount()
{
-
// There is always just a single entry in this backend.
return 1;
}
@@ -437,7 +431,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -458,8 +451,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
// If the requested entry was the root DSE, then create and return it.
if ((entryDN == null) || entryDN.isNullDN())
{
@@ -504,7 +495,6 @@
*/
public Entry getRootDSE()
{
-
HashMap<AttributeType,List<Attribute>> dseUserAttrs =
new HashMap<AttributeType,List<Attribute>>();
@@ -770,7 +760,6 @@
private Attribute createAttribute(String name, String lowerName,
String value)
{
-
AttributeType type = DirectoryServer.getAttributeType(lowerName);
if (type == null)
{
@@ -799,7 +788,6 @@
private Attribute createDNAttribute(String name, String lowerName,
Collection<DN> values)
{
-
AttributeType type = DirectoryServer.getAttributeType(lowerName);
if (type == null)
{
@@ -832,7 +820,6 @@
private Attribute createAttribute(String name, String lowerName,
Collection<String> values)
{
-
AttributeType type = DirectoryServer.getAttributeType(lowerName);
if (type == null)
{
@@ -869,8 +856,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
-
// If the specified DN was the null DN, then it exists.
if (entryDN.isNullDN())
{
@@ -923,7 +908,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
int msgID = MSGID_ROOTDSE_ADD_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entry.getDN()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -949,7 +933,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
int msgID = MSGID_ROOTDSE_DELETE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -975,7 +958,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
int msgID = MSGID_ROOTDSE_MODIFY_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entry.getDN()),
String.valueOf(configEntryDN));
@@ -1004,7 +986,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
int msgID = MSGID_ROOTDSE_MODIFY_DN_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(currentDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -1030,7 +1011,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException, CancelledOperationException
{
-
DN baseDN = searchOperation.getBaseDN();
if (! baseDN.isNullDN())
{
@@ -1172,7 +1152,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -1185,7 +1164,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -1200,7 +1178,6 @@
*/
public boolean supportsLDIFExport()
{
-
// We will only export the DSE entry itself.
return true;
}
@@ -1224,8 +1201,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
-
// Create the LDIF writer.
LDIFWriter ldifWriter;
try
@@ -1291,7 +1266,6 @@
*/
public boolean supportsLDIFImport()
{
-
// This backend does not support LDIF imports.
return false;
}
@@ -1315,8 +1289,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
// This backend does not support LDIF imports.
int msgID = MSGID_ROOTDSE_IMPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1339,7 +1311,6 @@
*/
public boolean supportsBackup()
{
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1364,8 +1335,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1388,8 +1357,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_ROOTDSE_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1415,8 +1382,6 @@
String backupID)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_ROOTDSE_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1434,8 +1399,6 @@
*/
public boolean supportsRestore()
{
-
-
// This backend does not provide a backup/restore mechanism.
return false;
}
@@ -1459,8 +1422,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_ROOTDSE_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1479,7 +1440,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1494,7 +1454,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
String description = getMessage(MSGID_ROOTDSE_SUBORDINATE_BASE_DESCRIPTION);
@@ -1537,8 +1496,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configIsAcceptable = true;
@@ -1632,8 +1589,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
index 0a17321..e4f1fc3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -265,8 +265,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete initialization.
if (configEntry == null)
@@ -441,7 +439,6 @@
*/
public void finalizeBackend()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
for (DN baseDN : baseDNs)
@@ -473,7 +470,6 @@
*/
private boolean isSchemaConfigAttribute(Attribute attribute)
{
-
AttributeType attrType = attribute.getAttributeType();
if (attrType.hasName(ATTR_SCHEMA_ENTRY_DN.toLowerCase()) ||
attrType.hasName(ATTR_BACKEND_ENABLED.toLowerCase()) ||
@@ -503,7 +499,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -514,7 +509,6 @@
*/
public long getEntryCount()
{
-
// There is always only a single entry in this backend.
return 1;
}
@@ -532,7 +526,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -553,8 +546,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
// If the requested entry was one of the schema entries, then create and
// return it.
DN[] dnArray = baseDNs;
@@ -582,7 +573,6 @@
*/
public Entry getSchemaEntry(DN entryDN)
{
-
LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
new LinkedHashMap<AttributeType,List<Attribute>>();
@@ -877,8 +867,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
-
// The specified DN must be one of the specified schema DNs.
DN[] baseArray = baseDNs;
for (DN baseDN : baseArray)
@@ -910,7 +898,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
int msgID = MSGID_SCHEMA_ADD_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entry.getDN()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -936,7 +923,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
int msgID = MSGID_SCHEMA_DELETE_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(entryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -962,8 +948,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
-
// Make sure that the authenticated user has the necessary UPDATE_SCHEMA
// privilege.
ClientConnection clientConnection = modifyOperation.getClientConnection();
@@ -1491,8 +1475,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified attribute type already exists. We'll check
// the OID and all of the names, which means that it's possible there could
// be more than one match (although if there is, then we'll refuse the
@@ -1675,8 +1657,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified attribute type is actually defined in the server
// schema. If not, then fail.
AttributeType removeType = schema.getAttributeType(attributeType.getOID());
@@ -1848,8 +1828,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified objectclass already exists. We'll check the
// OID and all of the names, which means that it's possible there could be
// more than one match (although if there is, then we'll refuse the
@@ -2030,8 +2008,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified objectclass is actually defined in the server
// schema. If not, then fail.
ObjectClass removeClass = schema.getObjectClass(objectClass.getOID());
@@ -2167,8 +2143,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified name form already exists. We'll check the
// OID and all of the names, which means that it's possible there could be
// more than one match (although if there is, then we'll refuse the
@@ -2364,8 +2338,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified name form is actually defined in the server schema.
// If not, then fail.
NameForm removeNF = schema.getNameForm(nameForm.getOID());
@@ -2470,8 +2442,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified DIT content rule already exists. We'll check
// all of the names, which means that it's possible there could be more than
// one match (although if there is, then we'll refuse the operation).
@@ -2722,8 +2692,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified DIT content rule is actually defined in the server
// schema. If not, then fail.
DITContentRule removeDCR =
@@ -2773,8 +2741,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified DIT structure rule already exists. We'll
// check the rule ID and all of the names, which means that it's possible
// there could be more than one match (although if there is, then we'll
@@ -2943,8 +2909,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified DIT structure rule is actually defined in the server
// schema. If not, then fail.
DITStructureRule removeDSR =
@@ -3054,8 +3018,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// First, see if the specified matching rule use already exists. We'll
// check all of the names, which means that it's possible that there could
// be more than one match (although if there is, then we'll refuse the
@@ -3221,8 +3183,6 @@
Set<String> modifiedSchemaFiles)
throws DirectoryException
{
-
-
// See if the specified DIT content rule is actually defined in the server
// schema. If not, then fail.
MatchingRuleUse removeMRU =
@@ -3258,7 +3218,6 @@
*/
private Entry createEmptySchemaEntry()
{
-
LinkedHashMap<ObjectClass,String> objectClasses =
new LinkedHashMap<ObjectClass,String>();
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
@@ -3322,8 +3281,6 @@
private File writeTempSchemaFile(Schema schema, String schemaFile)
throws DirectoryException, IOException, LDIFException
{
-
-
// Start with an empty schema entry.
Entry schemaEntry = createEmptySchemaEntry();
@@ -3512,7 +3469,6 @@
int depth)
throws DirectoryException
{
-
if (depth > 20)
{
int msgID = MSGID_SCHEMA_MODIFY_CIRCULAR_REFERENCE_AT;
@@ -3565,7 +3521,6 @@
int depth)
throws DirectoryException
{
-
if (depth > 20)
{
int msgID = MSGID_SCHEMA_MODIFY_CIRCULAR_REFERENCE_OC;
@@ -3618,7 +3573,6 @@
HashSet<DITStructureRule> addedDSRs, int depth)
throws DirectoryException
{
-
if (depth > 20)
{
int msgID = MSGID_SCHEMA_MODIFY_CIRCULAR_REFERENCE_DSR;
@@ -3661,8 +3615,6 @@
private void installSchemaFiles(HashMap<String,File> tempSchemaFiles)
throws DirectoryException
{
-
-
// Create lists that will hold the three types of files we'll be dealing
// with (the temporary files that will be installed, the installed schema
// files, and the previously-installed schema files).
@@ -3897,7 +3849,6 @@
private void copyFile(File from, File to)
throws IOException
{
-
byte[] buffer = new byte[4096];
FileInputStream inputStream = null;
FileOutputStream outputStream = null;
@@ -3948,7 +3899,6 @@
*/
private void cleanUpTempSchemaFiles(HashMap<String,File> tempSchemaFiles)
{
-
if ((tempSchemaFiles == null) || tempSchemaFiles.isEmpty())
{
return;
@@ -3994,7 +3944,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
int msgID = MSGID_SCHEMA_MODIFY_DN_NOT_SUPPORTED;
String message = getMessage(msgID, String.valueOf(currentDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -4016,7 +3965,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException
{
-
DN baseDN = searchOperation.getBaseDN();
boolean found = false;
@@ -4069,7 +4017,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -4082,7 +4029,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -4097,7 +4043,6 @@
*/
public boolean supportsLDIFExport()
{
-
// We will only export the DSE entry itself.
return true;
}
@@ -4121,8 +4066,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
-
// Create the LDIF writer.
LDIFWriter ldifWriter;
try
@@ -4188,7 +4131,6 @@
*/
public boolean supportsLDIFImport()
{
-
// This backend does not support LDIF imports.
// FIXME -- Should we support them?
return false;
@@ -4213,8 +4155,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
// This backend does not support LDIF imports.
int msgID = MSGID_SCHEMA_IMPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -4237,7 +4177,6 @@
*/
public boolean supportsBackup()
{
-
// We do support an online backup mechanism for the schema.
return true;
}
@@ -4262,8 +4201,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// We should support online backup for the schema in any form. This
// implementation does not support incremental backups, but in this case
// even if we're asked to do an incremental we'll just do a full backup
@@ -4289,8 +4226,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// Get the properties to use for the backup. We don't care whether or not
// it's incremental, so there's no need to get that.
String backupID = backupConfig.getBackupID();
@@ -4659,8 +4594,6 @@
String backupID)
throws DirectoryException
{
-
-
// This backend does not provide a backup/restore mechanism.
int msgID = MSGID_SCHEMA_BACKUP_AND_RESTORE_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -4678,8 +4611,6 @@
*/
public boolean supportsRestore()
{
-
-
// We will provide a restore, but only for offline operations.
return true;
}
@@ -4703,8 +4634,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// First, make sure that the requested backup exists.
BackupDirectory backupDirectory = restoreConfig.getBackupDirectory();
String backupPath = backupDirectory.getPath();
@@ -5213,7 +5142,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -5228,7 +5156,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
String description = getMessage(MSGID_SCHEMA_DESCRIPTION_ENTRY_DN);
@@ -5271,8 +5198,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configIsAcceptable = true;
@@ -5350,8 +5275,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -5557,7 +5480,6 @@
*/
boolean showAllAttributes()
{
-
return showAllAttributes;
}
@@ -5573,7 +5495,6 @@
*/
void setShowAllAttributes(boolean showAllAttributes)
{
-
this.showAllAttributes = showAllAttributes;
}
@@ -5588,7 +5509,6 @@
*/
public DN getComponentEntryDN()
{
-
return configEntryDN;
}
@@ -5603,7 +5523,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -5621,7 +5540,6 @@
*/
public LinkedHashMap<String,String> getAlerts()
{
-
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_CANNOT_COPY_SCHEMA_FILES,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 3d4a8f0..498e5da 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -165,7 +165,6 @@
*/
private void readerBegin()
{
-
threadTotalCount.getAndIncrement();
}
@@ -176,7 +175,6 @@
*/
private void readerEnd()
{
-
threadTotalCount.getAndDecrement();
}
@@ -187,7 +185,6 @@
*/
private void writerBegin()
{
-
threadTotalCount.getAndIncrement();
threadWriteCount.getAndIncrement();
}
@@ -199,7 +196,6 @@
*/
private void writerEnd()
{
-
threadWriteCount.getAndDecrement();
threadTotalCount.getAndDecrement();
}
@@ -213,7 +209,6 @@
*/
private void waitUntilQuiescent()
{
-
while (threadTotalCount.get() > 0)
{
// Still have threads in the database so sleep a little
@@ -241,7 +236,6 @@
*/
public static String getContainerName(DN dn)
{
-
String normStr = dn.toNormalizedString();
StringBuilder builder = new StringBuilder(normStr.length());
for (int i = 0; i < normStr.length(); i++)
@@ -280,7 +274,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
configDN = configEntry.getDN();
// Initialize a config object
@@ -400,7 +393,6 @@
*/
public void finalizeBackend()
{
-
// Deregister our configurable components.
// TODO: configurableEnv is always null and will not be deregistered.
if (configurableEnv != null)
@@ -478,7 +470,6 @@
*/
public boolean isLocal()
{
-
return true;
}
@@ -493,7 +484,6 @@
*/
public boolean supportsLDIFExport()
{
-
return true;
}
@@ -508,7 +498,6 @@
*/
public boolean supportsLDIFImport()
{
-
return true;
}
@@ -527,7 +516,6 @@
*/
public boolean supportsBackup()
{
-
return true;
}
@@ -550,7 +538,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
return true;
}
@@ -564,7 +551,6 @@
*/
public boolean supportsRestore()
{
-
return true;
}
@@ -577,7 +563,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return new HashSet<String>(); //NYI
}
@@ -590,7 +575,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -603,7 +587,6 @@
*/
public DN[] getBaseDNs()
{
-
return config.getBaseDNs();
}
@@ -614,7 +597,6 @@
*/
public long getEntryCount()
{
-
if (rootContainer != null)
{
try
@@ -647,7 +629,6 @@
*/
public Entry getEntry(DN entryDN) throws DirectoryException
{
-
readerBegin();
try
{
@@ -704,7 +685,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
writerBegin();
try
{
@@ -761,7 +741,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
writerBegin();
try
{
@@ -816,7 +795,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
writerBegin();
try
{
@@ -879,7 +857,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException, CancelledOperationException
{
-
writerBegin();
try
{
@@ -939,7 +916,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException
{
-
readerBegin();
try
{
@@ -981,7 +957,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
// Initialize a config object.
config = new Config();
@@ -1101,7 +1076,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
// Initialize a config object.
config = new Config();
@@ -1179,7 +1153,6 @@
DN[] baseDNs, Entry statEntry)
throws InitializationException, ConfigException, DirectoryException
{
-
// Initialize a config object.
config = new Config();
config.initializeConfig(configEntry, baseDNs);
@@ -1263,7 +1236,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
BackupManager backupManager =
new BackupManager(getBackendID());
backupManager.createBackup(configEntry, backupConfig);
@@ -1285,7 +1257,6 @@
public void removeBackup(BackupDirectory backupDirectory, String backupID)
throws DirectoryException
{
-
BackupManager backupManager =
new BackupManager(getBackendID());
backupManager.removeBackup(backupDirectory, backupID);
@@ -1308,7 +1279,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
BackupManager backupManager =
new BackupManager(getBackendID());
backupManager.restoreBackup(configEntry, restoreConfig);
@@ -1325,7 +1295,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configDN;
}
@@ -1340,7 +1309,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
return configAttrs;
}
@@ -1362,7 +1330,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
DN[] baseDNs = null;
boolean acceptable = true;
@@ -1422,7 +1389,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
ConfigChangeResult ccr;
ResultCode resultCode = ResultCode.SUCCESS;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index d833aac..e44966b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -146,8 +146,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// Parse our backend configuration.
Config config = new Config();
try
@@ -965,8 +963,6 @@
Set<String> includeFiles)
throws DirectoryException,IOException
{
-
-
BackupDirectory backupDir = restoreConfig.getBackupDirectory();
boolean verifyOnly = restoreConfig.verifyOnly();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 0343827..dfe2d57 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -3376,7 +3376,6 @@
*/
public void listDatabases(List<Database> dbList)
{
-
// There may be more than one handle open for a given database
// so we eliminate duplicates here.
HashSet<String> set = new HashSet<String>();
@@ -3770,7 +3769,6 @@
*/
public String getContainerName()
{
-
String normStr = baseDN.toNormalizedString();
StringBuilder builder = new StringBuilder(normStr.length());
for (int i = 0; i < normStr.length(); i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
index 7d458ed..5c7320c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
@@ -92,7 +92,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
index 6e5627c..583855d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
@@ -85,7 +85,6 @@
static public byte[] decodeDatabaseEntry(byte[] bytes)
throws ASN1Exception,DataFormatException
{
-
// FIXME: This array copy could be very costly on performance. We need to
// FIXME: find a faster way to implement this versioning feature.
// Remove version number from the encoded bytes
@@ -157,7 +156,6 @@
static public Entry entryFromDatabase(byte[] bytes)
throws DirectoryException,ASN1Exception,LDAPException,DataFormatException
{
-
byte[] uncompressedBytes = decodeDatabaseEntry(bytes);
return decodeDirectoryServerEntry(uncompressedBytes);
}
@@ -176,7 +174,6 @@
static private Entry decodeDirectoryServerEntry(byte[] bytes)
throws DirectoryException,ASN1Exception,LDAPException
{
-
HashMap<ObjectClass, String> objectClasses;
HashMap<AttributeType, List<Attribute>> userAttributes =
new HashMap<AttributeType, List<Attribute>>();
@@ -261,7 +258,6 @@
*/
static public byte[] encodeDatabaseEntry(byte[] bytes, DataConfig dataConfig)
{
-
int uncompressedSize = 0;
// Do optional compression.
@@ -312,7 +308,6 @@
*/
static public byte[] entryToDatabase(Entry entry, DataConfig dataConfig)
{
-
byte[] uncompressedBytes = encodeDirectoryServerEntry(entry);
return encodeDatabaseEntry(uncompressedBytes, dataConfig);
}
@@ -325,7 +320,6 @@
*/
static public byte[] entryToDatabase(Entry entry)
{
-
return entryToDatabase(entry, new DataConfig());
}
@@ -337,7 +331,6 @@
*/
static private byte[] encodeDirectoryServerEntry(Entry entry)
{
-
// Encode the DN (LDAPDN).
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1OctetString(entry.getDN().toString()));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
index 504f0cf..5de74a2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -211,7 +211,6 @@
boolean isLocking,
boolean runCheckPointer) throws DatabaseException
{
-
EnvironmentConfig envConfig;
if(config.getEnvironmentConfig() != null)
{
@@ -365,7 +364,6 @@
*/
public void preload()
{
-
long timeLimit = config.getPreloadTimeLimit();
if (timeLimit > 0)
@@ -442,7 +440,6 @@
private void cleanDatabase()
throws DatabaseException
{
-
int msgID;
String message;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index f19a451..35fd20f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -205,7 +205,6 @@
public void verifyBackend(RootContainer rootContainer, Entry statEntry) throws
DatabaseException, JebException
{
-
this.rootContainer = rootContainer;
EntryContainer entryContainer =
rootContainer.getEntryContainer(verifyConfig.getBaseDN());
@@ -1582,7 +1581,6 @@
*/
class ProgressTask extends TimerTask
{
-
/**
* The number of records that had been processed at the time of the
* previous progress report.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
index 4d8dcbe..97ecef2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -95,7 +95,6 @@
public RecurringTask(TaskScheduler taskScheduler, Entry recurringTaskEntry)
throws DirectoryException
{
-
this.taskScheduler = taskScheduler;
this.recurringTaskEntry = recurringTaskEntry;
this.recurringTaskEntryDN = recurringTaskEntry.getDN();
@@ -279,7 +278,6 @@
*/
public String getRecurringTaskID()
{
-
return recurringTaskID;
}
@@ -292,7 +290,6 @@
*/
public DN getRecurringTaskEntryDN()
{
-
return recurringTaskEntryDN;
}
@@ -305,7 +302,6 @@
*/
public Entry getRecurringTaskEntry()
{
-
return recurringTaskEntry;
}
@@ -320,7 +316,6 @@
*/
public String getTaskClassName()
{
-
return taskClassName;
}
@@ -333,7 +328,6 @@
*/
public Task scheduleNextIteration()
{
-
// NYI
return null;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
index a305cca..62dfc6b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
@@ -142,7 +142,6 @@
Entry taskEntry)
throws InitializationException
{
-
this.taskScheduler = taskScheduler;
this.taskEntry = taskEntry;
this.taskEntryDN = taskEntry.getDN();
@@ -346,7 +345,6 @@
private String getAttributeValue(String attributeName, boolean isRequired)
throws InitializationException
{
-
List<Attribute> attrList =
taskEntry.getAttribute(attributeName.toLowerCase());
if ((attrList == null) || attrList.isEmpty())
@@ -418,7 +416,6 @@
private LinkedList<String> getAttributeValues(String attributeName)
throws InitializationException
{
-
LinkedList<String> valueStrings = new LinkedList<String>();
List<Attribute> attrList =
@@ -453,7 +450,6 @@
*/
public final DN getTaskEntryDN()
{
-
return taskEntryDN;
}
@@ -466,7 +462,6 @@
*/
public final Entry getTaskEntry()
{
-
return taskEntry;
}
@@ -485,7 +480,6 @@
*/
public final Operation getOperation()
{
-
return operation;
}
@@ -498,7 +492,6 @@
*/
public final void setOperation(Operation operation)
{
-
this.operation = operation;
}
@@ -511,7 +504,6 @@
*/
public final String getTaskID()
{
-
return taskID;
}
@@ -527,7 +519,6 @@
*/
public final String getRecurringTaskID()
{
-
return recurringTaskID;
}
@@ -540,7 +531,6 @@
*/
public final TaskState getTaskState()
{
-
return taskState;
}
@@ -555,7 +545,6 @@
*/
void setTaskState(TaskState taskState)
{
-
Lock lock = taskScheduler.writeLockEntry(taskEntryDN);
try
@@ -597,7 +586,6 @@
*/
public final long getScheduledStartTime()
{
-
return scheduledStartTime;
}
@@ -613,7 +601,6 @@
*/
public final long getActualStartTime()
{
-
return actualStartTime;
}
@@ -628,7 +615,6 @@
*/
private void setActualStartTime(long actualStartTime)
{
-
Lock lock = taskScheduler.writeLockEntry(taskEntryDN);
try
@@ -675,7 +661,6 @@
*/
public final long getCompletionTime()
{
-
return completionTime;
}
@@ -690,7 +675,6 @@
*/
private void setCompletionTime(long completionTime)
{
-
Lock lock = taskScheduler.writeLockEntry(taskEntryDN);
try
@@ -734,7 +718,6 @@
*/
public final LinkedList<String> getDependencyIDs()
{
-
return dependencyIDs;
}
@@ -749,7 +732,6 @@
*/
public final FailedDependencyAction getFailedDependencyAction()
{
-
return failedDependencyAction;
}
@@ -768,7 +750,6 @@
*/
public final LinkedList<String> getNotifyOnCompletionAddresses()
{
-
return notifyOnCompletion;
}
@@ -785,7 +766,6 @@
*/
public final LinkedList<String> getNotifyOnErrorAddresses()
{
-
return notifyOnError;
}
@@ -799,7 +779,6 @@
*/
public final LinkedList<String> getLogMessages()
{
-
return logMessages;
}
@@ -890,7 +869,6 @@
void addLogMessage(ErrorLogSeverity severity, int messageID,
String messageString)
{
-
Lock lock = taskScheduler.writeLockEntry(taskEntryDN);
try
@@ -972,7 +950,6 @@
*/
public final int compareTo(Task task)
{
-
if (completionTime > 0)
{
if (task.completionTime > 0)
@@ -1064,7 +1041,6 @@
*/
public final TaskState execute()
{
-
setActualStartTime(TimeThread.getTime());
setTaskState(TaskState.RUNNING);
taskScheduler.writeState();
@@ -1114,7 +1090,6 @@
public void initializeTask()
throws DirectoryException
{
-
// No action is performed by default.
}
@@ -1142,7 +1117,6 @@
*/
public void interruptTask(TaskState interruptState, String interruptReason)
{
-
// No action is performed by default.
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
index f6054b6..32b6849 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -183,8 +183,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
-
// Make sure that a configuration entry was provided. If not, then we will
// not be able to complete the initialization.
if (configEntry == null)
@@ -375,8 +373,6 @@
*/
public void finalizeBackend()
{
-
-
DirectoryServer.deregisterConfigurableComponent(this);
@@ -430,7 +426,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -441,7 +436,6 @@
*/
public long getEntryCount()
{
-
if (taskScheduler != null)
{
return taskScheduler.getEntryCount();
@@ -463,7 +457,6 @@
*/
public boolean isLocal()
{
-
// For the purposes of this method, this is a local backend.
return true;
}
@@ -484,8 +477,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
if (entryDN == null)
{
return null;
@@ -546,8 +537,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
-
if (entryDN == null)
{
return false;
@@ -597,8 +586,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
-
// Get the DN for the entry and then get its parent.
DN entryDN = entry.getDN();
DN parentDN = entryDN.getParentDNInSuffix();
@@ -657,8 +644,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
-
// Get the parent for the provided entry DN. It must be either the
// scheduled or recurring task parent DN.
DN parentDN = entryDN.getParentDNInSuffix();
@@ -744,7 +729,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
// FIXME -- We need to support this.
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
"Modify operations are not yet supported in " +
@@ -772,8 +756,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
-
int msgID = MSGID_TASKBE_MODIFY_DN_NOT_SUPPORTED;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -799,8 +781,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException, CancelledOperationException
{
-
-
// Look at the base DN and scope for the search operation to decide which
// entries we need to look at.
boolean searchRoot = false;
@@ -1019,7 +999,6 @@
*/
public HashSet<String> getSupportedControls()
{
-
return supportedControls;
}
@@ -1032,7 +1011,6 @@
*/
public HashSet<String> getSupportedFeatures()
{
-
return supportedFeatures;
}
@@ -1047,7 +1025,6 @@
*/
public boolean supportsLDIFExport()
{
-
// LDIF exports are supported.
return true;
}
@@ -1071,8 +1048,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
-
// FIXME -- Implement support for exporting to LDIF.
}
@@ -1087,7 +1062,6 @@
*/
public boolean supportsLDIFImport()
{
-
// This backend does not support LDIF imports.
return false;
}
@@ -1111,8 +1085,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
-
// This backend does not support LDIF imports.
int msgID = MSGID_TASKBE_IMPORT_NOT_SUPPORTED;
String message = getMessage(msgID);
@@ -1135,7 +1107,6 @@
*/
public boolean supportsBackup()
{
-
// This backend does provide a backup/restore mechanism.
return true;
}
@@ -1160,8 +1131,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// This backend does provide a backup/restore mechanism.
return true;
}
@@ -1184,8 +1153,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// NYI -- Create the backup.
}
@@ -1207,8 +1174,6 @@
String backupID)
throws DirectoryException
{
-
-
// NYI -- Remove the backup.
}
@@ -1222,8 +1187,6 @@
*/
public boolean supportsRestore()
{
-
-
// This backend does provide a backup/restore mechanism.
return true;
}
@@ -1247,8 +1210,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// NYI -- Restore the backup.
}
@@ -1263,7 +1224,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1278,7 +1238,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
String description = getMessage(MSGID_TASKBE_DESCRIPTION_BACKING_FILE);
@@ -1315,8 +1274,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configIsAcceptable = true;
@@ -1444,8 +1401,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -1597,7 +1552,6 @@
*/
public DN getConfigEntryDN()
{
-
return configEntryDN;
}
@@ -1612,7 +1566,6 @@
*/
public String getTaskBackingFile()
{
-
File f = getFileForPath(taskBackingFile);
return f.getPath();
}
@@ -1628,7 +1581,6 @@
*/
public long getRetentionTime()
{
-
return retentionTime;
}
@@ -1643,7 +1595,6 @@
*/
public DN getTaskRootDN()
{
-
return taskRootDN;
}
@@ -1658,7 +1609,6 @@
*/
public DN getRecurringTasksParentDN()
{
-
return recurringTaskParentDN;
}
@@ -1673,7 +1623,6 @@
*/
public DN getScheduledTasksParentDN()
{
-
return scheduledTaskParentDN;
}
@@ -1689,7 +1638,6 @@
*/
public Task getScheduledTask(DN taskEntryDN)
{
-
return taskScheduler.getScheduledTask(taskEntryDN);
}
@@ -1706,7 +1654,6 @@
*/
public RecurringTask getRecurringTask(DN taskEntryDN)
{
-
return taskScheduler.getRecurringTask(taskEntryDN);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
index 2dda40b..85d8e37 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -209,7 +209,6 @@
boolean scheduleIteration)
throws DirectoryException
{
-
schedulerLock.lock();
try
@@ -260,7 +259,6 @@
public RecurringTask removeRecurringTask(String recurringTaskID)
throws DirectoryException
{
-
schedulerLock.lock();
try
@@ -311,7 +309,6 @@
public void scheduleTask(Task task, boolean writeState)
throws DirectoryException
{
-
schedulerLock.lock();
@@ -381,7 +378,6 @@
*/
public Task cancelTask(String taskID)
{
-
schedulerLock.lock();
try
@@ -424,7 +420,6 @@
public Task removePendingTask(String taskID)
throws DirectoryException
{
-
schedulerLock.lock();
try
@@ -472,7 +467,6 @@
public Task removeCompletedTask(String taskID)
throws DirectoryException
{
-
schedulerLock.lock();
try
@@ -517,7 +511,6 @@
*/
public boolean threadDone(TaskThread taskThread, Task completedTask)
{
-
schedulerLock.lock();
try
@@ -613,7 +606,6 @@
*/
public void addCompletedTask(Task completedTask)
{
-
// The scheduler lock is reentrant, so even if we already hold it, we can
// acquire it again.
schedulerLock.lock();
@@ -639,7 +631,6 @@
*/
public void stopScheduler()
{
-
stopRequested = true;
try
@@ -695,8 +686,6 @@
public void interruptRunningTasks(TaskState interruptState,
String interruptReason, boolean waitForStop)
{
-
-
// Grab a copy of the running threads so that we can operate on them without
// holding the lock.
LinkedList<TaskThread> threadList = new LinkedList<TaskThread>();
@@ -759,7 +748,6 @@
*/
public void run()
{
-
isRunning = true;
schedulerThread = currentThread();
@@ -886,7 +874,6 @@
*/
private TaskState shouldStart(Task task)
{
-
if (! isRunning)
{
return TaskState.UNSCHEDULED;
@@ -927,7 +914,6 @@
private void initializeTasksFromBackingFile()
throws InitializationException
{
-
String backingFilePath = taskBackend.getTaskBackingFile();
try
@@ -1112,7 +1098,6 @@
private void createNewTaskBackingFile()
throws InitializationException
{
-
String backingFile = taskBackend.getTaskBackingFile();
LDIFExportConfig exportConfig =
new LDIFExportConfig(backingFile, ExistingFileBehavior.OVERWRITE);
@@ -1176,8 +1161,6 @@
*/
public void writeState()
{
-
-
String backingFilePath = taskBackend.getTaskBackingFile();
String tmpFilePath = backingFilePath + ".tmp";
LDIFExportConfig exportConfig =
@@ -1354,7 +1337,6 @@
*/
public long getEntryCount()
{
-
schedulerLock.lock();
try
@@ -1378,7 +1360,6 @@
*/
public Entry getTaskRootEntry()
{
-
return taskRootEntry;
}
@@ -1393,7 +1374,6 @@
*/
public Entry getScheduledTaskParentEntry()
{
-
return scheduledTaskParentEntry;
}
@@ -1408,7 +1388,6 @@
*/
public Entry getRecurringTaskParentEntry()
{
-
return recurringTaskParentEntry;
}
@@ -1424,7 +1403,6 @@
*/
public Task getScheduledTask(String taskID)
{
-
schedulerLock.lock();
try
@@ -1450,7 +1428,6 @@
*/
public Task getScheduledTask(DN taskEntryDN)
{
-
schedulerLock.lock();
try
@@ -1483,7 +1460,6 @@
*/
Lock writeLockEntry(DN entryDN)
{
-
Lock lock = LockManager.lockWrite(entryDN);
while (lock == null)
{
@@ -1508,7 +1484,6 @@
Lock readLockEntry(DN entryDN)
throws DirectoryException
{
-
Lock lock = LockManager.lockRead(entryDN);
for (int i=0; ((lock == null) && (i < 4)); i++)
{
@@ -1538,7 +1513,6 @@
*/
void unlockEntry(DN entryDN, Lock lock)
{
-
LockManager.unlock(entryDN, lock);
}
@@ -1556,8 +1530,6 @@
*/
public Entry getScheduledTaskEntry(DN scheduledTaskEntryDN)
{
-
-
schedulerLock.lock();
try
@@ -1601,7 +1573,6 @@
public boolean searchScheduledTasks(SearchOperation searchOperation)
throws DirectoryException
{
-
SearchFilter filter = searchOperation.getFilter();
schedulerLock.lock();
@@ -1651,7 +1622,6 @@
*/
public RecurringTask getRecurringTask(String recurringTaskID)
{
-
schedulerLock.lock();
try
@@ -1677,7 +1647,6 @@
*/
public RecurringTask getRecurringTask(DN recurringTaskEntryDN)
{
-
schedulerLock.lock();
try
@@ -1712,8 +1681,6 @@
*/
public Entry getRecurringTaskEntry(DN recurringTaskEntryDN)
{
-
-
schedulerLock.lock();
try
@@ -1757,7 +1724,6 @@
public boolean searchRecurringTasks(SearchOperation searchOperation)
throws DirectoryException
{
-
SearchFilter filter = searchOperation.getFilter();
schedulerLock.lock();
@@ -1812,8 +1778,6 @@
public Task entryToScheduledTask(Entry entry, Operation operation)
throws DirectoryException
{
-
-
// Get the name of the class that implements the task logic.
AttributeType attrType =
DirectoryServer.getAttributeType(ATTR_TASK_CLASS.toLowerCase());
@@ -1955,7 +1919,6 @@
public RecurringTask entryToRecurringTask(Entry entry)
throws DirectoryException
{
-
return new RecurringTask(this, entry);
}
@@ -1970,7 +1933,6 @@
*/
public DN getComponentEntryDN()
{
-
return taskBackend.getConfigEntryDN();
}
@@ -1985,7 +1947,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -2003,7 +1964,6 @@
*/
public LinkedHashMap<String,String> getAlerts()
{
-
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_CANNOT_FIND_RECURRING_TASK,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
index ef54472..e3f86b3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
@@ -135,8 +135,6 @@
*/
public static boolean isPending(TaskState taskState)
{
-
-
switch (taskState)
{
case UNSCHEDULED:
@@ -160,8 +158,6 @@
*/
public static boolean isRunning(TaskState taskState)
{
-
-
switch (taskState)
{
case RUNNING:
@@ -186,8 +182,6 @@
*/
public static boolean isDone(TaskState taskState)
{
-
-
switch (taskState)
{
case UNSCHEDULED:
@@ -214,8 +208,6 @@
*/
public static boolean isSuccessful(TaskState taskState)
{
-
-
switch (taskState)
{
case WAITING_ON_START_TIME:
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
index cd154a5..aa39885 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
@@ -100,7 +100,6 @@
*/
public Task getTask()
{
-
return task;
}
@@ -114,7 +113,6 @@
*/
public void setTask(Task task)
{
-
this.task = task;
synchronized (notifyLock)
@@ -138,7 +136,6 @@
public void interruptTask(TaskState interruptState, String interruptReason,
boolean exitThread)
{
-
if (task != null)
{
try
@@ -168,7 +165,6 @@
*/
public void run()
{
-
while (! exitRequested)
{
if (task == null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
index c1adf8e..4abbb5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -155,7 +155,6 @@
*/
public String getDataType()
{
-
return "Boolean";
}
@@ -168,7 +167,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultBooleanSyntax();
}
@@ -181,7 +179,6 @@
*/
public boolean activeValue()
{
-
return activeValue;
}
@@ -195,7 +192,6 @@
*/
public boolean pendingValue()
{
-
if (hasPendingValues())
{
return pendingValue;
@@ -215,7 +211,6 @@
*/
public void setValue(boolean booleanValue)
{
-
if (requiresAdminAction())
{
pendingValue = booleanValue;
@@ -239,7 +234,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(boolean booleanValue)
{
-
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
if (booleanValue)
@@ -265,7 +259,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -292,7 +285,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
String stringValue = value.getStringValue();
if (stringValue.equalsIgnoreCase(CONFIG_VALUE_TRUE) ||
stringValue.equalsIgnoreCase(CONFIG_VALUE_FALSE))
@@ -331,7 +323,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_IS_REQUIRED;
@@ -381,7 +372,6 @@
*/
public List<String> activeValuesToStrings()
{
-
ArrayList<String> valueStrings = new ArrayList<String>(1);
valueStrings.add(String.valueOf(activeValue));
@@ -403,7 +393,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
ArrayList<String> valueStrings = new ArrayList<String>(1);
@@ -443,8 +432,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
boolean activeValue = false;
boolean pendingValue = false;
boolean activeValueSet = false;
@@ -608,7 +595,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
-
return new javax.management.Attribute(getName(), activeValue);
}
@@ -640,7 +626,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
attributeList.add(new javax.management.Attribute(getName(), activeValue));
if (requiresAdminAction() && (pendingValue != activeValue))
@@ -666,7 +651,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
attributeInfoList.add(new MBeanAttributeInfo(getName(),
Boolean.class.getName(),
getDescription(), true, true,
@@ -693,7 +677,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
return new MBeanParameterInfo(getName(), Boolean.TYPE.getName(),
getDescription());
}
@@ -714,7 +697,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value instanceof Boolean)
{
@@ -758,7 +740,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new BooleanConfigAttribute(getName(), getDescription(),
requiresAdminAction(), activeValue,
pendingValue);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
index adbd76b..2bf7dcd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
@@ -103,8 +103,6 @@
protected ConfigAttribute(String name, String description, boolean isRequired,
boolean isMultiValued, boolean requiresAdminAction)
{
-
-
this.name = name;
this.description = description;
this.isRequired = isRequired;
@@ -138,8 +136,6 @@
boolean isMultiValued, boolean requiresAdminAction,
LinkedHashSet<AttributeValue> activeValues)
{
-
-
this.name = name;
this.description = description;
this.isRequired = isRequired;
@@ -191,8 +187,6 @@
boolean hasPendingValues,
LinkedHashSet<AttributeValue> pendingValues)
{
-
-
this.name = name;
this.description = description;
this.isRequired = isRequired;
@@ -235,7 +229,6 @@
*/
public String getName()
{
-
return name;
}
@@ -249,7 +242,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -285,7 +277,6 @@
*/
public boolean isRequired()
{
-
return isRequired;
}
@@ -299,7 +290,6 @@
*/
public boolean isMultiValued()
{
-
return isMultiValued;
}
@@ -315,7 +305,6 @@
*/
public boolean requiresAdminAction()
{
-
return requiresAdminAction;
}
@@ -329,7 +318,6 @@
*/
public LinkedHashSet<AttributeValue> getActiveValues()
{
-
return activeValues;
}
@@ -345,7 +333,6 @@
*/
public boolean hasPendingValues()
{
-
return hasPendingValues;
}
@@ -362,7 +349,6 @@
*/
public LinkedHashSet<AttributeValue> getPendingValues()
{
-
if (requiresAdminAction)
{
return pendingValues;
@@ -409,8 +395,6 @@
protected void setValues(LinkedHashSet<AttributeValue> values)
throws ConfigException
{
-
-
// If no values are provided, then check to see if this is a required
// attribute. If it is, then reject the change.
if ((values == null) || values.isEmpty())
@@ -521,7 +505,6 @@
*/
protected void setActiveValues(LinkedHashSet<AttributeValue> values)
{
-
activeValues = values;
}
@@ -536,7 +519,6 @@
*/
protected void setPendingValues(LinkedHashSet<AttributeValue> values)
{
-
pendingValues = values;
hasPendingValues = true;
}
@@ -558,8 +540,6 @@
protected void addValues(List<AttributeValue> values)
throws ConfigException
{
-
-
// If there are no values provided, then do nothing.
if (values == null)
{
@@ -656,8 +636,6 @@
protected void removeValues(List<AttributeValue> values)
throws ConfigException
{
-
-
// Create a temporary set of values that we will use for this change. It
// may not actually be applied if an error occurs for some reason.
LinkedHashSet<AttributeValue> tempValues;
@@ -725,7 +703,6 @@
protected void removeAllValues()
throws ConfigException
{
-
if (isRequired)
{
int msgID = MSGID_CONFIG_ATTR_IS_REQUIRED;
@@ -769,7 +746,6 @@
*/
public void setInitialValues(LinkedHashSet<AttributeValue> values)
{
-
if (values == null)
{
values = new LinkedHashSet<AttributeValue>();
@@ -789,7 +765,6 @@
*/
public void applyPendingValues()
{
-
if (hasPendingValues)
{
activeValues = pendingValues;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
index 5c91615..7d3b8c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
@@ -98,7 +98,6 @@
*/
public ConfigEntry(Entry entry, ConfigEntry parent)
{
-
this.entry = entry;
this.parent = parent;
@@ -118,7 +117,6 @@
*/
public Entry getEntry()
{
-
return entry;
}
@@ -136,7 +134,6 @@
*/
public void setEntry(Entry entry)
{
-
entryLock.lock();
try
@@ -158,7 +155,6 @@
*/
public DN getDN()
{
-
return entry.getDN();
}
@@ -176,7 +172,6 @@
*/
public boolean hasObjectClass(String name)
{
-
ObjectClass oc = DirectoryServer.getObjectClass(name.toLowerCase());
if (oc == null)
{
@@ -206,7 +201,6 @@
public ConfigAttribute getConfigAttribute(ConfigAttribute stub)
throws ConfigException
{
-
String attrName = stub.getName();
AttributeType attrType =
DirectoryServer.getAttributeType(attrName.toLowerCase());
@@ -236,7 +230,6 @@
*/
public void putConfigAttribute(ConfigAttribute attribute)
{
-
String name = attribute.getName();
AttributeType attrType =
DirectoryServer.getAttributeType(name.toLowerCase());
@@ -273,7 +266,6 @@
*/
public boolean removeConfigAttribute(String lowerName)
{
-
for (AttributeType t : entry.getUserAttributes().keySet())
{
if (t.hasNameOrOID(lowerName))
@@ -307,7 +299,6 @@
*/
public ConfigEntry getParent()
{
-
return parent;
}
@@ -321,7 +312,6 @@
*/
public ConcurrentHashMap<DN,ConfigEntry> getChildren()
{
-
return children;
}
@@ -335,7 +325,6 @@
*/
public boolean hasChildren()
{
-
return (! children.isEmpty());
}
@@ -357,8 +346,6 @@
public void addChild(ConfigEntry childEntry)
throws ConfigException
{
-
-
ConfigEntry conflictingChild;
entryLock.lock();
@@ -409,7 +396,6 @@
public ConfigEntry removeChild(DN childDN)
throws ConfigException
{
-
entryLock.lock();
try
@@ -473,7 +459,6 @@
*/
public ConfigEntry duplicate()
{
-
return new ConfigEntry(entry.duplicate(), parent);
}
@@ -488,7 +473,6 @@
*/
public CopyOnWriteArrayList<ConfigChangeListener> getChangeListeners()
{
-
return changeListeners;
}
@@ -503,7 +487,6 @@
*/
public void registerChangeListener(ConfigChangeListener listener)
{
-
changeListeners.add(listener);
}
@@ -520,7 +503,6 @@
*/
public boolean deregisterChangeListener(ConfigChangeListener listener)
{
-
return changeListeners.remove(listener);
}
@@ -535,7 +517,6 @@
*/
public CopyOnWriteArrayList<ConfigAddListener> getAddListeners()
{
-
return addListeners;
}
@@ -549,7 +530,6 @@
*/
public void registerAddListener(ConfigAddListener listener)
{
-
addListeners.addIfAbsent(listener);
}
@@ -564,7 +544,6 @@
*/
public void deregisterAddListener(ConfigAddListener listener)
{
-
addListeners.remove(listener);
}
@@ -579,7 +558,6 @@
*/
public CopyOnWriteArrayList<ConfigDeleteListener> getDeleteListeners()
{
-
return deleteListeners;
}
@@ -593,7 +571,6 @@
*/
public void registerDeleteListener(ConfigDeleteListener listener)
{
-
deleteListeners.addIfAbsent(listener);
}
@@ -607,7 +584,6 @@
*/
public void deregisterDeleteListener(ConfigDeleteListener listener)
{
-
deleteListeners.remove(listener);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
index e091709..91e5b3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
@@ -99,7 +99,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
index d6ba5d4..2302fe0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -239,7 +239,6 @@
*/
public String getDataType()
{
-
return "DN";
}
@@ -252,7 +251,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -270,7 +268,6 @@
public DN activeValue()
throws ConfigException
{
-
if ((activeValues == null) || activeValues.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_STRING_VALUE;
@@ -297,7 +294,6 @@
*/
public List<DN> activeValues()
{
-
return activeValues;
}
@@ -317,7 +313,6 @@
public DN pendingValue()
throws ConfigException
{
-
if (! hasPendingValues())
{
return activeValue();
@@ -351,7 +346,6 @@
*/
public List<DN> pendingValues()
{
-
if (! hasPendingValues())
{
return activeValues;
@@ -372,7 +366,6 @@
public void setValue(DN value)
throws ConfigException
{
-
if (value == null)
{
int msgID = MSGID_CONFIG_ATTR_DN_NULL;
@@ -408,8 +401,6 @@
public void setValues(List<DN> values)
throws ConfigException
{
-
-
// First check if the set is empty and if that is allowed.
if ((values == null) || (values.isEmpty()))
{
@@ -498,7 +489,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(DN value)
{
-
LinkedHashSet<AttributeValue> valueSet;
if (value == null)
{
@@ -525,7 +515,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<DN> values)
{
-
if (values == null)
{
return null;
@@ -552,7 +541,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -579,8 +567,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
-
// Make sure that the value is not null.
if (value == null)
{
@@ -637,7 +623,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
if (isRequired())
@@ -746,7 +731,6 @@
*/
public List<String> activeValuesToStrings()
{
-
ArrayList<String> valueStrings = new ArrayList<String>(activeValues.size());
for (DN dn : activeValues)
{
@@ -771,7 +755,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
ArrayList<String> valueStrings =
@@ -815,8 +798,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
ArrayList<DN> activeValues = null;
ArrayList<DN> pendingValues = null;
@@ -996,7 +977,6 @@
*/
private javax.management.Attribute _toJMXAttribute(boolean pending)
{
-
List<DN> requestedValues ;
String name ;
if (pending)
@@ -1072,7 +1052,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
if (activeValues.size() > 0)
{
if (isMultiValued())
@@ -1144,8 +1123,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
-
if (isMultiValued())
{
attributeInfoList.add(new MBeanAttributeInfo(getName(),
@@ -1194,7 +1171,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
if (isMultiValued())
{
return new MBeanParameterInfo(getName(), JMX_TYPE_STRING_ARRAY,
@@ -1223,7 +1199,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value == null)
{
@@ -1352,7 +1327,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new DNConfigAttribute(getName(), getDescription(), isRequired(),
isMultiValued(), requiresAdminAction(),
activeValues, pendingValues);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
index ed88c59..fce111c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -311,7 +311,6 @@
*/
public String getDataType()
{
-
return "Integer";
}
@@ -324,7 +323,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultIntegerSyntax();
}
@@ -342,7 +340,6 @@
public long activeValue()
throws ConfigException
{
-
if ((activeValues == null) || activeValues.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_INT_VALUE;
@@ -377,7 +374,6 @@
public int activeIntValue()
throws ConfigException
{
-
if ((activeValues == null) || activeValues.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_INT_VALUE;
@@ -415,7 +411,6 @@
*/
public List<Long> activeValues()
{
-
return activeValues;
}
@@ -435,7 +430,6 @@
public long pendingValue()
throws ConfigException
{
-
if (! hasPendingValues())
{
return activeValue();
@@ -476,7 +470,6 @@
public int pendingIntValue()
throws ConfigException
{
-
if (! hasPendingValues())
{
return activeIntValue();
@@ -521,7 +514,6 @@
*/
public List<Long> pendingValues()
{
-
if (! hasPendingValues())
{
return activeValues;
@@ -542,7 +534,6 @@
*/
public boolean hasLowerBound()
{
-
return hasLowerBound;
}
@@ -555,7 +546,6 @@
*/
public long getLowerBound()
{
-
return lowerBound;
}
@@ -571,7 +561,6 @@
*/
public boolean hasUpperBound()
{
-
return hasUpperBound;
}
@@ -586,7 +575,6 @@
*/
public long getUpperBound()
{
-
return upperBound;
}
@@ -602,7 +590,6 @@
public void setValue(long value)
throws ConfigException
{
-
if (hasLowerBound && (value < lowerBound))
{
int msgID = MSGID_CONFIG_ATTR_INT_BELOW_LOWER_BOUND;
@@ -645,8 +632,6 @@
public void setValues(List<Long> values)
throws ConfigException
{
-
-
// First check if the set is empty and if that is allowed.
if ((values == null) || (values.isEmpty()))
{
@@ -743,7 +728,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(long value)
{
-
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -765,7 +749,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<Long> values)
{
-
if (values == null)
{
return null;
@@ -793,7 +776,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -820,8 +802,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
-
// First, make sure we can represent it as a long.
String stringValue = value.getStringValue();
long longValue;
@@ -888,7 +868,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
if (isRequired())
@@ -1015,7 +994,6 @@
*/
public List<String> activeValuesToStrings()
{
-
ArrayList<String> valueStrings =
new ArrayList<String>(activeValues.size());
for (long l : activeValues)
@@ -1041,7 +1019,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
ArrayList<String> valueStrings =
@@ -1085,8 +1062,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
ArrayList<Long> activeValues = null;
ArrayList<Long> pendingValues = null;
@@ -1354,7 +1329,6 @@
*/
public javax.management.Attribute toJMXAttributePending()
{
-
return _toJMXAttribute(true);
}
@@ -1373,7 +1347,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
if (activeValues.size() > 0)
{
if (isMultiValued())
@@ -1445,8 +1418,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
-
if (isMultiValued())
{
attributeInfoList.add(new MBeanAttributeInfo(getName(),
@@ -1493,7 +1464,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
if (isMultiValued())
{
return new MBeanParameterInfo(getName(), JMX_TYPE_LONG_ARRAY,
@@ -1522,7 +1492,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value instanceof Long)
{
@@ -1639,7 +1608,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new IntegerConfigAttribute(getName(), getDescription(), isRequired(),
isMultiValued(), requiresAdminAction(),
hasLowerBound, lowerBound, hasUpperBound,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index aae2c11..4902347 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -296,7 +296,6 @@
*/
public String getDataType()
{
-
return "IntegerWithUnit";
}
@@ -309,7 +308,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -324,7 +322,6 @@
*/
public long activeIntValue()
{
-
return activeIntValue;
}
@@ -337,7 +334,6 @@
*/
public String activeUnit()
{
-
return activeUnit;
}
@@ -352,7 +348,6 @@
*/
public long activeCalculatedValue()
{
-
return activeCalculatedValue;
}
@@ -368,7 +363,6 @@
*/
public long pendingIntValue()
{
-
if (hasPendingValues())
{
return pendingIntValue;
@@ -390,7 +384,6 @@
*/
public String pendingUnit()
{
-
if (hasPendingValues())
{
return pendingUnit;
@@ -413,7 +406,6 @@
*/
public long pendingCalculatedValue()
{
-
if (hasPendingValues())
{
return pendingCalculatedValue;
@@ -435,7 +427,6 @@
*/
public HashMap<String,Double> getUnits()
{
-
return units;
}
@@ -451,7 +442,6 @@
*/
public boolean hasLowerBound()
{
-
return hasLowerBound;
}
@@ -466,7 +456,6 @@
*/
public long getLowerBound()
{
-
return lowerBound;
}
@@ -482,7 +471,6 @@
*/
public boolean hasUpperBound()
{
-
return hasUpperBound;
}
@@ -497,7 +485,6 @@
*/
public long getUpperBound()
{
-
return upperBound;
}
@@ -517,7 +504,6 @@
public void setValue(long intValue, String unit)
throws ConfigException
{
-
if ((unit == null) || (! units.containsKey(unit)))
{
int msgID = MSGID_CONFIG_ATTR_INVALID_UNIT;
@@ -573,7 +559,6 @@
public void setValue(String value)
throws ConfigException
{
-
int spacePos = value.indexOf(' ');
if (spacePos <= 0)
{
@@ -617,7 +602,6 @@
private static LinkedHashSet<AttributeValue> getValueSet(long intValue,
String unit)
{
-
if (unit == null)
{
return null;
@@ -642,7 +626,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -671,8 +654,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
-
// Get a string representation of the value and convert it to lowercase.
String lowerValue = value.getStringValue().toLowerCase();
@@ -697,8 +678,6 @@
public boolean valueIsAcceptable(String lowerValue,
StringBuilder rejectReason)
{
-
-
// Find the first space in the value, since it should separate the integer
// from the unit.
int spacePos = lowerValue.indexOf(' ');
@@ -792,7 +771,6 @@
stringsToValues(List<String> valueStrings, boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
if (isRequired())
@@ -892,7 +870,6 @@
*/
public List<String> activeValuesToStrings()
{
-
ArrayList<String> valueStrings = new ArrayList<String>(1);
valueStrings.add(activeIntValue + " " + activeUnit);
@@ -914,7 +891,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
ArrayList<String> valueStrings = new ArrayList<String>(1);
@@ -954,8 +930,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
long activeIntValue = 0;
long pendingIntValue = 0;
String activeUnit = null;
@@ -1173,7 +1147,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
-
return new javax.management.Attribute(getName(),
activeIntValue + " " + activeUnit);
}
@@ -1208,7 +1181,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
String activeValue = activeIntValue + " " + activeUnit;
attributeList.add(new javax.management.Attribute(getName(), activeValue));
@@ -1237,7 +1209,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
attributeInfoList.add(new MBeanAttributeInfo(getName(),
String.class.getName(),
getDescription(), true, true,
@@ -1264,7 +1235,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
return new MBeanParameterInfo(getName(), String.class.getName(),
getDescription());
}
@@ -1285,7 +1255,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value instanceof String)
{
@@ -1309,7 +1278,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new IntegerWithUnitConfigAttribute(getName(), getDescription(),
requiresAdminAction(), units,
hasLowerBound, lowerBound,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
index 44574eb..441c30b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
@@ -251,7 +251,6 @@
*/
public ObjectName getObjectName()
{
-
return objectName;
}
@@ -264,7 +263,6 @@
*/
public CopyOnWriteArrayList<AlertGenerator> getAlertGenerators()
{
-
return alertGenerators;
}
@@ -279,7 +277,6 @@
*/
public void addAlertGenerator(AlertGenerator generator)
{
-
synchronized (alertGenerators)
{
if (! alertGenerators.contains(generator))
@@ -303,7 +300,6 @@
*/
public boolean removeAlertGenerator(AlertGenerator generator)
{
-
synchronized (alertGenerators)
{
return alertGenerators.remove(generator);
@@ -320,7 +316,6 @@
*/
public CopyOnWriteArrayList<ConfigurableComponent> getConfigurableComponents()
{
-
return configurableComponents;
}
@@ -335,7 +330,6 @@
*/
public void addConfigurableComponent(ConfigurableComponent component)
{
-
synchronized (configurableComponents)
{
if (! configurableComponents.contains(component))
@@ -359,7 +353,6 @@
*/
public boolean removeConfigurableComponent(ConfigurableComponent component)
{
-
synchronized (configurableComponents)
{
return configurableComponents.remove(component);
@@ -375,7 +368,6 @@
*/
public CopyOnWriteArrayList<InvokableComponent> getInvokableComponents()
{
-
return invokableComponents;
}
@@ -390,7 +382,6 @@
*/
public void addInvokableComponent(InvokableComponent component)
{
-
synchronized (invokableComponents)
{
if (! invokableComponents.contains(component))
@@ -414,7 +405,6 @@
*/
public boolean removeInvokableComponent(InvokableComponent component)
{
-
synchronized (invokableComponents)
{
return invokableComponents.remove(component);
@@ -430,7 +420,6 @@
*/
public CopyOnWriteArrayList<MonitorProvider> getMonitorProviders()
{
-
return monitorProviders;
}
@@ -445,7 +434,6 @@
*/
public void addMonitorProvider(MonitorProvider component)
{
-
synchronized (monitorProviders)
{
if (! monitorProviders.contains(component))
@@ -469,7 +457,6 @@
*/
public boolean removeMonitorProvider(MonitorProvider component)
{
-
synchronized (monitorProviders)
{
return monitorProviders.remove(component);
@@ -488,7 +475,6 @@
*/
private ConfigAttribute getConfigAttribute(String name)
{
-
for (ConfigurableComponent component : configurableComponents)
{
for (ConfigAttribute attr : component.getConfigurationAttributes())
@@ -515,7 +501,6 @@
*/
private Attribute getJmxAttribute(String name)
{
-
String attributeName ;
String pendingString = ";" + OPTION_PENDING_VALUES ;
boolean pending = false ;
@@ -613,7 +598,6 @@
public Attribute getAttribute(String attributeName)
throws AttributeNotFoundException
{
-
//
// Get the jmx Client connection
JmxClientConnection jmxClientConnection = getClientConnection();
@@ -703,7 +687,6 @@
javax.management.Attribute attribute, ConfigEntry configEntry)
throws AttributeNotFoundException, InvalidAttributeValueException
{
-
String name = attribute.getName() ;
//
// Get a duplicated version of the config attribute
@@ -783,7 +766,6 @@
public void setAttribute(javax.management.Attribute attribute)
throws AttributeNotFoundException, InvalidAttributeValueException
{
-
ConfigEntry configEntry;
ConfigEntry newConfigEntry ;
@@ -980,7 +962,6 @@
*/
public AttributeList setAttributes(AttributeList attributes)
{
-
AttributeList setAttrs = new AttributeList();
//
@@ -1095,7 +1076,6 @@
public Object invoke(String actionName, Object[] params, String[] signature)
throws MBeanException
{
-
for (InvokableComponent component : invokableComponents)
{
for (InvokableMethod method : component.getOperationSignatures())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index 23c0dab..7b52e44 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -276,7 +276,6 @@
*/
public String getDataType()
{
-
return "MultiChoice";
}
@@ -289,7 +288,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -307,7 +305,6 @@
public String activeValue()
throws ConfigException
{
-
if ((activeValues == null) || activeValues.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_STRING_VALUE;
@@ -334,7 +331,6 @@
*/
public List<String> activeValues()
{
-
return activeValues;
}
@@ -354,7 +350,6 @@
public String pendingValue()
throws ConfigException
{
-
if (! hasPendingValues())
{
return activeValue();
@@ -388,7 +383,6 @@
*/
public List<String> pendingValues()
{
-
if (! hasPendingValues())
{
return activeValues;
@@ -408,7 +402,6 @@
*/
public Set<String> allowedValues()
{
-
return allowedValues;
}
@@ -424,7 +417,6 @@
public void setValue(String value)
throws ConfigException
{
-
if ((value == null) || (value.length() == 0))
{
int msgID = MSGID_CONFIG_ATTR_EMPTY_STRING_VALUE;
@@ -467,8 +459,6 @@
public void setValues(List<String> values)
throws ConfigException
{
-
-
// First check if the set is empty and if that is allowed.
if ((values == null) || (values.isEmpty()))
{
@@ -565,7 +555,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(String value)
{
-
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -586,7 +575,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
{
-
if (values == null)
{
return null;
@@ -613,7 +601,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -640,8 +627,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
-
// Make sure that the value is non-empty.
String stringValue;
if ((value == null) ||
@@ -691,7 +676,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
if (isRequired())
@@ -787,7 +771,6 @@
*/
public List<String> activeValuesToStrings()
{
-
return activeValues;
}
@@ -806,7 +789,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
return pendingValues;
@@ -843,8 +825,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
ArrayList<String> activeValues = null;
ArrayList<String> pendingValues = null;
@@ -1009,7 +989,6 @@
*/
private javax.management.Attribute _toJMXAttribute(boolean pending)
{
-
List<String> requestedValues ;
String name ;
if (pending)
@@ -1066,7 +1045,6 @@
*/
public javax.management.Attribute toJMXAttributePending()
{
-
return _toJMXAttribute(true) ;
}
@@ -1084,7 +1062,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
if (activeValues.size() > 0)
{
if (isMultiValued())
@@ -1150,8 +1127,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
-
if (isMultiValued())
{
attributeInfoList.add(new MBeanAttributeInfo(getName(),
@@ -1200,7 +1175,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
if (isMultiValued())
{
return new MBeanParameterInfo(getName(), JMX_TYPE_STRING_ARRAY,
@@ -1229,7 +1203,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value instanceof String)
{
@@ -1300,7 +1273,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new MultiChoiceConfigAttribute(getName(), getDescription(),
isRequired(), isMultiValued(),
requiresAdminAction(), allowedValues,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index 53a74f5..4ea5097 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -147,7 +147,6 @@
*/
public String getDataType()
{
-
return "ReadOnly";
}
@@ -160,7 +159,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -178,7 +176,6 @@
public String activeValue()
throws ConfigException
{
-
if ((values == null) || values.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_STRING_VALUE;
@@ -205,7 +202,6 @@
*/
public List<String> activeValues()
{
-
return values;
}
@@ -225,7 +221,6 @@
public String pendingValue()
throws ConfigException
{
-
return activeValue();
}
@@ -240,7 +235,6 @@
*/
public List<String> pendingValues()
{
-
return activeValues();
}
@@ -256,7 +250,6 @@
public void setValue(String value)
throws ConfigException
{
-
int msgID = MSGID_CONFIG_ATTR_READ_ONLY;
String message = getMessage(msgID, getName());
throw new ConfigException(msgID, message);
@@ -275,7 +268,6 @@
public void setValues(List<String> values)
throws ConfigException
{
-
int msgID = MSGID_CONFIG_ATTR_READ_ONLY;
String message = getMessage(msgID, getName());
throw new ConfigException(msgID, message);
@@ -292,7 +284,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(String value)
{
-
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -313,7 +304,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
{
-
if (values == null)
{
return null;
@@ -359,7 +349,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
rejectReason.append(getMessage(MSGID_CONFIG_ATTR_READ_ONLY, getName()));
return false;
}
@@ -390,7 +379,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
return new LinkedHashSet<AttributeValue>();
@@ -424,7 +412,6 @@
*/
public List<String> activeValuesToStrings()
{
-
return values;
}
@@ -443,7 +430,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
return activeValuesToStrings();
}
@@ -473,7 +459,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
// The attribute won't be present in the entry, so we'll just return a
// reference to this attribute.
return duplicate();
@@ -491,7 +476,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
-
if (isMultiValued())
{
String[] valueArray = new String[values.size()];
@@ -542,7 +526,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
javax.management.Attribute jmxAttr = toJMXAttribute();
attributeList.add(jmxAttr);
}
@@ -563,8 +546,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
-
if (isMultiValued())
{
attributeInfoList.add(new MBeanAttributeInfo(getName(),
@@ -592,7 +573,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
if (isMultiValued())
{
return new MBeanParameterInfo(getName(), JMX_TYPE_STRING_ARRAY,
@@ -621,7 +601,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
int msgID = MSGID_CONFIG_ATTR_READ_ONLY;
String message = getMessage(msgID, getName());
throw new ConfigException(msgID, message);
@@ -636,7 +615,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new ReadOnlyConfigAttribute(getName(), getDescription(),
activeValues());
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
index d4382b9..9076d71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -241,7 +241,6 @@
*/
public String getDataType()
{
-
return "String";
}
@@ -254,7 +253,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -272,7 +270,6 @@
public String activeValue()
throws ConfigException
{
-
if ((activeValues == null) || activeValues.isEmpty())
{
int msgID = MSGID_CONFIG_ATTR_NO_STRING_VALUE;
@@ -299,7 +296,6 @@
*/
public List<String> activeValues()
{
-
return activeValues;
}
@@ -319,7 +315,6 @@
public String pendingValue()
throws ConfigException
{
-
if (! hasPendingValues())
{
return activeValue();
@@ -353,7 +348,6 @@
*/
public List<String> pendingValues()
{
-
if (! hasPendingValues())
{
return activeValues;
@@ -374,7 +368,6 @@
public void setValue(String value)
throws ConfigException
{
-
if ((value == null) || (value.length() == 0))
{
int msgID = MSGID_CONFIG_ATTR_EMPTY_STRING_VALUE;
@@ -410,8 +403,6 @@
public void setValues(List<String> values)
throws ConfigException
{
-
-
// First check if the set is empty and if that is allowed.
if ((values == null) || (values.isEmpty()))
{
@@ -500,7 +491,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(String value)
{
-
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -521,7 +511,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
{
-
if (values == null)
{
return null;
@@ -548,7 +537,6 @@
*/
public void applyPendingValues()
{
-
if (! hasPendingValues())
{
return;
@@ -575,8 +563,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
-
-
// The only requirement is that the value is not null or empty.
if ((value == null) || (value.getStringValue().length() == 0))
{
@@ -615,7 +601,6 @@
boolean allowFailures)
throws ConfigException
{
-
if ((valueStrings == null) || valueStrings.isEmpty())
{
if (isRequired())
@@ -694,7 +679,6 @@
*/
public List<String> activeValuesToStrings()
{
-
return activeValues;
}
@@ -713,7 +697,6 @@
*/
public List<String> pendingValuesToStrings()
{
-
if (hasPendingValues())
{
return pendingValues;
@@ -750,8 +733,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
-
-
ArrayList<String> activeValues = null;
ArrayList<String> pendingValues = null;
@@ -968,7 +949,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
-
if (activeValues.size() > 0)
{
if (isMultiValued())
@@ -1034,8 +1014,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
-
-
if (isMultiValued())
{
attributeInfoList.add(new MBeanAttributeInfo(getName(),
@@ -1084,7 +1062,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
-
if (isMultiValued())
{
return new MBeanParameterInfo(getName(), JMX_TYPE_STRING_ARRAY,
@@ -1113,7 +1090,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
-
Object value = jmxAttribute.getValue();
if (value instanceof String)
{
@@ -1184,7 +1160,6 @@
*/
public ConfigAttribute duplicate()
{
-
return new StringConfigAttribute(getName(), getDescription(), isRequired(),
isMultiValued(), requiresAdminAction(),
activeValues, pendingValues);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
index 2f57437..8190166 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
@@ -93,7 +93,6 @@
public static AccountUsableRequestControl decodeControl(Control control)
throws LDAPException
{
-
if (control.hasValue())
{
int msgID = MSGID_ACCTUSABLEREQ_CONTROL_HAS_VALUE;
@@ -115,7 +114,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -131,7 +129,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AccountUsableRequestControl()");
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
index b439f40..9f87219 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
@@ -392,8 +392,6 @@
*/
private static ASN1OctetString encodeValue(int secondsBeforeExpiration)
{
-
-
ASN1Integer sbeInteger = new ASN1Integer(TYPE_SECONDS_BEFORE_EXPIRATION,
secondsBeforeExpiration);
@@ -434,8 +432,6 @@
boolean isLocked,
int secondsBeforeUnlock)
{
-
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(5);
if (isInactive)
@@ -488,8 +484,6 @@
public static AccountUsableResponseControl decodeControl(Control control)
throws LDAPException
{
-
-
ASN1OctetString controlValue = control.getValue();
if (controlValue == null)
{
@@ -602,7 +596,6 @@
*/
public boolean isUsable()
{
-
return isUsable;
}
@@ -618,7 +611,6 @@
*/
public int getSecondsBeforeExpiration()
{
-
return secondsBeforeExpiration;
}
@@ -633,7 +625,6 @@
*/
public boolean isInactive()
{
-
return isInactive;
}
@@ -649,7 +640,6 @@
*/
public boolean isReset()
{
-
return isReset;
}
@@ -663,7 +653,6 @@
*/
public boolean isExpired()
{
-
return isExpired;
}
@@ -678,7 +667,6 @@
*/
public int getRemainingGraceLogins()
{
-
return remainingGraceLogins;
}
@@ -692,7 +680,6 @@
*/
public boolean isLocked()
{
-
return isLocked;
}
@@ -709,7 +696,6 @@
*/
public int getSecondsBeforeUnlock()
{
-
return secondsBeforeUnlock;
}
@@ -722,7 +708,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -738,7 +723,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AccountUsableResponseControl(isUsable=");
buffer.append(isUsable);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index c2cbfb5..33e2eff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -191,8 +191,6 @@
*/
private static ASN1OctetString encodeValue(String authorizationID)
{
-
-
return new ASN1OctetString(authorizationID);
}
@@ -209,8 +207,6 @@
*/
private static ASN1OctetString encodeValue(DN authorizationDN)
{
-
-
if (authorizationDN == null)
{
return new ASN1OctetString("dn:");
@@ -240,8 +236,6 @@
Control control)
throws LDAPException
{
-
-
if (! control.hasValue())
{
int msgID = MSGID_AUTHZIDRESP_NO_CONTROL_VALUE;
@@ -265,7 +259,6 @@
*/
public String getAuthorizationID()
{
-
return authorizationID;
}
@@ -280,7 +273,6 @@
*/
public void setAuthorizationID(String authorizationID)
{
-
this.authorizationID = authorizationID;
setValue(encodeValue(authorizationID));
}
@@ -296,7 +288,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -312,7 +303,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AuthorizationIdentityResponseControl(authzID=\"");
buffer.append(authorizationID);
buffer.append("\")");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
index 080e655..baca3a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -197,8 +197,6 @@
changeType,
DN previousDN, long changeNumber)
{
-
-
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(3);
elements.add(new ASN1Enumerated(changeType.intValue()));
@@ -235,8 +233,6 @@
public static EntryChangeNotificationControl decodeControl(Control control)
throws LDAPException
{
-
-
if (! control.hasValue())
{
int msgID = MSGID_ECN_NO_CONTROL_VALUE;
@@ -338,7 +334,6 @@
*/
public PersistentSearchChangeType getChangeType()
{
-
return changeType;
}
@@ -352,7 +347,6 @@
*/
public void setChangeType(PersistentSearchChangeType changeType)
{
-
this.changeType = changeType;
setValue(encodeValue(changeType, previousDN, changeNumber));
@@ -368,7 +362,6 @@
*/
public DN getPreviousDN()
{
-
return previousDN;
}
@@ -382,7 +375,6 @@
*/
public void setPreviousDN(DN previousDN)
{
-
this.previousDN = previousDN;
setValue(encodeValue(changeType, previousDN, changeNumber));
@@ -398,7 +390,6 @@
*/
public long getChangeNumber()
{
-
return changeNumber;
}
@@ -412,7 +403,6 @@
*/
public void setChangeNumber(long changeNumber)
{
-
this.changeNumber = changeNumber;
setValue(encodeValue(changeType, previousDN, changeNumber));
@@ -428,7 +418,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -444,7 +433,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("EntryChangeNotificationControl(changeType=");
buffer.append(changeType.toString());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
index 43621f5..33bb2c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -153,7 +153,6 @@
public static LDAPAssertionRequestControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_LDAPASSERT_NO_CONTROL_VALUE;
@@ -196,7 +195,6 @@
*/
public LDAPFilter getRawFilter()
{
-
return rawFilter;
}
@@ -210,7 +208,6 @@
*/
public void setRawFilter(LDAPFilter rawFilter)
{
-
this.rawFilter = rawFilter;
this.filter = null;
@@ -230,7 +227,6 @@
public SearchFilter getSearchFilter()
throws DirectoryException
{
-
if (filter == null)
{
filter = rawFilter.toSearchFilter();
@@ -248,7 +244,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -264,7 +259,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPAssertionRequestControl(criticality=");
buffer.append(isCritical());
buffer.append(",filter=\"");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
index 3116f02..0c58ab2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -198,7 +198,6 @@
public static LDAPPostReadRequestControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_POSTREADREQ_NO_CONTROL_VALUE;
@@ -250,7 +249,6 @@
private static ASN1OctetString encodeAttributes(LinkedHashSet<String>
rawAttributes)
{
-
if (rawAttributes == null)
{
return new ASN1OctetString(new ASN1Sequence().encode());
@@ -277,7 +275,6 @@
*/
public LinkedHashSet<String> getRawAttributes()
{
-
return rawAttributes;
}
@@ -291,7 +288,6 @@
*/
public void setRawAttributes(LinkedHashSet<String> rawAttributes)
{
-
if (rawAttributes == null)
{
this.rawAttributes = new LinkedHashSet<String>();
@@ -316,7 +312,6 @@
*/
public LinkedHashSet<AttributeType> getRequestedAttributes()
{
-
if (requestedAttributes == null)
{
returnAllOperationalAttrs = false;
@@ -375,7 +370,6 @@
*/
public boolean returnAllUserAttributes()
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -398,7 +392,6 @@
*/
public boolean returnAllOperationalAttributes()
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -421,7 +414,6 @@
*/
public boolean allowsAttribute(AttributeType attrType)
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -451,7 +443,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -467,7 +458,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPPostReadRequestControl(criticality=");
buffer.append(isCritical());
buffer.append(",attrs=\"");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
index 27f2536..1ed5216 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -140,7 +140,6 @@
public static LDAPPostReadResponseControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_POSTREADRESP_NO_CONTROL_VALUE;
@@ -199,8 +198,6 @@
*/
private static ASN1OctetString encodeEntry(SearchResultEntry searchEntry)
{
-
-
SearchResultEntryProtocolOp protocolOp =
new SearchResultEntryProtocolOp(searchEntry);
return new ASN1OctetString(protocolOp.encode().encode());
@@ -217,7 +214,6 @@
*/
public SearchResultEntry getSearchEntry()
{
-
return searchEntry;
}
@@ -232,7 +228,6 @@
*/
public void setSearchEntry(SearchResultEntry searchEntry)
{
-
this.searchEntry = searchEntry;
setValue(encodeEntry(searchEntry));
}
@@ -246,7 +241,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -262,7 +256,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPPostReadResponseControl(criticality=");
buffer.append(isCritical());
buffer.append(",entry=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
index 86a8695..c32244f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -198,7 +198,6 @@
public static LDAPPreReadRequestControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_PREREADREQ_NO_CONTROL_VALUE;
@@ -249,7 +248,6 @@
private static ASN1OctetString encodeAttributes(LinkedHashSet<String>
rawAttributes)
{
-
if (rawAttributes == null)
{
return new ASN1OctetString(new ASN1Sequence().encode());
@@ -276,7 +274,6 @@
*/
public LinkedHashSet<String> getRawAttributes()
{
-
return rawAttributes;
}
@@ -290,7 +287,6 @@
*/
public void setRawAttributes(LinkedHashSet<String> rawAttributes)
{
-
if (rawAttributes == null)
{
this.rawAttributes = new LinkedHashSet<String>();
@@ -315,7 +311,6 @@
*/
public LinkedHashSet<AttributeType> getRequestedAttributes()
{
-
if (requestedAttributes == null)
{
returnAllOperationalAttrs = false;
@@ -374,7 +369,6 @@
*/
public boolean returnAllUserAttributes()
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -397,7 +391,6 @@
*/
public boolean returnAllOperationalAttributes()
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -420,7 +413,6 @@
*/
public boolean allowsAttribute(AttributeType attrType)
{
-
if (requestedAttributes == null)
{
getRequestedAttributes();
@@ -450,7 +442,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -466,7 +457,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPPreReadRequestControl(criticality=");
buffer.append(isCritical());
buffer.append(",attrs=\"");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
index a61b51b..621560a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -140,7 +140,6 @@
public static LDAPPreReadResponseControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_PREREADRESP_NO_CONTROL_VALUE;
@@ -199,8 +198,6 @@
*/
private static ASN1OctetString encodeEntry(SearchResultEntry searchEntry)
{
-
-
SearchResultEntryProtocolOp protocolOp =
new SearchResultEntryProtocolOp(searchEntry);
return new ASN1OctetString(protocolOp.encode().encode());
@@ -217,7 +214,6 @@
*/
public SearchResultEntry getSearchEntry()
{
-
return searchEntry;
}
@@ -232,7 +228,6 @@
*/
public void setSearchEntry(SearchResultEntry searchEntry)
{
-
this.searchEntry = searchEntry;
setValue(encodeEntry(searchEntry));
}
@@ -246,7 +241,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -262,7 +256,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPPreReadResponseControl(criticality=");
buffer.append(isCritical());
buffer.append(",entry=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
index 78aed3f..24a37d7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
@@ -142,8 +142,6 @@
private static ASN1OctetString
encodeValue(ArrayList<MatchedValuesFilter> filters)
{
-
-
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(filters.size());
for (MatchedValuesFilter f : filters)
@@ -172,8 +170,6 @@
public static MatchedValuesControl decodeControl(Control control)
throws LDAPException
{
-
-
if (! control.hasValue())
{
int msgID = MSGID_MATCHEDVALUES_NO_CONTROL_VALUE;
@@ -230,7 +226,6 @@
*/
public ArrayList<MatchedValuesFilter> getFilters()
{
-
return filters;
}
@@ -249,7 +244,6 @@
*/
public boolean valueMatches(AttributeType type, AttributeValue value)
{
-
for (MatchedValuesFilter f : filters)
{
try
@@ -282,7 +276,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -298,7 +291,6 @@
*/
public void toString(StringBuilder buffer)
{
-
if (filters.size() == 1)
{
buffer.append("MatchedValuesControl(filter=\"");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
index 7ddfc55..d009241 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -195,8 +195,6 @@
List<ASN1OctetString> subAny,
ASN1OctetString subFinal, String matchingRuleID)
{
-
-
this.matchType = matchType;
this.rawAttributeType = rawAttributeType;
this.rawAssertionValue = rawAssertionValue;
@@ -232,7 +230,6 @@
String rawAttributeType,
ASN1OctetString rawAssertionValue)
{
-
Validator.ensureNotNull(rawAttributeType,rawAssertionValue);
return new MatchedValuesFilter(EQUALITY_MATCH_TYPE, rawAttributeType,
@@ -253,8 +250,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
-
Validator.ensureNotNull(attributeType, assertionValue);
String rawAttributeType = attributeType.getNameOrOID();
ASN1OctetString rawAssertionValue = assertionValue.getValue()
@@ -287,8 +282,6 @@
List<ASN1OctetString> subAny,
ASN1OctetString subFinal)
{
-
-
Validator.ensureNotNull(rawAttributeType);
return new MatchedValuesFilter(SUBSTRINGS_TYPE, rawAttributeType, null,
subInitial, subAny, subFinal, null);
@@ -312,8 +305,6 @@
List<ASN1OctetString> subAny,
ASN1OctetString subFinal)
{
-
-
Validator.ensureNotNull(attributeType);
String rawAttributeType = attributeType.getNameOrOID();
@@ -339,7 +330,6 @@
String rawAttributeType,
ASN1OctetString rawAssertionValue)
{
-
Validator.ensureNotNull(rawAttributeType, rawAssertionValue);
return new MatchedValuesFilter(GREATER_OR_EQUAL_TYPE, rawAttributeType,
@@ -360,7 +350,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
Validator.ensureNotNull(attributeType, assertionValue);
String rawAttributeType = attributeType.getNameOrOID();
@@ -390,8 +379,6 @@
String rawAttributeType,
ASN1OctetString rawAssertionValue)
{
-
-
Validator.ensureNotNull(rawAttributeType, rawAssertionValue);
return new MatchedValuesFilter(LESS_OR_EQUAL_TYPE, rawAttributeType,
rawAssertionValue, null, null, null, null);
@@ -411,7 +398,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
Validator.ensureNotNull(attributeType, assertionValue);
String rawAttributeType = attributeType.getNameOrOID();
@@ -438,7 +424,6 @@
*/
public static MatchedValuesFilter createPresentFilter(String rawAttributeType)
{
-
Validator.ensureNotNull(rawAttributeType) ;
return new MatchedValuesFilter(PRESENT_TYPE, rawAttributeType, null, null,
null, null, null);
@@ -456,7 +441,6 @@
public static MatchedValuesFilter createPresentFilter(
AttributeType attributeType)
{
-
Validator.ensureNotNull(attributeType);
String rawAttributeType = attributeType.getNameOrOID();
@@ -482,7 +466,6 @@
String rawAttributeType,
ASN1OctetString rawAssertionValue)
{
-
Validator.ensureNotNull(rawAttributeType,rawAssertionValue);
return new MatchedValuesFilter(APPROXIMATE_MATCH_TYPE, rawAttributeType,
@@ -503,8 +486,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
-
Validator.ensureNotNull(attributeType,assertionValue);
String rawAttributeType = attributeType.getNameOrOID();
ASN1OctetString rawAssertionValue =
@@ -535,7 +516,6 @@
String matchingRuleID,
ASN1OctetString rawAssertionValue)
{
-
Validator
.ensureNotNull(rawAttributeType, matchingRuleID, rawAssertionValue);
return new MatchedValuesFilter(EXTENSIBLE_MATCH_TYPE, rawAttributeType,
@@ -559,8 +539,6 @@
MatchingRule matchingRule,
AttributeValue assertionValue)
{
-
-
Validator.ensureNotNull(attributeType, matchingRule, assertionValue);
String rawAttributeType = attributeType.getNameOrOID();
String matchingRuleID = matchingRule.getOID();
@@ -593,7 +571,6 @@
public static MatchedValuesFilter createFromLDAPFilter(LDAPFilter filter)
throws LDAPException
{
-
switch (filter.getFilterType())
{
case AND:
@@ -682,8 +659,6 @@
*/
public ASN1Element encode()
{
-
-
switch (matchType)
{
case EQUALITY_MATCH_TYPE:
@@ -769,8 +744,6 @@
public static MatchedValuesFilter decode(ASN1Element element)
throws LDAPException
{
-
-
switch (element.getType())
{
case EQUALITY_MATCH_TYPE:
@@ -1054,7 +1027,6 @@
*/
public byte getMatchType()
{
-
return matchType;
}
@@ -1069,7 +1041,6 @@
*/
public String getRawAttributeType()
{
-
return rawAttributeType;
}
@@ -1084,7 +1055,6 @@
*/
public void setRawAttributeType(String rawAttributeType)
{
-
this.rawAttributeType = rawAttributeType;
decoded = false;
@@ -1105,7 +1075,6 @@
*/
public AttributeType getAttributeType()
{
-
if (attributeType == null)
{
if (rawAttributeType != null)
@@ -1132,7 +1101,6 @@
*/
public void setAttributeType(AttributeType attributeType)
{
-
this.attributeType = attributeType;
if (attributeType == null)
@@ -1162,7 +1130,6 @@
*/
public ASN1OctetString getRawAssertionValue()
{
-
return rawAssertionValue;
}
@@ -1177,7 +1144,6 @@
*/
public void setRawAssertionValue(ASN1OctetString rawAssertionValue)
{
-
this.rawAssertionValue = rawAssertionValue;
decoded = false;
@@ -1194,7 +1160,6 @@
*/
public AttributeValue getAssertionValue()
{
-
if (assertionValue == null)
{
if (rawAssertionValue != null)
@@ -1216,7 +1181,6 @@
*/
public void setAssertionValue(AttributeValue assertionValue)
{
-
this.assertionValue = assertionValue;
if (assertionValue == null)
@@ -1241,7 +1205,6 @@
*/
public ASN1OctetString getSubInitialElement()
{
-
return subInitial;
}
@@ -1254,7 +1217,6 @@
*/
public void setSubInitialElement(ASN1OctetString subInitial)
{
-
this.subInitial = subInitial;
decoded = false;
@@ -1271,7 +1233,6 @@
*/
public ASN1OctetString getNormalizedSubInitialElement()
{
-
if (normalizedSubInitial == null)
{
if ((subInitial != null) && (getSubstringMatchingRule() != null))
@@ -1306,7 +1267,6 @@
*/
public List<ASN1OctetString> getSubAnyElements()
{
-
return subAny;
}
@@ -1319,7 +1279,6 @@
*/
public void setSubAnyElements(List<ASN1OctetString> subAny)
{
-
this.subAny = subAny;
decoded = false;
@@ -1339,7 +1298,6 @@
*/
public List<ASN1OctetString> getNormalizedSubAnyElements()
{
-
if (normalizedSubAny == null)
{
if ((subAny == null) || (subAny.isEmpty()))
@@ -1388,7 +1346,6 @@
*/
public ASN1OctetString getSubFinalElement()
{
-
return subFinal;
}
@@ -1401,7 +1358,6 @@
*/
public void setSubFinalElement(ASN1OctetString subFinal)
{
-
this.subFinal = subFinal;
decoded = false;
@@ -1418,7 +1374,6 @@
*/
public ASN1OctetString getNormalizedSubFinalElement()
{
-
if (normalizedSubFinal == null)
{
if ((subFinal != null) && (getSubstringMatchingRule() != null))
@@ -1452,7 +1407,6 @@
*/
public String getMatchingRuleID()
{
-
return matchingRuleID;
}
@@ -1466,7 +1420,6 @@
*/
public void setMatchingRuleID(String matchingRuleID)
{
-
this.matchingRuleID = matchingRuleID;
decoded = false;
@@ -1483,7 +1436,6 @@
*/
public MatchingRule getMatchingRule()
{
-
if (matchingRule == null)
{
if (matchingRuleID != null)
@@ -1505,7 +1457,6 @@
*/
public void setMatchingRule(MatchingRule matchingRule)
{
-
this.matchingRule = matchingRule;
if (matchingRule == null)
@@ -1531,7 +1482,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
if (approximateMatchingRule == null)
{
AttributeType attrType = getAttributeType();
@@ -1555,7 +1505,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
if (equalityMatchingRule == null)
{
AttributeType attrType = getAttributeType();
@@ -1579,7 +1528,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
if (orderingMatchingRule == null)
{
AttributeType attrType = getAttributeType();
@@ -1603,7 +1551,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
if (substringMatchingRule == null)
{
AttributeType attrType = getAttributeType();
@@ -1656,8 +1603,6 @@
*/
public boolean valueMatches(AttributeType type, AttributeValue value)
{
-
-
fullyDecode();
switch (matchType)
@@ -1881,7 +1826,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -1897,7 +1841,6 @@
*/
public void toString(StringBuilder buffer)
{
-
switch (matchType)
{
case EQUALITY_MATCH_TYPE:
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
index 703f4f5..cd2cbc7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
@@ -185,7 +185,6 @@
*/
public ASN1OctetString encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(new ASN1Integer(size));
elements.add(cookie);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
index e73338a..22af255 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
@@ -91,7 +91,6 @@
public static PasswordExpiredControl decodeControl(Control control)
throws LDAPException
{
-
if (control.hasValue())
{
int msgID = MSGID_PWEXPIRED_CONTROL_HAS_VALUE;
@@ -112,7 +111,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -128,7 +126,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PasswordExpiredControl()");
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
index 1e9c4f3..64e8d49 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
@@ -140,7 +140,6 @@
public static PasswordExpiringControl decodeControl(Control control)
throws LDAPException
{
-
if (! control.hasValue())
{
int msgID = MSGID_PWEXPIRING_NO_CONTROL_VALUE;
@@ -183,7 +182,6 @@
*/
public int getSecondsUntilExpiration()
{
-
return secondsUntilExpiration;
}
@@ -196,7 +194,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -212,7 +209,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PasswordExpiringControl(secondsUntilExpiration=");
buffer.append(secondsUntilExpiration);
buffer.append(")");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
index 57216ab..16c29b3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -92,7 +92,6 @@
public static PasswordPolicyRequestControl decodeControl(Control control)
throws LDAPException
{
-
if (control.hasValue())
{
int msgID = MSGID_PWPOLICYREQ_CONTROL_HAS_VALUE;
@@ -114,8 +113,6 @@
*/
public String toString()
{
-
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -131,8 +128,6 @@
*/
public void toString(StringBuilder buffer)
{
-
-
buffer.append("PasswordPolicyRequestControl()");
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
index b73500e..6e8fed5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -215,7 +215,6 @@
int warningValue,
PasswordPolicyErrorType errorType)
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
if (warningType != null)
@@ -254,8 +253,6 @@
public static PasswordPolicyResponseControl decodeControl(Control control)
throws LDAPException
{
-
-
ASN1OctetString controlValue = control.getValue();
if (controlValue == null)
{
@@ -356,7 +353,6 @@
*/
public PasswordPolicyWarningType getWarningType()
{
-
return warningType;
}
@@ -370,7 +366,6 @@
*/
public int getWarningValue()
{
-
return warningValue;
}
@@ -384,7 +379,6 @@
*/
public PasswordPolicyErrorType getErrorType()
{
-
return errorType;
}
@@ -397,7 +391,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -413,7 +406,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PasswordPolicyResponseControl(");
if (warningType != null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
index 3bbd813..16ef7c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
@@ -180,8 +180,6 @@
boolean changesOnly,
boolean returnECs)
{
-
-
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(3);
elements.add(new ASN1Integer(
@@ -210,8 +208,6 @@
public static PersistentSearchControl decodeControl(Control control)
throws LDAPException
{
-
-
if (! control.hasValue())
{
int msgID = MSGID_PSEARCH_NO_CONTROL_VALUE;
@@ -270,7 +266,6 @@
*/
public Set<PersistentSearchChangeType> getChangeTypes()
{
-
return changeTypes;
}
@@ -284,7 +279,6 @@
*/
public void setChangeTypes(Set<PersistentSearchChangeType> changeTypes)
{
-
this.changeTypes = changeTypes;
setValue(encodeValue(changeTypes, changesOnly, returnECs));
@@ -302,7 +296,6 @@
*/
public boolean getChangesOnly()
{
-
return changesOnly;
}
@@ -318,7 +311,6 @@
*/
public void setChangesOnly(boolean changesOnly)
{
-
this.changesOnly = changesOnly;
setValue(encodeValue(changeTypes, changesOnly, returnECs));
@@ -336,7 +328,6 @@
*/
public boolean getReturnECs()
{
-
return returnECs;
}
@@ -353,7 +344,6 @@
*/
public void setReturnECs(boolean returnECs)
{
-
this.returnECs = returnECs;
setValue(encodeValue(changeTypes, changesOnly, returnECs));
@@ -368,7 +358,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -384,7 +373,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PersistentSearchControl(changeTypes=\"");
PersistentSearchChangeType.changeTypesToString(changeTypes, buffer);
buffer.append("\",changesOnly=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
index 55d5a4f..405812a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -156,7 +156,6 @@
*/
private static ASN1OctetString encodeValue(ASN1OctetString rawAuthorizationDN)
{
-
ensureNotNull(rawAuthorizationDN);
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(1);
@@ -184,7 +183,6 @@
public static ProxiedAuthV1Control decodeControl(Control control)
throws LDAPException
{
-
ensureNotNull(control);
if (! control.isCritical())
@@ -246,7 +244,6 @@
*/
public ASN1OctetString getRawAuthorizationDN()
{
-
return rawAuthorizationDN;
}
@@ -261,7 +258,6 @@
*/
public void setRawAuthorizationDN(ASN1OctetString rawAuthorizationDN)
{
-
this.rawAuthorizationDN = rawAuthorizationDN;
setValue(encodeValue(rawAuthorizationDN));
@@ -281,7 +277,6 @@
public DN getAuthorizationDN()
throws DirectoryException
{
-
if (authorizationDN == null)
{
authorizationDN = DN.decode(rawAuthorizationDN);
@@ -300,7 +295,6 @@
*/
public void setAuthorizationDN(DN authorizationDN)
{
-
ensureNotNull(authorizationDN);
this.authorizationDN = authorizationDN;
@@ -328,7 +322,6 @@
public Entry getAuthorizationEntry()
throws DirectoryException
{
-
DN authzDN = getAuthorizationDN();
if (authzDN.isNullDN())
{
@@ -411,7 +404,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -427,7 +419,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ProxiedAuthorizationV1Control(authorizationDN=\"");
rawAuthorizationDN.toString(buffer);
buffer.append("\")");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index 7841df2..c15ed34 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -129,7 +129,6 @@
public static ProxiedAuthV2Control decodeControl(Control control)
throws LDAPException
{
-
ensureNotNull(control);
if (! control.isCritical())
@@ -198,7 +197,6 @@
*/
public ASN1OctetString getAuthorizationID()
{
-
return authorizationID;
}
@@ -212,7 +210,6 @@
*/
public void setAuthorizationID(ASN1OctetString authorizationID)
{
-
if (authorizationID == null)
{
this.authorizationID = new ASN1OctetString();
@@ -244,8 +241,6 @@
public Entry getAuthorizationEntry()
throws DirectoryException
{
-
-
// Check for a zero-length value, which would be for an anonymous user.
if (authorizationID.value().length == 0)
{
@@ -399,7 +394,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -415,7 +409,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ProxiedAuthorizationV2Control(authzID=\"");
authorizationID.toString(buffer);
buffer.append("\")");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
index fb1a466..e16f7df 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
@@ -102,7 +102,6 @@
*/
public final int getIDToAbandon()
{
-
return idToAbandon;
}
@@ -114,7 +113,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -126,7 +124,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -138,7 +135,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -150,7 +146,6 @@
@Override()
public final OperationType getOperationType()
{
-
// Note that no debugging will be done in this method because it is a likely
// candidate for being called by the logging subsystem.
@@ -181,7 +176,6 @@
@Override()
public final String[][] getRequestLogElements()
{
-
// Note that no debugging will be done in this method because it is a likely
// candidate for being called by the logging subsystem.
@@ -236,7 +230,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
// An abandon operation can never have a response, so just return an empty
// list.
return NO_RESPONSE_CONTROLS;
@@ -272,7 +265,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -373,7 +365,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
cancelRequest.addResponseMessage(getMessage(MSGID_CANNOT_CANCEL_ABANDON));
return CancelResult.CANNOT_CANCEL;
}
@@ -386,7 +377,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return null;
}
@@ -398,7 +388,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
// Abandon operations cannot be canceled.
return false;
}
@@ -411,7 +400,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("AbandonOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
index 496af4e..733a6a3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -553,7 +553,6 @@
*/
public DN getComponentEntryDN()
{
-
return currentConfiguration.getConfigEntry().getDN();
}
@@ -568,7 +567,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -587,7 +585,6 @@
*/
public LinkedHashMap<String,String> getAlerts()
{
-
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_ACCESS_CONTROL_DISABLED,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 6c56e07..44b2cdf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -92,7 +92,6 @@
*/
public AccountStatusNotificationHandlerConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
notificationHandlers =
new ConcurrentHashMap<DN,AccountStatusNotificationHandler>();
@@ -117,8 +116,6 @@
public void initializeNotificationHandlers()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -234,8 +231,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for an account
// status notification handler.
if (! configEntry.hasObjectClass(OC_ACCT_NOTIFICATION_HANDLER))
@@ -374,8 +369,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -604,8 +597,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (notificationHandlers.containsKey(configEntryDN))
@@ -784,8 +775,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -949,8 +938,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -967,8 +954,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
index 844ee2e..9c282cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
@@ -269,7 +269,6 @@
*/
public final ByteString getRawEntryDN()
{
-
return rawEntryDN;
}
@@ -286,7 +285,6 @@
*/
public final void setRawEntryDN(ByteString rawEntryDN)
{
-
this.rawEntryDN = rawEntryDN;
entryDN = null;
@@ -304,7 +302,6 @@
*/
public final DN getEntryDN()
{
-
return entryDN;
}
@@ -321,7 +318,6 @@
*/
public final List<LDAPAttribute> getRawAttributes()
{
-
return rawAttributes;
}
@@ -336,7 +332,6 @@
*/
public final void addRawAttribute(LDAPAttribute rawAttribute)
{
-
rawAttributes.add(rawAttribute);
objectClasses = null;
@@ -354,7 +349,6 @@
*/
public final void setRawAttributes(List<LDAPAttribute> rawAttributes)
{
-
this.rawAttributes = rawAttributes;
objectClasses = null;
@@ -375,7 +369,6 @@
*/
public final Map<ObjectClass,String> getObjectClasses()
{
-
return objectClasses;
}
@@ -393,7 +386,6 @@
*/
public final void addObjectClass(ObjectClass objectClass, String name)
{
-
objectClasses.put(objectClass, name);
}
@@ -410,7 +402,6 @@
*/
public final void removeObjectClass(ObjectClass objectClass)
{
-
objectClasses.remove(objectClass);
}
@@ -427,7 +418,6 @@
*/
public final Map<AttributeType,List<Attribute>> getUserAttributes()
{
-
return userAttributes;
}
@@ -444,7 +434,6 @@
*/
public final Map<AttributeType,List<Attribute>> getOperationalAttributes()
{
-
return operationalAttributes;
}
@@ -464,7 +453,6 @@
public final void setAttribute(AttributeType attributeType,
List<Attribute> attributeList)
{
-
if (attributeType.isOperational())
{
if ((attributeList == null) || (attributeList.isEmpty()))
@@ -502,7 +490,6 @@
*/
public final void removeAttribute(AttributeType attributeType)
{
-
if (attributeType.isOperational())
{
operationalAttributes.remove(attributeType);
@@ -525,7 +512,6 @@
*/
public final Entry getEntryToAdd()
{
-
return entry;
}
@@ -537,7 +523,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -549,7 +534,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -561,7 +545,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -576,7 +559,6 @@
*/
public final long getChangeNumber()
{
-
return changeNumber;
}
@@ -591,7 +573,6 @@
*/
public final void setChangeNumber(long changeNumber)
{
-
this.changeNumber = changeNumber;
}
@@ -722,7 +703,6 @@
@Override()
public final ArrayList<Control> getResponseControls()
{
-
return responseControls;
}
@@ -756,8 +736,6 @@
@Override()
public final void run()
{
-
-
// Start the processing timer.
processingStartTime = System.currentTimeMillis();
setResultCode(ResultCode.UNDEFINED);
@@ -2272,7 +2250,6 @@
*/
private final void addObjectClassChain(ObjectClass objectClass)
{
-
if (! objectClasses.containsKey(objectClass))
{
objectClasses.put(objectClass, objectClass.getNameOrOID());
@@ -2303,8 +2280,6 @@
Entry userEntry)
throws DirectoryException
{
-
-
// See if a password was specified.
AttributeType passwordAttribute = passwordPolicy.getPasswordAttribute();
List<Attribute> attrList = userEntry.getAttribute(passwordAttribute);
@@ -2497,7 +2472,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -2540,7 +2514,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -2552,7 +2525,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -2565,7 +2537,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("AddOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java b/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
index 265be11..cd47191 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
@@ -74,7 +74,6 @@
*/
public AuthenticatedUsers()
{
-
userMap = new ConcurrentHashMap<DN,CopyOnWriteArraySet<ClientConnection>>();
DirectoryServer.registerChangeNotificationListener(this);
@@ -92,7 +91,6 @@
*/
public synchronized void put(DN userDN, ClientConnection clientConnection)
{
-
CopyOnWriteArraySet<ClientConnection> connectionSet = userMap.get(userDN);
if (connectionSet == null)
{
@@ -118,7 +116,6 @@
*/
public synchronized void remove(DN userDN, ClientConnection clientConnection)
{
-
CopyOnWriteArraySet<ClientConnection> connectionSet = userMap.get(userDN);
if (connectionSet != null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
index 534460c..441067f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
@@ -96,7 +96,6 @@
*/
public BackendConfigManager()
{
-
// No implementation is required.
}
@@ -116,8 +115,6 @@
public void initializeBackendConfig()
throws ConfigException, InitializationException
{
-
-
registeredBackends = new ConcurrentHashMap<DN,Backend>();
@@ -623,7 +620,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
DN backendDN = configEntry.getDN();
@@ -939,7 +935,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
DN backendDN = configEntry.getDN();
Backend backend = registeredBackends.get(backendDN);
ResultCode resultCode = ResultCode.SUCCESS;
@@ -1512,8 +1507,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
DN backendDN = configEntry.getDN();
@@ -1825,8 +1818,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN backendDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -2295,8 +2286,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
DN backendDN = configEntry.getDN();
@@ -2338,8 +2327,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN backendDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
index 8087e33..70b3b12 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
@@ -409,7 +409,6 @@
*/
public final AuthenticationType getAuthenticationType()
{
-
return authType;
}
@@ -425,7 +424,6 @@
*/
public final ByteString getRawBindDN()
{
-
return rawBindDN;
}
@@ -439,7 +437,6 @@
*/
public final void setRawBindDN(ByteString rawBindDN)
{
-
if (rawBindDN == null)
{
this.rawBindDN = new ASN1OctetString();
@@ -465,7 +462,6 @@
*/
public final DN getBindDN()
{
-
return bindDN;
}
@@ -478,7 +474,6 @@
*/
public final ByteString getSimplePassword()
{
-
return simplePassword;
}
@@ -492,7 +487,6 @@
*/
public final void setSimplePassword(ByteString simplePassword)
{
-
if (simplePassword == null)
{
this.simplePassword = new ASN1OctetString();
@@ -517,7 +511,6 @@
*/
public final String getSASLMechanism()
{
-
return saslMechanism;
}
@@ -531,7 +524,6 @@
*/
public final ASN1OctetString getSASLCredentials()
{
-
return saslCredentials;
}
@@ -547,7 +539,6 @@
public final void setSASLCredentials(String saslMechanism,
ASN1OctetString saslCredentials)
{
-
this.saslMechanism = saslMechanism;
this.saslCredentials = saslCredentials;
@@ -566,7 +557,6 @@
*/
public final ASN1OctetString getServerSASLCredentials()
{
-
return serverSASLCredentials;
}
@@ -582,7 +572,6 @@
public final void setServerSASLCredentials(ASN1OctetString
serverSASLCredentials)
{
-
this.serverSASLCredentials = serverSASLCredentials;
}
@@ -600,7 +589,6 @@
*/
public final Entry getSASLAuthUserEntry()
{
-
return saslAuthUserEntry;
}
@@ -617,7 +605,6 @@
*/
public final void setSASLAuthUserEntry(Entry saslAuthUserEntry)
{
-
this.saslAuthUserEntry = saslAuthUserEntry;
}
@@ -632,7 +619,6 @@
*/
public final String getAuthFailureReason()
{
-
return authFailureReason;
}
@@ -647,7 +633,6 @@
*/
public final int getAuthFailureID()
{
-
return authFailureID;
}
@@ -663,7 +648,6 @@
*/
public final void setAuthFailureReason(int id, String reason)
{
-
if (id < 0)
{
authFailureID = 0;
@@ -689,7 +673,6 @@
*/
public final DN getUserEntryDN()
{
-
return userEntryDN;
}
@@ -704,7 +687,6 @@
*/
public final AuthenticationInfo getAuthenticationInfo()
{
-
return authInfo;
}
@@ -720,7 +702,6 @@
*/
public final void setAuthenticationInfo(AuthenticationInfo authInfo)
{
-
this.authInfo = authInfo;
}
@@ -732,7 +713,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -744,7 +724,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -756,7 +735,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -895,7 +873,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -929,8 +906,6 @@
@Override()
public final void run()
{
-
-
// Start the processing timer and initially set the result to indicate that
// the result is unknown.
processingStartTime = System.currentTimeMillis();
@@ -2286,7 +2261,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
cancelRequest.addResponseMessage(getMessage(MSGID_CANNOT_CANCEL_BIND));
return CancelResult.CANNOT_CANCEL;
}
@@ -2299,7 +2273,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return null;
}
@@ -2311,7 +2284,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
// Bind operations cannot be canceled.
return false;
}
@@ -2324,7 +2296,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("BindOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index 0d499c9..a3b8575 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -89,7 +89,6 @@
*/
public CertificateMapperConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
mappers = new ConcurrentHashMap<DN,CertificateMapper>();
}
@@ -111,8 +110,6 @@
public void initializeCertificateMappers()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -228,8 +225,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a certificate
// mapper.
if (! configEntry.hasObjectClass(OC_CERTIFICATE_MAPPER))
@@ -367,8 +362,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -592,8 +585,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (mappers.containsKey(configEntryDN))
@@ -777,8 +768,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -941,8 +930,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -959,8 +946,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
index 631848d..f82dbc0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
@@ -201,7 +201,6 @@
*/
public final ByteString getRawEntryDN()
{
-
return rawEntryDN;
}
@@ -216,7 +215,6 @@
*/
public final void setRawEntryDN(ByteString rawEntryDN)
{
-
this.rawEntryDN = rawEntryDN;
entryDN = null;
@@ -234,7 +232,6 @@
*/
public final DN getEntryDN()
{
-
return entryDN;
}
@@ -247,7 +244,6 @@
*/
public final String getRawAttributeType()
{
-
return rawAttributeType;
}
@@ -262,7 +258,6 @@
*/
public final void setRawAttributeType(String rawAttributeType)
{
-
this.rawAttributeType = rawAttributeType;
attributeType = null;
@@ -279,7 +274,6 @@
*/
public final AttributeType getAttributeType()
{
-
return attributeType;
}
@@ -292,7 +286,6 @@
*/
public final ByteString getAssertionValue()
{
-
return assertionValue;
}
@@ -306,7 +299,6 @@
*/
public final void setAssertionValue(ByteString assertionValue)
{
-
this.assertionValue = assertionValue;
}
@@ -321,7 +313,6 @@
*/
public final Entry getEntryToCompare()
{
-
return entry;
}
@@ -333,7 +324,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -345,7 +335,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -357,7 +346,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -489,7 +477,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -523,7 +510,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -1120,7 +1106,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -1163,7 +1148,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -1175,7 +1159,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -1188,7 +1171,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("CompareOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index e940b47..15822f3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -89,7 +89,6 @@
*/
public ConnectionHandlerConfigManager()
{
-
// No implementation is required.
}
@@ -111,8 +110,6 @@
public void initializeConnectionHandlerConfig()
throws ConfigException, InitializationException
{
-
-
connectionHandlers = new ConcurrentHashMap<DN,ConnectionHandler>();
@@ -359,7 +356,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
DN connectionHandlerDN = configEntry.getDN();
@@ -524,7 +520,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
DN connectionHandlerDN = configEntry.getDN();
ConnectionHandler connectionHandler =
connectionHandlers.get(connectionHandlerDN);
@@ -748,8 +743,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
DN connectionHandlerDN = configEntry.getDN();
@@ -944,8 +937,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1140,8 +1131,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -1158,8 +1147,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
index 43c015b..2493ab3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
@@ -110,7 +110,6 @@
*/
public CoreConfigManager()
{
-
// No implementation is required.
}
@@ -130,8 +129,6 @@
public void initializeCoreConfig()
throws ConfigException, InitializationException
{
-
-
// Get the configuration root entry, since all the attributes we care about
// should be contained in it.
ConfigEntry configRoot =
@@ -861,7 +858,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -876,7 +872,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrs = new LinkedList<ConfigAttribute>();
ConfigEntry configEntry;
@@ -1401,8 +1396,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Start out assuming that the configuration is valid.
boolean configIsAcceptable = true;
@@ -1895,7 +1888,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
ArrayList<String> resultMessages = new ArrayList<String>();
boolean adminActionRequired = false;
ResultCode resultCode = ResultCode.SUCCESS;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
index e57ab86..4233aec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
@@ -190,7 +190,6 @@
*/
public final ByteString getRawEntryDN()
{
-
return rawEntryDN;
}
@@ -206,7 +205,6 @@
*/
public final void setRawEntryDN(ByteString rawEntryDN)
{
-
this.rawEntryDN = rawEntryDN;
entryDN = null;
@@ -224,7 +222,6 @@
*/
public final DN getEntryDN()
{
-
return entryDN;
}
@@ -239,7 +236,6 @@
*/
public final Entry getEntryToDelete()
{
-
return entry;
}
@@ -251,7 +247,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -263,7 +258,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -275,7 +269,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -290,7 +283,6 @@
*/
public final long getChangeNumber()
{
-
return changeNumber;
}
@@ -305,7 +297,6 @@
*/
public final void setChangeNumber(long changeNumber)
{
-
this.changeNumber = changeNumber;
}
@@ -436,7 +427,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -470,7 +460,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -1316,7 +1305,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -1359,7 +1347,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -1371,7 +1358,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -1384,7 +1370,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("DeleteOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index e3282a0..f8aa4b2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -778,7 +778,6 @@
public static void initializeJMX()
throws InitializationException
{
-
try
{
// FIXME -- Should we use the plaform Mbean Server or
@@ -900,7 +899,6 @@
*/
public static String getConfigFile()
{
-
return directoryServer.configFile;
}
@@ -1919,7 +1917,6 @@
*/
public static AuthenticatedUsers getAuthenticatedUsers()
{
-
return directoryServer.authenticatedUsers;
}
@@ -1950,7 +1947,6 @@
*/
public static CryptoManager getCryptoManager()
{
-
return directoryServer.cryptoManager;
}
@@ -1970,7 +1966,6 @@
public void initializeMailServerPropertySets()
throws ConfigException, InitializationException
{
-
mailServerPropertySets = new CopyOnWriteArrayList<Properties>();
// FIXME -- Actually read the information from the config handler.
@@ -1990,7 +1985,6 @@
*/
public static CopyOnWriteArrayList<Properties> getMailServerPropertySets()
{
-
return directoryServer.mailServerPropertySets;
}
@@ -2032,8 +2026,6 @@
public void initializeSchema()
throws ConfigException, InitializationException
{
-
-
// Create the schema configuration manager, and initialize the schema from
// the configuration.
schemaConfigManager = new SchemaConfigManager();
@@ -2100,7 +2092,6 @@
public static Set<BackendInitializationListener>
getBackendInitializationListeners()
{
-
return directoryServer.backendInitializationListeners;
}
@@ -2116,7 +2107,6 @@
public static void registerBackendInitializationListener(
BackendInitializationListener listener)
{
-
directoryServer.backendInitializationListeners.add(listener);
}
@@ -2132,7 +2122,6 @@
public static void deregisterBackendInitializationListener(
BackendInitializationListener listener)
{
-
directoryServer.backendInitializationListeners.remove(listener);
}
@@ -2151,7 +2140,6 @@
private void initializeBackends()
throws ConfigException, InitializationException
{
-
backendConfigManager = new BackendConfigManager();
backendConfigManager.initializeBackendConfig();
@@ -2196,7 +2184,6 @@
public void initializeGroupManager()
throws ConfigException, InitializationException
{
-
groupManager = new GroupManager();
groupManager.initializeGroupImplementations();
@@ -2214,7 +2201,6 @@
*/
public static GroupManager getGroupManager()
{
-
return directoryServer.groupManager;
}
@@ -2233,7 +2219,6 @@
private void initializeSupportedControls()
throws ConfigException, InitializationException
{
-
supportedControls.add(OID_LDAP_ASSERTION);
supportedControls.add(OID_LDAP_READENTRY_PREREAD);
supportedControls.add(OID_LDAP_READENTRY_POSTREAD);
@@ -2262,7 +2247,6 @@
private void initializeSupportedFeatures()
throws ConfigException, InitializationException
{
-
supportedFeatures.add(OID_ALL_OPERATIONAL_ATTRS_FEATURE);
supportedFeatures.add(OID_MODIFY_INCREMENT_FEATURE);
supportedFeatures.add(OID_TRUE_FALSE_FILTERS_FEATURE);
@@ -2283,7 +2267,6 @@
private void initializeIdentityMappers()
throws ConfigException, InitializationException
{
-
identityMapperConfigManager = new IdentityMapperConfigManager();
identityMapperConfigManager.initializeIdentityMappers();
}
@@ -2304,7 +2287,6 @@
private void initializeExtendedOperations()
throws ConfigException, InitializationException
{
-
extendedOperationConfigManager = new ExtendedOperationConfigManager();
extendedOperationConfigManager.initializeExtendedOperationHandlers();
}
@@ -2324,7 +2306,6 @@
private void initializeSASLMechanisms()
throws ConfigException, InitializationException
{
-
saslConfigManager = new SASLConfigManager();
saslConfigManager.initializeSASLMechanismHandlers();
}
@@ -2364,7 +2345,6 @@
private void initializeConnectionHandlers()
throws ConfigException, InitializationException
{
-
connectionHandlerConfigManager = new ConnectionHandlerConfigManager();
connectionHandlerConfigManager.initializeConnectionHandlerConfig();
}
@@ -2385,8 +2365,6 @@
public void initializePasswordPolicyComponents()
throws ConfigException, InitializationException
{
-
-
// Initialize all the password storage schemes.
storageSchemeConfigManager = new PasswordStorageSchemeConfigManager();
storageSchemeConfigManager.initializePasswordStorageSchemes();
@@ -2423,7 +2401,6 @@
*/
public static OperatingSystem getOperatingSystem()
{
-
return directoryServer.operatingSystem;
}
@@ -2438,7 +2415,6 @@
*/
public static ThreadGroup getDirectoryThreadGroup()
{
-
return directoryServer.directoryThreadGroup;
}
@@ -2451,7 +2427,6 @@
*/
public static ConfigHandler getConfigHandler()
{
-
return directoryServer.configHandler;
}
@@ -2470,7 +2445,6 @@
public void initializePlugins()
throws ConfigException, InitializationException
{
-
pluginConfigManager.initializePluginConfig(null);
}
@@ -2493,7 +2467,6 @@
public void initializePlugins(Set<PluginType> pluginTypes)
throws ConfigException, InitializationException
{
-
pluginConfigManager = new PluginConfigManager();
pluginConfigManager.initializePluginConfig(pluginTypes);
}
@@ -2507,7 +2480,6 @@
*/
public static PluginConfigManager getPluginConfigManager()
{
-
return directoryServer.pluginConfigManager;
}
@@ -2526,7 +2498,6 @@
public static ConfigEntry getConfigEntry(DN entryDN)
throws ConfigException
{
-
return directoryServer.configHandler.getConfigEntry(entryDN);
}
@@ -2541,7 +2512,6 @@
*/
public static String getServerRoot()
{
-
if (directoryServer.configHandler == null)
{
String serverRoot = System.getenv(ENV_VAR_INSTANCE_ROOT);
@@ -2573,7 +2543,6 @@
*/
public static long getStartTime()
{
-
return directoryServer.startUpTime;
}
@@ -2586,7 +2555,6 @@
*/
public static String getStartTimeUTC()
{
-
return directoryServer.startTimeUTC;
}
@@ -2599,7 +2567,6 @@
*/
public static Schema getSchema()
{
-
return directoryServer.schema;
}
@@ -2612,7 +2579,6 @@
*/
public static void setSchema(Schema schema)
{
-
directoryServer.schema = schema;
}
@@ -2628,7 +2594,6 @@
*/
public static ConcurrentHashMap<String,MatchingRule> getMatchingRules()
{
-
return directoryServer.schema.getMatchingRules();
}
@@ -2643,7 +2608,6 @@
*/
public static LinkedHashSet<AttributeValue> getMatchingRuleSet()
{
-
return directoryServer.schema.getMatchingRuleSet();
}
@@ -2660,7 +2624,6 @@
*/
public static MatchingRule getMatchingRule(String lowerName)
{
-
return directoryServer.schema.getMatchingRule(lowerName);
}
@@ -2683,7 +2646,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerMatchingRule(matchingRule,
overwriteExisting);
}
@@ -2697,7 +2659,6 @@
*/
public static void deregisterMatchingRule(MatchingRule matchingRule)
{
-
directoryServer.schema.deregisterMatchingRule(matchingRule);
}
@@ -2716,7 +2677,6 @@
public static ConcurrentHashMap<String,ApproximateMatchingRule>
getApproximateMatchingRules()
{
-
return directoryServer.schema.getApproximateMatchingRules();
}
@@ -2734,7 +2694,6 @@
public static ApproximateMatchingRule
getApproximateMatchingRule(String lowerName)
{
-
return directoryServer.schema.getApproximateMatchingRule(lowerName);
}
@@ -2759,7 +2718,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerApproximateMatchingRule(matchingRule,
overwriteExisting);
}
@@ -2775,7 +2733,6 @@
public static void deregisterApproximateMatchingRule(ApproximateMatchingRule
matchingRule)
{
-
directoryServer.schema.deregisterApproximateMatchingRule(matchingRule);
}
@@ -2794,7 +2751,6 @@
public static ConcurrentHashMap<String,EqualityMatchingRule>
getEqualityMatchingRules()
{
-
return directoryServer.schema.getEqualityMatchingRules();
}
@@ -2811,7 +2767,6 @@
*/
public static EqualityMatchingRule getEqualityMatchingRule(String lowerName)
{
-
return directoryServer.schema.getEqualityMatchingRule(lowerName);
}
@@ -2835,7 +2790,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerEqualityMatchingRule(matchingRule,
overwriteExisting);
}
@@ -2850,7 +2804,6 @@
public static void deregisterEqualityMatchingRule(EqualityMatchingRule
matchingRule)
{
-
directoryServer.schema.deregisterEqualityMatchingRule(matchingRule);
}
@@ -2869,7 +2822,6 @@
public static ConcurrentHashMap<String,OrderingMatchingRule>
getOrderingMatchingRules()
{
-
return directoryServer.schema.getOrderingMatchingRules();
}
@@ -2886,7 +2838,6 @@
*/
public static OrderingMatchingRule getOrderingMatchingRule(String lowerName)
{
-
return directoryServer.schema.getOrderingMatchingRule(lowerName);
}
@@ -2910,7 +2861,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerOrderingMatchingRule(matchingRule,
overwriteExisting);
}
@@ -2925,7 +2875,6 @@
public static void deregisterOrderingMatchingRule(OrderingMatchingRule
matchingRule)
{
-
directoryServer.schema.deregisterOrderingMatchingRule(matchingRule);
}
@@ -2944,7 +2893,6 @@
public static ConcurrentHashMap<String,SubstringMatchingRule>
getSubstringMatchingRules()
{
-
return directoryServer.schema.getSubstringMatchingRules();
}
@@ -2961,7 +2909,6 @@
*/
public static SubstringMatchingRule getSubstringMatchingRule(String lowerName)
{
-
return directoryServer.schema.getSubstringMatchingRule(lowerName);
}
@@ -2985,7 +2932,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerSubstringMatchingRule(matchingRule,
overwriteExisting);
}
@@ -3000,7 +2946,6 @@
public static void deregisterSubstringMatchingRule(SubstringMatchingRule
matchingRule)
{
-
directoryServer.schema.deregisterSubstringMatchingRule(matchingRule);
}
@@ -3013,7 +2958,6 @@
*/
public static ConcurrentHashMap<String,ObjectClass> getObjectClasses()
{
-
return directoryServer.schema.getObjectClasses();
}
@@ -3028,7 +2972,6 @@
*/
public static LinkedHashSet<AttributeValue> getObjectClassSet()
{
-
return directoryServer.schema.getObjectClassSet();
}
@@ -3045,7 +2988,6 @@
*/
public static ObjectClass getObjectClass(String lowerName)
{
-
return directoryServer.schema.getObjectClass(lowerName);
}
@@ -3069,7 +3011,6 @@
public static ObjectClass getObjectClass(String lowerName,
boolean returnDefault)
{
-
ObjectClass oc = directoryServer.schema.getObjectClass(lowerName);
if (returnDefault && (oc == null))
{
@@ -3099,7 +3040,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerObjectClass(objectClass, overwriteExisting);
}
@@ -3113,7 +3053,6 @@
*/
public static void deregisterObjectClass(ObjectClass objectClass)
{
-
directoryServer.schema.deregisterObjectClass(objectClass);
}
@@ -3128,7 +3067,6 @@
*/
public static ObjectClass getTopObjectClass()
{
-
ObjectClass objectClass =
directoryServer.schema.getObjectClass(TOP_OBJECTCLASS_NAME);
if (objectClass == null)
@@ -3164,7 +3102,6 @@
*/
public static ObjectClass getDefaultObjectClass(String name)
{
-
String lowerName = toLowerCase(name);
ObjectClass objectClass = directoryServer.schema.getObjectClass(lowerName);
if (objectClass == null)
@@ -3196,7 +3133,6 @@
*/
public static ObjectClass getDefaultAuxiliaryObjectClass(String name)
{
-
String lowerName = toLowerCase(name);
ObjectClass objectClass = directoryServer.schema.getObjectClass(lowerName);
if (objectClass == null)
@@ -3224,7 +3160,6 @@
*/
public static ConcurrentHashMap<String,AttributeType> getAttributeTypes()
{
-
return directoryServer.schema.getAttributeTypes();
}
@@ -3239,7 +3174,6 @@
*/
public static LinkedHashSet<AttributeValue> getAttributeTypeSet()
{
-
return directoryServer.schema.getAttributeTypeSet();
}
@@ -3256,7 +3190,6 @@
*/
public static AttributeType getAttributeType(String lowerName)
{
-
return directoryServer.schema.getAttributeType(lowerName);
}
@@ -3280,7 +3213,6 @@
public static AttributeType getAttributeType(String lowerName,
boolean returnDefault)
{
-
AttributeType type = directoryServer.schema.getAttributeType(lowerName);
if (returnDefault && (type == null))
{
@@ -3310,7 +3242,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerAttributeType(attributeType,
overwriteExisting);
}
@@ -3325,7 +3256,6 @@
*/
public static void deregisterAttributeType(AttributeType attributeType)
{
-
directoryServer.schema.deregisterAttributeType(attributeType);
}
@@ -3338,7 +3268,6 @@
*/
public static AttributeType getObjectClassAttributeType()
{
-
if (directoryServer.objectClassAttributeType == null)
{
directoryServer.objectClassAttributeType =
@@ -3409,8 +3338,6 @@
*/
public static AttributeType getDefaultAttributeType(String name)
{
-
-
return getDefaultAttributeType(name, getDefaultAttributeSyntax());
}
@@ -3430,8 +3357,6 @@
public static AttributeType getDefaultAttributeType(String name,
AttributeSyntax syntax)
{
-
-
String oid = toLowerCase(name) + "-oid";
String definition = "( " + oid + " NAME '" + name + "' SYNTAX " +
syntax.getOID() + " )";
@@ -3451,7 +3376,6 @@
*/
public static ConcurrentHashMap<String,AttributeSyntax> getAttributeSyntaxes()
{
-
return directoryServer.schema.getSyntaxes();
}
@@ -3466,7 +3390,6 @@
*/
public static LinkedHashSet<AttributeValue> getAttributeSyntaxSet()
{
-
return directoryServer.schema.getSyntaxSet();
}
@@ -3486,7 +3409,6 @@
public static AttributeSyntax getAttributeSyntax(String oid,
boolean allowDefault)
{
-
AttributeSyntax syntax = directoryServer.schema.getSyntax(oid);
if ((syntax == null) && allowDefault)
{
@@ -3516,7 +3438,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerSyntax(syntax, overwriteExisting);
}
@@ -3530,7 +3451,6 @@
*/
public static void deregisterAttributeSyntax(AttributeSyntax syntax)
{
-
directoryServer.schema.deregisterSyntax(syntax);
}
@@ -3545,7 +3465,6 @@
*/
public static AttributeSyntax getDefaultAttributeSyntax()
{
-
return directoryServer.defaultSyntax;
}
@@ -3562,7 +3481,6 @@
*/
public static AttributeSyntax getDefaultBinarySyntax()
{
-
return directoryServer.defaultBinarySyntax;
}
@@ -3579,7 +3497,6 @@
*/
public static AttributeSyntax getDefaultBooleanSyntax()
{
-
return directoryServer.defaultBooleanSyntax;
}
@@ -3595,7 +3512,6 @@
*/
public static AttributeSyntax getDefaultDNSyntax()
{
-
return directoryServer.defaultDNSyntax;
}
@@ -3612,7 +3528,6 @@
*/
public static AttributeSyntax getDefaultIntegerSyntax()
{
-
return directoryServer.defaultIntegerSyntax;
}
@@ -3629,7 +3544,6 @@
*/
public static AttributeSyntax getDefaultStringSyntax()
{
-
return directoryServer.defaultStringSyntax;
}
@@ -3643,7 +3557,6 @@
public static ConcurrentHashMap<MatchingRule,MatchingRuleUse>
getMatchingRuleUses()
{
-
return directoryServer.schema.getMatchingRuleUses();
}
@@ -3658,7 +3571,6 @@
*/
public static LinkedHashSet<AttributeValue> getMatchingRuleUseSet()
{
-
return directoryServer.schema.getMatchingRuleUseSet();
}
@@ -3675,7 +3587,6 @@
*/
public static MatchingRuleUse getMatchingRuleUse(MatchingRule matchingRule)
{
-
return directoryServer.schema.getMatchingRuleUse(matchingRule);
}
@@ -3699,7 +3610,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerMatchingRuleUse(matchingRuleUse,
overwriteExisting);
}
@@ -3714,7 +3624,6 @@
*/
public static void deregisterMatchingRuleUse(MatchingRuleUse matchingRuleUse)
{
-
directoryServer.schema.deregisterMatchingRuleUse(matchingRuleUse);
}
@@ -3728,7 +3637,6 @@
public static ConcurrentHashMap<ObjectClass,DITContentRule>
getDITContentRules()
{
-
return directoryServer.schema.getDITContentRules();
}
@@ -3743,7 +3651,6 @@
*/
public static LinkedHashSet<AttributeValue> getDITContentRuleSet()
{
-
return directoryServer.schema.getDITContentRuleSet();
}
@@ -3760,7 +3667,6 @@
*/
public static DITContentRule getDITContentRule(ObjectClass objectClass)
{
-
return directoryServer.schema.getDITContentRule(objectClass);
}
@@ -3784,7 +3690,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerDITContentRule(ditContentRule,
overwriteExisting);
}
@@ -3798,7 +3703,6 @@
*/
public static void deregisterDITContentRule(DITContentRule ditContentRule)
{
-
directoryServer.schema.deregisterDITContentRule(ditContentRule);
}
@@ -3812,7 +3716,6 @@
public static ConcurrentHashMap<NameForm,DITStructureRule>
getDITStructureRules()
{
-
return directoryServer.schema.getDITStructureRulesByNameForm();
}
@@ -3827,7 +3730,6 @@
*/
public static LinkedHashSet<AttributeValue> getDITStructureRuleSet()
{
-
return directoryServer.schema.getDITStructureRuleSet();
}
@@ -3844,7 +3746,6 @@
*/
public static DITStructureRule getDITStructureRule(int ruleID)
{
-
return directoryServer.schema.getDITStructureRule(ruleID);
}
@@ -3861,7 +3762,6 @@
*/
public static DITStructureRule getDITStructureRule(NameForm nameForm)
{
-
return directoryServer.schema.getDITStructureRule(nameForm);
}
@@ -3885,7 +3785,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerDITStructureRule(ditStructureRule,
overwriteExisting);
}
@@ -3901,7 +3800,6 @@
public static void deregisterDITStructureRule(DITStructureRule
ditStructureRule)
{
-
directoryServer.schema.deregisterDITStructureRule(ditStructureRule);
}
@@ -3914,7 +3812,6 @@
*/
public static ConcurrentHashMap<ObjectClass,NameForm> getNameForms()
{
-
return directoryServer.schema.getNameFormsByObjectClass();
}
@@ -3929,7 +3826,6 @@
*/
public static LinkedHashSet<AttributeValue> getNameFormSet()
{
-
return directoryServer.schema.getNameFormSet();
}
@@ -3946,7 +3842,6 @@
*/
public static NameForm getNameForm(ObjectClass objectClass)
{
-
return directoryServer.schema.getNameForm(objectClass);
}
@@ -3963,7 +3858,6 @@
*/
public static NameForm getNameForm(String lowerName)
{
-
return directoryServer.schema.getNameForm(lowerName);
}
@@ -3986,7 +3880,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
directoryServer.schema.registerNameForm(nameForm, overwriteExisting);
}
@@ -3999,7 +3892,6 @@
*/
public static void deregisterNameForm(NameForm nameForm)
{
-
directoryServer.schema.deregisterNameForm(nameForm);
}
@@ -4013,7 +3905,6 @@
*/
public static MBeanServer getJMXMBeanServer()
{
-
return directoryServer.mBeanServer;
}
@@ -4026,7 +3917,6 @@
*/
public static ConcurrentHashMap<DN,JMXMBean> getJMXMBeans()
{
-
return directoryServer.mBeans;
}
@@ -4045,7 +3935,6 @@
*/
public static JMXMBean getJMXMBean(DN configEntryDN)
{
-
return directoryServer.mBeans.get(configEntryDN);
}
@@ -4059,7 +3948,6 @@
public static void registerConfigurableComponent(ConfigurableComponent
component)
{
-
DN componentDN = component.getConfigurableComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean == null)
@@ -4084,7 +3972,6 @@
public static void deregisterConfigurableComponent(ConfigurableComponent
component)
{
-
DN componentDN = component.getConfigurableComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean != null)
@@ -4102,7 +3989,6 @@
*/
public static void registerInvokableComponent(InvokableComponent component)
{
-
DN componentDN = component.getInvokableComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean == null)
@@ -4126,7 +4012,6 @@
*/
public static void deregisterInvokableComponent(InvokableComponent component)
{
-
DN componentDN = component.getInvokableComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean != null)
@@ -4144,7 +4029,6 @@
*/
public static void registerAlertGenerator(AlertGenerator alertGenerator)
{
-
DN componentDN = alertGenerator.getComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean == null)
@@ -4168,7 +4052,6 @@
*/
public static void deregisterAlertGenerator(AlertGenerator alertGenerator)
{
-
DN componentDN = alertGenerator.getComponentEntryDN();
JMXMBean mBean = directoryServer.mBeans.get(componentDN);
if (mBean != null)
@@ -4188,7 +4071,6 @@
*/
public static CopyOnWriteArrayList<AlertHandler> getAlertHandlers()
{
-
return directoryServer.alertHandlers;
}
@@ -4201,7 +4083,6 @@
*/
public static void registerAlertHandler(AlertHandler alertHandler)
{
-
directoryServer.alertHandlers.add(alertHandler);
}
@@ -4214,7 +4095,6 @@
*/
public static void deregisterAlertHandler(AlertHandler alertHandler)
{
-
directoryServer.alertHandlers.remove(alertHandler);
}
@@ -4234,8 +4114,6 @@
String alertType, int alertID,
String alertMessage)
{
-
-
if ((directoryServer.alertHandlers == null) ||
directoryServer.alertHandlers.isEmpty())
{
@@ -4289,7 +4167,6 @@
public static ConcurrentHashMap<String,PasswordStorageScheme>
getPasswordStorageSchemes()
{
-
return directoryServer.passwordStorageSchemes;
}
@@ -4306,7 +4183,6 @@
*/
public static PasswordStorageScheme getPasswordStorageScheme(String lowerName)
{
-
return directoryServer.passwordStorageSchemes.get(lowerName);
}
@@ -4323,7 +4199,6 @@
public static ConcurrentHashMap<String,PasswordStorageScheme>
getAuthPasswordStorageSchemes()
{
-
return directoryServer.authPasswordStorageSchemes;
}
@@ -4340,7 +4215,6 @@
*/
public static PasswordStorageScheme getAuthPasswordStorageScheme(String name)
{
-
return directoryServer.authPasswordStorageSchemes.get(name);
}
@@ -4356,7 +4230,6 @@
*/
public static void registerPasswordStorageScheme(PasswordStorageScheme scheme)
{
-
String name = toLowerCase(scheme.getStorageSchemeName());
directoryServer.passwordStorageSchemes.put(name, scheme);
@@ -4379,7 +4252,6 @@
*/
public static void deregisterPasswordStorageScheme(String lowerName)
{
-
PasswordStorageScheme scheme =
directoryServer.passwordStorageSchemes.remove(lowerName);
@@ -4402,7 +4274,6 @@
*/
public static ConcurrentHashMap<DN,PasswordValidator> getPasswordValidators()
{
-
return directoryServer.passwordValidators;
}
@@ -4420,7 +4291,6 @@
*/
public static PasswordValidator getPasswordValidator(DN configEntryDN)
{
-
return directoryServer.passwordValidators.get(configEntryDN);
}
@@ -4438,7 +4308,6 @@
public static void registerPasswordValidator(DN configEntryDN,
PasswordValidator validator)
{
-
directoryServer.passwordValidators.put(configEntryDN, validator);
}
@@ -4453,7 +4322,6 @@
*/
public static void deregisterPasswordValidator(DN configEntryDN)
{
-
directoryServer.passwordValidators.remove(configEntryDN);
}
@@ -4470,7 +4338,6 @@
public static ConcurrentHashMap<DN,AccountStatusNotificationHandler>
getAccountStatusNotificationHandlers()
{
-
return directoryServer.accountStatusNotificationHandlers;
}
@@ -4489,7 +4356,6 @@
public static AccountStatusNotificationHandler
getAccountStatusNotificationHandler(DN handlerDN)
{
-
return directoryServer.accountStatusNotificationHandlers.get(handlerDN);
}
@@ -4507,7 +4373,6 @@
public static void registerAccountStatusNotificationHandler(DN handlerDN,
AccountStatusNotificationHandler handler)
{
-
directoryServer.accountStatusNotificationHandlers.put(handlerDN, handler);
}
@@ -4522,7 +4387,6 @@
*/
public static void deregisterAccountStatusNotificationHandler(DN handlerDN)
{
-
directoryServer.accountStatusNotificationHandlers.remove(handlerDN);
}
@@ -4539,7 +4403,6 @@
*/
public static ConcurrentHashMap<DN,PasswordGenerator> getPasswordGenerators()
{
-
return directoryServer.passwordGenerators;
}
@@ -4557,7 +4420,6 @@
*/
public static PasswordGenerator getPasswordGenerator(DN configEntryDN)
{
-
return directoryServer.passwordGenerators.get(configEntryDN);
}
@@ -4575,7 +4437,6 @@
public static void registerPasswordGenerator(DN configEntryDN,
PasswordGenerator generator)
{
-
directoryServer.passwordGenerators.put(configEntryDN, generator);
}
@@ -4590,7 +4451,6 @@
*/
public static void deregisterPasswordGenerator(DN configEntryDN)
{
-
directoryServer.passwordGenerators.remove(configEntryDN);
}
@@ -4606,7 +4466,6 @@
*/
public static PasswordPolicy[] getPasswordPolicies()
{
-
// The password policy objects are returned in an array to prevent the
// caller from modifying the map structure.
PasswordPolicyConfig[] values = directoryServer.passwordPolicies.values()
@@ -4696,7 +4555,6 @@
*/
public static DN getDefaultPasswordPolicyDN()
{
-
return directoryServer.defaultPasswordPolicyDN;
}
@@ -4715,7 +4573,6 @@
*/
public static void setDefaultPasswordPolicyDN(DN defaultPasswordPolicyDN)
{
-
directoryServer.defaultPasswordPolicyDN = defaultPasswordPolicyDN;
directoryServer.defaultPasswordPolicyConfig = null;
}
@@ -4762,7 +4619,6 @@
*/
public static ConcurrentHashMap<String,MonitorProvider> getMonitorProviders()
{
-
return directoryServer.monitorProviders;
}
@@ -4779,7 +4635,6 @@
*/
public static MonitorProvider getMonitorProvider(String lowerName)
{
-
return directoryServer.monitorProviders.get(lowerName);
}
@@ -4795,7 +4650,6 @@
*/
public static void registerMonitorProvider(MonitorProvider monitorProvider)
{
-
String lowerName = toLowerCase(monitorProvider.getMonitorInstanceName());
directoryServer.monitorProviders.put(lowerName, monitorProvider);
@@ -4836,7 +4690,6 @@
*/
public static void deregisterMonitorProvider(String lowerName)
{
-
MonitorProvider provider =
directoryServer.monitorProviders.remove(toLowerCase(lowerName));
@@ -4872,7 +4725,6 @@
*/
public static EntryCache getEntryCache()
{
-
return directoryServer.entryCache;
}
@@ -4886,7 +4738,6 @@
*/
public static void setEntryCache(EntryCache entryCache)
{
-
synchronized (directoryServer)
{
directoryServer.entryCache = entryCache;
@@ -4904,7 +4755,6 @@
*/
public static Map<DN,KeyManagerProvider> getKeyManagerProviders()
{
-
return directoryServer.keyManagerProviders;
}
@@ -4922,7 +4772,6 @@
*/
public static KeyManagerProvider getKeyManagerProvider(DN providerDN)
{
-
return directoryServer.keyManagerProviders.get(providerDN);
}
@@ -4937,7 +4786,6 @@
public static void registerKeyManagerProvider(DN providerDN,
KeyManagerProvider provider)
{
-
directoryServer.keyManagerProviders.put(providerDN, provider);
}
@@ -4951,7 +4799,6 @@
*/
public static void deregisterKeyManagerProvider(DN providerDN)
{
-
directoryServer.keyManagerProviders.remove(providerDN);
}
@@ -4966,7 +4813,6 @@
*/
public static Map<DN,TrustManagerProvider> getTrustManagerProviders()
{
-
return directoryServer.trustManagerProviders;
}
@@ -4984,7 +4830,6 @@
*/
public static TrustManagerProvider getTrustManagerProvider(DN providerDN)
{
-
return directoryServer.trustManagerProviders.get(providerDN);
}
@@ -5000,7 +4845,6 @@
public static void registerTrustManagerProvider(DN providerDN,
TrustManagerProvider provider)
{
-
directoryServer.trustManagerProviders.put(providerDN, provider);
}
@@ -5014,7 +4858,6 @@
*/
public static void deregisterTrustManagerProvider(DN providerDN)
{
-
directoryServer.trustManagerProviders.remove(providerDN);
}
@@ -5029,7 +4872,6 @@
*/
public static Map<DN,CertificateMapper> getCertificateMappers()
{
-
return directoryServer.certificateMappers;
}
@@ -5046,7 +4888,6 @@
*/
public static CertificateMapper getCertificateMapper(DN mapperDN)
{
-
return directoryServer.certificateMappers.get(mapperDN);
}
@@ -5061,7 +4902,6 @@
public static void registerCertificateMapper(DN mapperDN,
CertificateMapper mapper)
{
-
directoryServer.certificateMappers.put(mapperDN, mapper);
}
@@ -5074,7 +4914,6 @@
*/
public static void deregisterCertificateMapper(DN mapperDN)
{
-
directoryServer.certificateMappers.remove(mapperDN);
}
@@ -5090,7 +4929,6 @@
*/
public static Set<Privilege> getRootPrivileges()
{
-
return directoryServer.rootDNConfigManager.getRootPrivileges();
}
@@ -5106,7 +4944,6 @@
*/
public static CopyOnWriteArraySet<DN> getRootDNs()
{
-
return directoryServer.rootDNs;
}
@@ -5123,7 +4960,6 @@
*/
public static boolean isRootDN(DN userDN)
{
-
return directoryServer.rootDNs.contains(userDN);
}
@@ -5136,7 +4972,6 @@
*/
public static void registerRootDN(DN rootDN)
{
-
directoryServer.rootDNs.add(rootDN);
}
@@ -5150,7 +4985,6 @@
*/
public static void deregisterRootDN(DN rootDN)
{
-
directoryServer.rootDNs.remove(rootDN);
}
@@ -5166,7 +5000,6 @@
*/
public static ConcurrentHashMap<DN,DN> getAlternateRootBindDNs()
{
-
return directoryServer.alternateRootBindDNs;
}
@@ -5184,7 +5017,6 @@
*/
public static DN getActualRootBindDN(DN alternateRootBindDN)
{
-
return directoryServer.alternateRootBindDNs.get(alternateRootBindDN);
}
@@ -5204,7 +5036,6 @@
DN alternateRootBindDN)
throws DirectoryException
{
-
DN existingRootEntryDN =
directoryServer.alternateRootBindDNs.putIfAbsent(alternateRootBindDN,
actualRootEntryDN);
@@ -5234,7 +5065,6 @@
*/
public static DN deregisterAlternateRootBindDN(DN alternateRootBindDN)
{
-
return directoryServer.alternateRootBindDNs.remove(alternateRootBindDN);
}
@@ -5249,7 +5079,6 @@
*/
public static ResultCode getServerErrorResultCode()
{
-
return directoryServer.serverErrorResultCode;
}
@@ -5265,7 +5094,6 @@
*/
public static void setServerErrorResultCode(ResultCode serverErrorResultCode)
{
-
directoryServer.serverErrorResultCode = serverErrorResultCode;
}
@@ -5281,7 +5109,6 @@
*/
public static boolean addMissingRDNAttributes()
{
-
return directoryServer.addMissingRDNAttributes;
}
@@ -5298,7 +5125,6 @@
*/
public static void setAddMissingRDNAttributes(boolean addMissingRDNAttributes)
{
-
directoryServer.addMissingRDNAttributes = addMissingRDNAttributes;
}
@@ -5316,7 +5142,6 @@
*/
public static boolean allowAttributeNameExceptions()
{
-
return directoryServer.allowAttributeNameExceptions;
}
@@ -5333,7 +5158,6 @@
public static void setAllowAttributeNameExceptions(
boolean allowAttributeNameExceptions)
{
-
directoryServer.allowAttributeNameExceptions = allowAttributeNameExceptions;
}
@@ -5347,7 +5171,6 @@
*/
public static boolean checkSchema()
{
-
return directoryServer.checkSchema;
}
@@ -5361,7 +5184,6 @@
*/
public static void setCheckSchema(boolean checkSchema)
{
-
directoryServer.checkSchema = checkSchema;
}
@@ -5376,7 +5198,6 @@
*/
public static AcceptRejectWarn getSingleStructuralObjectClassPolicy()
{
-
return directoryServer.singleStructuralClassPolicy;
}
@@ -5393,7 +5214,6 @@
public static void setSingleStructuralObjectClassPolicy(
AcceptRejectWarn singleStructuralClassPolicy)
{
-
directoryServer.singleStructuralClassPolicy = singleStructuralClassPolicy;
}
@@ -5408,7 +5228,6 @@
*/
public static AcceptRejectWarn getSyntaxEnforcementPolicy()
{
-
return directoryServer.syntaxEnforcementPolicy;
}
@@ -5426,7 +5245,6 @@
public static void setSyntaxEnforcementPolicy(
AcceptRejectWarn syntaxEnforcementPolicy)
{
-
directoryServer.syntaxEnforcementPolicy = syntaxEnforcementPolicy;
}
@@ -5445,7 +5263,6 @@
*/
public static boolean notifyAbandonedOperations()
{
-
return directoryServer.notifyAbandonedOperations;
}
@@ -5465,7 +5282,6 @@
public static void setNotifyAbandonedOperations(
boolean notifyAbandonedOperations)
{
-
directoryServer.notifyAbandonedOperations = notifyAbandonedOperations;
}
@@ -5480,7 +5296,6 @@
*/
public static Map<String,Backend> getBackends()
{
-
return directoryServer.backends;
}
@@ -5496,7 +5311,6 @@
*/
public static Backend getBackend(String backendID)
{
-
return directoryServer.backends.get(backendID);
}
@@ -5513,7 +5327,6 @@
*/
public static boolean hasBackend(String backendID)
{
-
return directoryServer.backends.containsKey(backendID);
}
@@ -5534,7 +5347,6 @@
public static void registerBackend(Backend backend)
throws DirectoryException
{
-
ensureNotNull(backend);
String backendID = backend.getBackendID();
@@ -5576,7 +5388,6 @@
*/
public static void deregisterBackend(Backend backend)
{
-
ensureNotNull(backend);
synchronized (directoryServer)
@@ -5609,7 +5420,6 @@
*/
public static Map<DN,Backend> getBaseDNs()
{
-
return directoryServer.baseDNs;
}
@@ -5626,7 +5436,6 @@
*/
public static Backend getBackendWithBaseDN(DN baseDN)
{
-
return directoryServer.baseDNs.get(baseDN);
}
@@ -5645,7 +5454,6 @@
*/
public static Backend getBackend(DN entryDN)
{
-
if (entryDN.isNullDN())
{
return directoryServer.rootDSEBackend;
@@ -5691,7 +5499,6 @@
boolean isPrivate, boolean testOnly)
throws DirectoryException
{
-
ensureNotNull(baseDN, backend);
synchronized (directoryServer)
@@ -5903,7 +5710,6 @@
public static void deregisterBaseDN(DN baseDN, boolean testOnly)
throws DirectoryException
{
-
ensureNotNull(baseDN);
synchronized (directoryServer)
@@ -6046,7 +5852,6 @@
*/
public static Map<DN,Backend> getPublicNamingContexts()
{
-
return directoryServer.publicNamingContexts;
}
@@ -6061,7 +5866,6 @@
*/
public static Map<DN,Backend> getPrivateNamingContexts()
{
-
return directoryServer.privateNamingContexts;
}
@@ -6078,7 +5882,6 @@
*/
public static boolean isNamingContext(DN dn)
{
-
return (directoryServer.publicNamingContexts.containsKey(dn) ||
directoryServer.privateNamingContexts.containsKey(dn));
}
@@ -6092,7 +5895,6 @@
*/
public static Entry getRootDSE()
{
-
return directoryServer.rootDSEBackend.getRootDSE();
}
@@ -6105,7 +5907,6 @@
*/
public static RootDSEBackend getRootDSEBackend()
{
-
return directoryServer.rootDSEBackend;
}
@@ -6120,7 +5921,6 @@
*/
public static DN getSchemaDN()
{
-
return directoryServer.schemaDN;
}
@@ -6134,7 +5934,6 @@
*/
public static void setSchemaDN(DN schemaDN)
{
-
directoryServer.schemaDN = schemaDN;
}
@@ -6156,8 +5955,6 @@
public static Entry getEntry(DN entryDN)
throws DirectoryException
{
-
-
// If the entry is the root DSE, then get and return that.
if (entryDN.isNullDN())
{
@@ -6193,8 +5990,6 @@
public static boolean entryExists(DN entryDN)
throws DirectoryException
{
-
-
// If the entry is the root DSE, then it will always exist.
if (entryDN.isNullDN())
{
@@ -6224,7 +6019,6 @@
*/
public static TreeSet<String> getSupportedControls()
{
-
return directoryServer.supportedControls;
}
@@ -6242,7 +6036,6 @@
*/
public static boolean isSupportedControl(String controlOID)
{
-
return directoryServer.supportedControls.contains(controlOID);
}
@@ -6258,7 +6051,6 @@
*/
public static void registerSupportedControl(String controlOID)
{
-
synchronized (directoryServer.supportedControls)
{
directoryServer.supportedControls.add(controlOID);
@@ -6277,7 +6069,6 @@
*/
public static void deregisterSupportedControl(String controlOID)
{
-
synchronized (directoryServer.supportedControls)
{
directoryServer.supportedControls.remove(controlOID);
@@ -6295,7 +6086,6 @@
*/
public static TreeSet<String> getSupportedFeatures()
{
-
return directoryServer.supportedFeatures;
}
@@ -6313,7 +6103,6 @@
*/
public static boolean isSupportedFeature(String featureOID)
{
-
return directoryServer.supportedFeatures.contains(featureOID);
}
@@ -6329,7 +6118,6 @@
*/
public static void registerSupportedFeature(String featureOID)
{
-
synchronized (directoryServer.supportedFeatures)
{
directoryServer.supportedFeatures.add(featureOID);
@@ -6348,7 +6136,6 @@
*/
public static void deregisterSupportedFeature(String featureOID)
{
-
synchronized (directoryServer.supportedFeatures)
{
directoryServer.supportedFeatures.remove(featureOID);
@@ -6367,7 +6154,6 @@
public static ConcurrentHashMap<String,ExtendedOperationHandler>
getSupportedExtensions()
{
-
return directoryServer.extendedOperationHandlers;
}
@@ -6383,7 +6169,6 @@
*/
public static ExtendedOperationHandler getExtendedOperationHandler(String oid)
{
-
return directoryServer.extendedOperationHandlers.get(oid);
}
@@ -6400,7 +6185,6 @@
public static void registerSupportedExtension(String oid,
ExtendedOperationHandler handler)
{
-
directoryServer.extendedOperationHandlers.put(toLowerCase(oid), handler);
}
@@ -6414,7 +6198,6 @@
*/
public static void deregisterSupportedExtension(String oid)
{
-
directoryServer.extendedOperationHandlers.remove(toLowerCase(oid));
}
@@ -6430,7 +6213,6 @@
public static ConcurrentHashMap<String,SASLMechanismHandler>
getSupportedSASLMechanisms()
{
-
return directoryServer.saslMechanismHandlers;
}
@@ -6446,7 +6228,6 @@
*/
public static SASLMechanismHandler getSASLMechanismHandler(String name)
{
-
return directoryServer.saslMechanismHandlers.get(name);
}
@@ -6462,7 +6243,6 @@
public static void registerSASLMechanismHandler(String name,
SASLMechanismHandler handler)
{
-
// FIXME -- Should we force this name to be lowercase? If so, then will
// that cause the lower name to be used in the root DSE?
directoryServer.saslMechanismHandlers.put(name, handler);
@@ -6477,7 +6257,6 @@
*/
public static void deregisterSASLMechanismHandler(String name)
{
-
// FIXME -- Should we force this name to be lowercase?
directoryServer.saslMechanismHandlers.remove(name);
}
@@ -6494,7 +6273,6 @@
*/
public static ConcurrentHashMap<DN,IdentityMapper> getIdentityMappers()
{
-
return directoryServer.identityMappers;
}
@@ -6513,7 +6291,6 @@
*/
public static IdentityMapper getIdentityMapper(DN configEntryDN)
{
-
return directoryServer.identityMappers.get(configEntryDN);
}
@@ -6529,7 +6306,6 @@
public static void registerIdentityMapper(DN configEntryDN,
IdentityMapper identityMapper)
{
-
directoryServer.identityMappers.put(configEntryDN, identityMapper);
}
@@ -6543,7 +6319,6 @@
*/
public static void deregisterIdentityMapper(DN configEntryDN)
{
-
directoryServer.identityMappers.remove(configEntryDN);
}
@@ -6559,7 +6334,6 @@
*/
public static DN getProxiedAuthorizationIdentityMapperDN()
{
-
return directoryServer.proxiedAuthorizationIdentityMapperDN;
}
@@ -6578,7 +6352,6 @@
public static void setProxiedAuthorizationIdentityMapperDN(
DN proxiedAuthorizationIdentityMapperDN)
{
-
directoryServer.proxiedAuthorizationIdentityMapperDN =
proxiedAuthorizationIdentityMapperDN;
}
@@ -6595,7 +6368,6 @@
*/
public static IdentityMapper getProxiedAuthorizationIdentityMapper()
{
-
if (directoryServer.proxiedAuthorizationIdentityMapperDN == null)
{
return null;
@@ -6615,7 +6387,6 @@
*/
public static CopyOnWriteArrayList<ConnectionHandler> getConnectionHandlers()
{
-
return directoryServer.connectionHandlers;
}
@@ -6629,7 +6400,6 @@
*/
public static void registerConnectionHandler(ConnectionHandler handler)
{
-
synchronized (directoryServer.connectionHandlers)
{
directoryServer.connectionHandlers.add(handler);
@@ -6651,7 +6421,6 @@
*/
public static void deregisterConnectionHandler(ConnectionHandler handler)
{
-
synchronized (directoryServer.connectionHandlers)
{
directoryServer.connectionHandlers.remove(handler);
@@ -6682,7 +6451,6 @@
private void initializeWorkQueue()
throws ConfigException, InitializationException
{
-
DN configEntryDN;
try
{
@@ -6775,7 +6543,6 @@
*/
public static WorkQueue getWorkQueue()
{
-
return directoryServer.workQueue;
}
@@ -6793,8 +6560,6 @@
public static void enqueueRequest(Operation operation)
throws DirectoryException
{
-
-
// See if a bind is already in progress on the associated connection. If so
// then reject the operation.
ClientConnection clientConnection = operation.getClientConnection();
@@ -6901,7 +6666,6 @@
public static CopyOnWriteArrayList<ChangeNotificationListener>
getChangeNotificationListeners()
{
-
return directoryServer.changeNotificationListeners;
}
@@ -6918,7 +6682,6 @@
public static void registerChangeNotificationListener(
ChangeNotificationListener changeListener)
{
-
directoryServer.changeNotificationListeners.add(changeListener);
}
@@ -6935,7 +6698,6 @@
public static void deregisterChangeNotificationListener(
ChangeNotificationListener changeListener)
{
-
directoryServer.changeNotificationListeners.remove(changeListener);
}
@@ -6950,7 +6712,6 @@
*/
public static CopyOnWriteArrayList<PersistentSearch> getPersistentSearches()
{
-
return directoryServer.persistentSearches;
}
@@ -6966,7 +6727,6 @@
*/
public static void registerPersistentSearch(PersistentSearch persistentSearch)
{
-
directoryServer.persistentSearches.add(persistentSearch);
persistentSearch.getSearchOperation().getClientConnection().
registerPersistentSearch(persistentSearch);
@@ -6985,7 +6745,6 @@
public static void deregisterPersistentSearch(PersistentSearch
persistentSearch)
{
-
directoryServer.persistentSearches.remove(persistentSearch);
persistentSearch.getSearchOperation().getClientConnection().
deregisterPersistentSearch(persistentSearch);
@@ -7004,7 +6763,6 @@
public static CopyOnWriteArrayList<SynchronizationProvider>
getSynchronizationProviders()
{
-
return directoryServer.synchronizationProviders;
}
@@ -7018,7 +6776,6 @@
public static void registerSynchronizationProvider(SynchronizationProvider
provider)
{
-
directoryServer.synchronizationProviders.add(provider);
}
@@ -7033,7 +6790,6 @@
public static void deregisterSynchronizationProvider(SynchronizationProvider
provider)
{
-
directoryServer.synchronizationProviders.remove(provider);
}
@@ -7048,7 +6804,6 @@
*/
public static void registerShutdownListener(ServerShutdownListener listener)
{
-
directoryServer.shutdownListeners.add(listener);
}
@@ -7062,7 +6817,6 @@
*/
public static void deregisterShutdownListener(ServerShutdownListener listener)
{
-
directoryServer.shutdownListeners.remove(listener);
}
@@ -7078,7 +6832,6 @@
*/
public static void shutDown(String className, String reason)
{
-
synchronized (directoryServer)
{
if (directoryServer.shuttingDown)
@@ -7409,7 +7162,6 @@
*/
public static void restart(String className, String reason)
{
-
try
{
String configClass = directoryServer.configClass;
@@ -7443,7 +7195,6 @@
*/
public static long getMaxAllowedConnections()
{
-
return directoryServer.maxAllowedConnections;
}
@@ -7459,7 +7210,6 @@
*/
public static void setMaxAllowedConnections(long maxAllowedConnections)
{
-
if (maxAllowedConnections > 0)
{
directoryServer.maxAllowedConnections = maxAllowedConnections;
@@ -7485,7 +7235,6 @@
*/
public static long newConnectionAccepted(ClientConnection clientConnection)
{
-
synchronized (directoryServer.establishedConnections)
{
if ((directoryServer.maxAllowedConnections > 0) &&
@@ -7516,7 +7265,6 @@
*/
public static void connectionClosed(ClientConnection clientConnection)
{
-
synchronized (directoryServer.establishedConnections)
{
directoryServer.establishedConnections.remove(clientConnection);
@@ -7533,7 +7281,6 @@
*/
public static long getCurrentConnections()
{
-
return directoryServer.currentConnections;
}
@@ -7548,7 +7295,6 @@
*/
public static long getMaxConnections()
{
-
return directoryServer.maxConnections;
}
@@ -7563,7 +7309,6 @@
*/
public static long getTotalConnections()
{
-
return directoryServer.totalConnections;
}
@@ -7605,7 +7350,6 @@
*/
public static int getSizeLimit()
{
-
return directoryServer.sizeLimit;
}
@@ -7620,7 +7364,6 @@
*/
public static void setSizeLimit(int sizeLimit)
{
-
directoryServer.sizeLimit = sizeLimit;
}
@@ -7635,7 +7378,6 @@
*/
public static int getLookthroughLimit()
{
-
return directoryServer.lookthroughLimit;
}
@@ -7650,7 +7392,6 @@
*/
public static void setLookthroughLimit(int lookthroughLimit)
{
-
directoryServer.lookthroughLimit = lookthroughLimit;
}
@@ -7665,7 +7406,6 @@
*/
public static int getTimeLimit()
{
-
return directoryServer.timeLimit;
}
@@ -7680,7 +7420,6 @@
*/
public static void setTimeLimit(int timeLimit)
{
-
directoryServer.timeLimit = timeLimit;
}
@@ -7694,7 +7433,6 @@
*/
public static WritabilityMode getWritabilityMode()
{
-
return directoryServer.writabilityMode;
}
@@ -7709,7 +7447,6 @@
*/
public static void setWritabilityMode(WritabilityMode writabilityMode)
{
-
directoryServer.writabilityMode = writabilityMode;
}
@@ -7726,7 +7463,6 @@
*/
public static boolean bindWithDNRequiresPassword()
{
-
return directoryServer.bindWithDNRequiresPassword;
}
@@ -7743,7 +7479,6 @@
public static void setBindWithDNRequiresPassword(boolean
bindWithDNRequiresPassword)
{
-
directoryServer.bindWithDNRequiresPassword = bindWithDNRequiresPassword;
}
@@ -7757,7 +7492,6 @@
*/
public static boolean rejectUnauthenticatedRequests()
{
-
return directoryServer.rejectUnauthenticatedRequests;
}
@@ -7771,7 +7505,6 @@
public static void setRejectUnauthenticatedRequests(boolean
rejectUnauthenticatedRequests)
{
-
directoryServer.rejectUnauthenticatedRequests =
rejectUnauthenticatedRequests;
}
@@ -7787,7 +7520,6 @@
*/
public DN getComponentEntryDN()
{
-
try
{
if (configHandler == null)
@@ -7823,7 +7555,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -7864,7 +7595,6 @@
*/
public void uncaughtException(Thread thread, Throwable exception)
{
-
if (debugEnabled())
{
debugCought(DebugLogLevel.ERROR, exception);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
index 7a9ceea..80a80ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -72,7 +72,6 @@
*/
public EntryCacheConfigManager()
{
-
// No implementation is required.
}
@@ -90,8 +89,6 @@
public void initializeEntryCache()
throws InitializationException
{
-
-
// First, install a default entry cache so that there will be one even if
// we encounter a problem later.
try
@@ -351,8 +348,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
@@ -376,7 +371,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -406,8 +400,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
@@ -430,7 +422,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -460,8 +451,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
@@ -483,7 +472,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
index 307d9f8..9e28e2b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
@@ -142,7 +142,6 @@
*/
public final String getRequestOID()
{
-
return requestOID;
}
@@ -157,7 +156,6 @@
*/
public final void setRequestOID(String requestOID)
{
-
this.requestOID = requestOID;
}
@@ -171,7 +169,6 @@
*/
public final ASN1OctetString getRequestValue()
{
-
return requestValue;
}
@@ -186,7 +183,6 @@
*/
public final void setRequestValue(ASN1OctetString requestValue)
{
-
this.requestValue = requestValue;
}
@@ -200,7 +196,6 @@
*/
public final String getResponseOID()
{
-
return responseOID;
}
@@ -214,7 +209,6 @@
*/
public final void setResponseOID(String responseOID)
{
-
this.responseOID = responseOID;
}
@@ -228,7 +222,6 @@
*/
public final ASN1OctetString getResponseValue()
{
-
return responseValue;
}
@@ -242,7 +235,6 @@
*/
public final void setResponseValue(ASN1OctetString responseValue)
{
-
this.responseValue = responseValue;
}
@@ -254,7 +246,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -266,7 +257,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -278,7 +268,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -410,7 +399,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -444,7 +432,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -678,7 +665,6 @@
*/
public final void sendExtendedResponse()
{
-
if (! responseSent)
{
responseSent = true;
@@ -696,7 +682,6 @@
*/
public final void setResponseSent()
{
-
this.responseSent = true;
}
@@ -708,7 +693,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -751,7 +735,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -763,7 +746,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -776,7 +758,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("ExtendedOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
index d365fab..d05ec9a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -91,7 +91,6 @@
*/
public ExtendedOperationConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
handlers = new ConcurrentHashMap<DN,ExtendedOperationHandler>();
}
@@ -113,8 +112,6 @@
public void initializeExtendedOperationHandlers()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -230,8 +227,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for an extended
// operation handler.
if (! configEntry.hasObjectClass(OC_EXTENDED_OPERATION_HANDLER))
@@ -370,8 +365,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -614,8 +607,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (handlers.containsKey(configEntryDN))
@@ -793,8 +784,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -977,8 +966,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -995,8 +982,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
index 914871e..c6d3c39 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
@@ -115,7 +115,6 @@
*/
public GroupManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
groupImplementations = new ConcurrentHashMap<DN,Group>();
groupInstances = new ConcurrentHashMap<DN,Group>();
@@ -141,8 +140,6 @@
public void initializeGroupImplementations()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -249,7 +246,6 @@
*/
public void finalizeGroupManager()
{
-
deregisterAllGroups();
for (Group groupImplementation : groupImplementations.values())
@@ -271,7 +267,6 @@
*/
public Iterable<Group> getGroupImplementations()
{
-
return groupImplementations.values();
}
@@ -286,7 +281,6 @@
*/
public Iterable<Group> getGroupInstances()
{
-
return groupInstances.values();
}
@@ -303,7 +297,6 @@
*/
public Group getGroupInstance(DN entryDN)
{
-
Group group = groupInstances.get(entryDN);
if (group == null)
{
@@ -332,8 +325,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for an extended
// operation handler.
if (! configEntry.hasObjectClass(OC_GROUP_IMPLEMENTATION))
@@ -471,8 +462,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -709,8 +698,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (groupImplementations.containsKey(configEntryDN))
@@ -888,8 +875,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1051,8 +1036,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -1069,8 +1052,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1108,7 +1089,6 @@
*/
public void performBackendInitializationProcessing(Backend backend)
{
-
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -1203,7 +1183,6 @@
*/
public void performBackendFinalizationProcessing(Backend backend)
{
-
Iterator<Map.Entry<DN,Group>> iterator =
groupInstances.entrySet().iterator();
while (iterator.hasNext())
@@ -1227,7 +1206,6 @@
public void handleAddOperation(PostResponseAddOperation addOperation,
Entry entry)
{
-
List<Control> requestControls = addOperation.getRequestControls();
if (requestControls != null)
{
@@ -1252,7 +1230,6 @@
public void handleDeleteOperation(PostResponseDeleteOperation deleteOperation,
Entry entry)
{
-
List<Control> requestControls = deleteOperation.getRequestControls();
if (requestControls != null)
{
@@ -1278,7 +1255,6 @@
public void handleModifyOperation(PostResponseModifyOperation modifyOperation,
Entry oldEntry, Entry newEntry)
{
-
List<Control> requestControls = modifyOperation.getRequestControls();
if (requestControls != null)
{
@@ -1319,7 +1295,6 @@
PostResponseModifyDNOperation modifyDNOperation,
Entry oldEntry, Entry newEntry)
{
-
List<Control> requestControls = modifyDNOperation.getRequestControls();
if (requestControls != null)
{
@@ -1353,7 +1328,6 @@
*/
private void createAndRegisterGroup(Entry entry)
{
-
for (Group groupImplementation : groupImplementations.values())
{
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 47050f7..c3d07e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -89,7 +89,6 @@
*/
public IdentityMapperConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
identityMappers = new ConcurrentHashMap<DN,IdentityMapper>();
}
@@ -110,8 +109,6 @@
public void initializeIdentityMappers()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -244,8 +241,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for an identity
// mapper.
if (! configEntry.hasObjectClass(OC_IDENTITY_MAPPER))
@@ -384,8 +379,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -609,8 +602,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (identityMappers.containsKey(configEntryDN))
@@ -789,8 +780,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -953,8 +942,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -971,8 +958,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index e5ae8eb..29ec065 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -88,7 +88,6 @@
*/
public KeyManagerProviderConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
providers = new ConcurrentHashMap<DN,KeyManagerProvider>();
}
@@ -110,8 +109,6 @@
public void initializeKeyManagerProviders()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -227,8 +224,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a key manager
// provider.
if (! configEntry.hasObjectClass(OC_KEY_MANAGER_PROVIDER))
@@ -367,8 +362,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -592,8 +585,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (providers.containsKey(configEntryDN))
@@ -777,8 +768,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -941,8 +930,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -959,8 +946,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
index 6d6ce21..a3e4767 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
@@ -87,7 +87,6 @@
public static boolean acquireSharedLock(String lockFile,
StringBuilder failureReason)
{
-
mapLock.lock();
try
@@ -215,7 +214,6 @@
public static boolean acquireExclusiveLock(String lockFile,
StringBuilder failureReason)
{
-
mapLock.lock();
try
@@ -346,7 +344,6 @@
public static boolean releaseLock(String lockFile,
StringBuilder failureReason)
{
-
mapLock.lock();
try
@@ -469,7 +466,6 @@
*/
public static String getLockDirectoryPath()
{
-
String lockDirectory = System.getProperty(PROPERTY_LOCK_DIRECTORY);
if ((lockDirectory == null) || (lockDirectory.length() == 0))
{
@@ -491,7 +487,6 @@
*/
public static String getServerLockFileName()
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(getLockDirectoryPath());
buffer.append(File.separator);
@@ -515,7 +510,6 @@
*/
public static String getBackendLockFileName(Backend backend)
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(getLockDirectoryPath());
buffer.append(File.separator);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
index 84ff3c0..83f7a5b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -100,7 +100,6 @@
*/
public LoggerConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
activeAccessLoggers = new ConcurrentHashMap<DN,AccessLogger>();
@@ -123,8 +122,6 @@
public void initializeLoggers()
throws ConfigException, InitializationException
{
-
-
// First, get the logger configuration base entry.
ConfigEntry loggerBaseEntry;
try
@@ -259,7 +256,6 @@
*/
public void stopLoggers()
{
-
StartupErrorLogger errorLogger = new StartupErrorLogger();
errorLogger.initializeErrorLogger(null);
@@ -286,8 +282,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for an access,
// error, or debug logger.
boolean isAccessLogger = false;
@@ -465,8 +459,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -791,8 +783,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (activeAccessLoggers.containsKey(configEntryDN) ||
@@ -1013,8 +1003,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1260,8 +1248,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -1278,8 +1264,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
index 8352607..f44cf90 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
@@ -259,7 +259,6 @@
*/
public final ByteString getRawEntryDN()
{
-
return rawEntryDN;
}
@@ -274,7 +273,6 @@
*/
public final void setRawEntryDN(ByteString rawEntryDN)
{
-
this.rawEntryDN = rawEntryDN;
entryDN = null;
@@ -292,7 +290,6 @@
*/
public final DN getEntryDN()
{
-
return entryDN;
}
@@ -308,7 +305,6 @@
*/
public final ByteString getRawNewRDN()
{
-
return rawNewRDN;
}
@@ -324,7 +320,6 @@
*/
public final void setRawNewRDN(ByteString rawNewRDN)
{
-
this.rawNewRDN = rawNewRDN;
newRDN = null;
@@ -342,7 +337,6 @@
*/
public final RDN getNewRDN()
{
-
return newRDN;
}
@@ -356,7 +350,6 @@
*/
public final boolean deleteOldRDN()
{
-
return deleteOldRDN;
}
@@ -370,7 +363,6 @@
*/
public final void setDeleteOldRDN(boolean deleteOldRDN)
{
-
this.deleteOldRDN = deleteOldRDN;
}
@@ -386,7 +378,6 @@
*/
public final ByteString getRawNewSuperior()
{
-
return rawNewSuperior;
}
@@ -402,7 +393,6 @@
*/
public final void setRawNewSuperior(ByteString rawNewSuperior)
{
-
this.rawNewSuperior = rawNewSuperior;
newSuperior = null;
@@ -422,7 +412,6 @@
*/
public final DN getNewSuperior()
{
-
return newSuperior;
}
@@ -447,7 +436,6 @@
*/
public final List<Modification> getModifications()
{
-
return modifications;
}
@@ -463,7 +451,6 @@
*/
public final void addModification(Modification modification)
{
-
modifications.add(modification);
}
@@ -479,7 +466,6 @@
*/
public final Entry getOriginalEntry()
{
-
return currentEntry;
}
@@ -495,7 +481,6 @@
*/
public final Entry getUpdatedEntry()
{
-
return newEntry;
}
@@ -507,7 +492,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -519,7 +503,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -531,7 +514,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -546,7 +528,6 @@
*/
public final long getChangeNumber()
{
-
return changeNumber;
}
@@ -561,7 +542,6 @@
*/
public final void setChangeNumber(long changeNumber)
{
-
this.changeNumber = changeNumber;
}
@@ -705,7 +685,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -739,7 +718,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -2112,7 +2090,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -2155,7 +2132,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -2167,7 +2143,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -2180,7 +2155,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("ModifyDNOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
index 8e851e7..c7b74f4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
@@ -253,7 +253,6 @@
*/
public final ByteString getRawEntryDN()
{
-
return rawEntryDN;
}
@@ -268,7 +267,6 @@
*/
public final void setRawEntryDN(ByteString rawEntryDN)
{
-
this.rawEntryDN = rawEntryDN;
entryDN = null;
@@ -286,7 +284,6 @@
*/
public final DN getEntryDN()
{
-
return entryDN;
}
@@ -303,7 +300,6 @@
*/
public final List<LDAPModification> getRawModifications()
{
-
return rawModifications;
}
@@ -318,7 +314,6 @@
*/
public final void addRawModification(LDAPModification rawModification)
{
-
rawModifications.add(rawModification);
modifications = null;
@@ -333,7 +328,6 @@
*/
public final void setRawModifications(List<LDAPModification> rawModifications)
{
-
this.rawModifications = rawModifications;
modifications = null;
@@ -351,7 +345,6 @@
*/
public final List<Modification> getModifications()
{
-
return modifications;
}
@@ -370,7 +363,6 @@
public final void addModification(Modification modification)
throws DirectoryException
{
-
modifiedEntry.applyModification(modification);
modifications.add(modification);
}
@@ -386,7 +378,6 @@
*/
public final Entry getCurrentEntry()
{
-
return currentEntry;
}
@@ -403,7 +394,6 @@
*/
public final Entry getModifiedEntry()
{
-
return modifiedEntry;
}
@@ -422,7 +412,6 @@
*/
public final List<AttributeValue> getCurrentPasswords()
{
-
return currentPasswords;
}
@@ -440,7 +429,6 @@
*/
public final List<AttributeValue> getNewPasswords()
{
-
return newPasswords;
}
@@ -452,7 +440,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -464,7 +451,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -476,7 +462,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -491,7 +476,6 @@
*/
public final long getChangeNumber()
{
-
return changeNumber;
}
@@ -506,7 +490,6 @@
*/
public final void setChangeNumber(long changeNumber)
{
-
this.changeNumber = changeNumber;
}
@@ -637,7 +620,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -671,7 +653,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
@@ -2889,7 +2870,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
CancelResult cancelResult = getCancelResult();
@@ -2932,7 +2912,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -2944,7 +2923,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -2957,7 +2935,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("ModifyOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
index 4922a56..32ce2e3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -89,7 +89,6 @@
*/
public MonitorConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
monitorProviders = new ConcurrentHashMap<DN,MonitorProvider>();
@@ -111,8 +110,6 @@
public void initializeMonitorProviders()
throws ConfigException, InitializationException
{
-
-
// First, get the monitor configuration base entry.
ConfigEntry monitorBaseEntry;
try
@@ -228,8 +225,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a monitor
// provider.
if (! configEntry.hasObjectClass(OC_MONITOR_PROVIDER))
@@ -366,8 +361,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -590,8 +583,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (monitorProviders.containsKey(configEntryDN))
@@ -769,8 +760,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -933,8 +922,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -951,8 +938,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java b/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
index 53fe24b..d22ba24 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
@@ -153,7 +153,6 @@
protected Operation(ClientConnection clientConnection, long operationID,
int messageID, List<Control> requestControls)
{
-
this.clientConnection = clientConnection;
this.operationID = operationID;
this.messageID = messageID;
@@ -275,7 +274,6 @@
*/
public final ClientConnection getClientConnection()
{
-
return clientConnection;
}
@@ -290,7 +288,6 @@
*/
public final long getConnectionID()
{
-
return clientConnection.getConnectionID();
}
@@ -303,7 +300,6 @@
*/
public final long getOperationID()
{
-
return operationID;
}
@@ -316,7 +312,6 @@
*/
public final int getMessageID()
{
-
return messageID;
}
@@ -330,7 +325,6 @@
*/
public final List<Control> getRequestControls()
{
-
return requestControls;
}
@@ -345,7 +339,6 @@
*/
public final void addRequestControl(Control control)
{
-
requestControls.add(control);
}
@@ -360,7 +353,6 @@
*/
public final void removeRequestControl(Control control)
{
-
requestControls.remove(control);
}
@@ -407,7 +399,6 @@
*/
public final ResultCode getResultCode()
{
-
return resultCode;
}
@@ -421,7 +412,6 @@
*/
public final void setResultCode(ResultCode resultCode)
{
-
this.resultCode = resultCode;
}
@@ -436,7 +426,6 @@
*/
public final StringBuilder getErrorMessage()
{
-
return errorMessage;
}
@@ -450,7 +439,6 @@
*/
public final void setErrorMessage(StringBuilder errorMessage)
{
-
if (errorMessage == null)
{
this.errorMessage = new StringBuilder();
@@ -472,7 +460,6 @@
*/
public final void appendErrorMessage(String message)
{
-
if (errorMessage == null)
{
errorMessage = new StringBuilder(message);
@@ -500,7 +487,6 @@
*/
public final StringBuilder getAdditionalLogMessage()
{
-
return additionalLogMessage;
}
@@ -516,7 +502,6 @@
*/
public final void setAdditionalLogMessage(StringBuilder additionalLogMessage)
{
-
if (additionalLogMessage == null)
{
this.additionalLogMessage = new StringBuilder();
@@ -538,7 +523,6 @@
*/
public final void appendAdditionalLogMessage(String message)
{
-
if (additionalLogMessage == null)
{
additionalLogMessage = new StringBuilder(message);
@@ -559,7 +543,6 @@
*/
public final DN getMatchedDN()
{
-
return matchedDN;
}
@@ -573,7 +556,6 @@
*/
public final void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -589,7 +571,6 @@
*/
public final List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -603,7 +584,6 @@
*/
public final void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -619,7 +599,6 @@
*/
public final void setResponseData(DirectoryException directoryException)
{
-
this.resultCode = directoryException.getResultCode();
this.matchedDN = directoryException.getMatchedDN();
this.referralURLs = directoryException.getReferralURLs();
@@ -638,7 +617,6 @@
*/
public final boolean isInternalOperation()
{
-
return isInternalOperation;
}
@@ -655,7 +633,6 @@
*/
public final void setInternalOperation(boolean isInternalOperation)
{
-
this.isInternalOperation = isInternalOperation;
}
@@ -670,7 +647,6 @@
*/
public final boolean isSynchronizationOperation()
{
-
return isSynchronizationOperation;
}
@@ -689,7 +665,6 @@
public final void setSynchronizationOperation(
boolean isSynchronizationOperation)
{
-
this.isSynchronizationOperation = isSynchronizationOperation;
}
@@ -704,7 +679,6 @@
*/
public final void setDontSynchronize(boolean dontSynchronize)
{
-
this.dontSynchronizeFlag = dontSynchronize;
}
@@ -724,7 +698,6 @@
*/
public final Entry getAuthorizationEntry()
{
-
return authorizationEntry;
}
@@ -760,7 +733,6 @@
*/
public final DN getAuthorizationDN()
{
-
if (authorizationEntry == null)
{
return DN.nullDN();
@@ -781,7 +753,6 @@
*/
public final Map<String,Object> getAttachments()
{
-
return attachments;
}
@@ -798,7 +769,6 @@
*/
public final Object getAttachment(String name)
{
-
return attachments.get(name);
}
@@ -815,7 +785,6 @@
*/
public final Object removeAttachment(String name)
{
-
return attachments.remove(name);
}
@@ -834,7 +803,6 @@
*/
public final Object setAttachment(String name, Object value)
{
-
return attachments.put(name, value);
}
@@ -888,8 +856,6 @@
*/
public final void operationCompleted()
{
-
-
// Notify the client connection that this operation is complete and that it
// no longer needs to be retained.
clientConnection.removeOperationInProgress(messageID);
@@ -946,7 +912,6 @@
*/
public final CancelResult getCancelResult()
{
-
return cancelResult;
}
@@ -959,7 +924,6 @@
*/
public final void setCancelResult(CancelResult cancelResult)
{
-
this.cancelResult = cancelResult;
}
@@ -976,7 +940,6 @@
*/
protected final void indicateCancelled(CancelRequest cancelRequest)
{
-
setCancelResult(CancelResult.CANCELED);
if (cancelRequest.notifyOriginalRequestor() ||
@@ -1003,7 +966,6 @@
*/
public final String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index 808575f..93b1bd1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -90,7 +90,6 @@
*/
public PasswordGeneratorConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
passwordGenerators = new ConcurrentHashMap<DN,PasswordGenerator>();
}
@@ -112,8 +111,6 @@
public void initializePasswordGenerators()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -229,8 +226,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a password
// generator.
if (! configEntry.hasObjectClass(OC_PASSWORD_GENERATOR))
@@ -369,8 +364,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -596,8 +589,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (passwordGenerators.containsKey(configEntryDN))
@@ -775,8 +766,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -939,8 +928,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -957,8 +944,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
index 4f43ad2..34b7c0c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -198,7 +198,6 @@
*/
private PasswordPolicy()
{
-
configEntryDN = null;
passwordAttribute = null;
authPasswordSyntax = false;
@@ -1460,7 +1459,6 @@
*/
public AttributeType getPasswordAttribute()
{
-
return passwordAttribute;
}
@@ -1475,7 +1473,6 @@
*/
public boolean usesAuthPasswordSyntax()
{
-
return authPasswordSyntax;
}
@@ -1491,7 +1488,6 @@
*/
public CopyOnWriteArrayList<PasswordStorageScheme> getDefaultStorageSchemes()
{
-
return defaultStorageSchemes;
}
@@ -1509,7 +1505,6 @@
*/
public boolean isDefaultStorageScheme(String name)
{
-
CopyOnWriteArrayList<PasswordStorageScheme> defaultSchemes =
getDefaultStorageSchemes();
if (defaultSchemes == null)
@@ -1553,7 +1548,6 @@
*/
public CopyOnWriteArraySet<String> getDeprecatedStorageSchemes()
{
-
return deprecatedStorageSchemes;
}
@@ -1570,7 +1564,6 @@
*/
public boolean isDeprecatedStorageScheme(String name)
{
-
CopyOnWriteArraySet<String> deprecatedSchemes =
getDeprecatedStorageSchemes();
if (deprecatedSchemes == null)
@@ -1599,7 +1592,6 @@
*/
public ConcurrentHashMap<DN,PasswordValidator> getPasswordValidators()
{
-
return passwordValidators;
}
@@ -1616,7 +1608,6 @@
public ConcurrentHashMap<DN,AccountStatusNotificationHandler>
getAccountStatusNotificationHandlers()
{
-
return notificationHandlers;
}
@@ -1631,7 +1622,6 @@
*/
public boolean allowUserPasswordChanges()
{
-
return allowUserPasswordChanges;
}
@@ -1647,7 +1637,6 @@
*/
public boolean requireCurrentPassword()
{
-
return requireCurrentPassword;
}
@@ -1663,7 +1652,6 @@
*/
public boolean forceChangeOnAdd()
{
-
return forceChangeOnAdd;
}
@@ -1679,7 +1667,6 @@
*/
public boolean forceChangeOnReset()
{
-
return forceChangeOnReset;
}
@@ -1696,7 +1683,6 @@
*/
public boolean skipValidationForAdministrators()
{
-
return skipValidationForAdministrators;
}
@@ -1709,7 +1695,6 @@
*/
public DN getPasswordGeneratorDN()
{
-
return passwordGeneratorDN;
}
@@ -1724,7 +1709,6 @@
*/
public PasswordGenerator getPasswordGenerator()
{
-
return passwordGenerator;
}
@@ -1741,7 +1725,6 @@
*/
public boolean requireSecureAuthentication()
{
-
return requireSecureAuthentication;
}
@@ -1759,7 +1742,6 @@
*/
public boolean requireSecurePasswordChanges()
{
-
return requireSecurePasswordChanges;
}
@@ -1774,7 +1756,6 @@
*/
public boolean allowMultiplePasswordValues()
{
-
return allowMultiplePasswordValues;
}
@@ -1789,7 +1770,6 @@
*/
public boolean allowPreEncodedPasswords()
{
-
return allowPreEncodedPasswords;
}
@@ -1805,7 +1785,6 @@
*/
public int getMinimumPasswordAge()
{
-
if (minimumPasswordAge <= 0)
{
return 0;
@@ -1826,7 +1805,6 @@
*/
public int getMaximumPasswordAge()
{
-
if (maximumPasswordAge < 0)
{
return 0;
@@ -1848,7 +1826,6 @@
*/
public int getMaximumPasswordResetAge()
{
-
if (maximumPasswordResetAge < 0)
{
return 0;
@@ -1869,7 +1846,6 @@
*/
public int getWarningInterval()
{
-
if (warningInterval < 0)
{
return 0;
@@ -1891,7 +1867,6 @@
*/
public boolean expirePasswordsWithoutWarning()
{
-
return expirePasswordsWithoutWarning;
}
@@ -1909,7 +1884,6 @@
*/
public boolean allowExpiredPasswordChanges()
{
-
return allowExpiredPasswordChanges;
}
@@ -1927,7 +1901,6 @@
*/
public int getGraceLoginCount()
{
-
if (graceLoginCount < 0)
{
return 0;
@@ -1948,7 +1921,6 @@
*/
public int getLockoutFailureCount()
{
-
if (lockoutFailureCount < 0)
{
return 0;
@@ -1970,7 +1942,6 @@
*/
public int getLockoutDuration()
{
-
if (lockoutDuration < 0)
{
return 0;
@@ -1993,7 +1964,6 @@
*/
public int getLockoutFailureExpirationInterval()
{
-
if (lockoutFailureExpirationInterval < 0)
{
return 0;
@@ -2017,7 +1987,6 @@
*/
public long getRequireChangeByTime()
{
-
if (requireChangeByTime < 0)
{
return 0;
@@ -2036,7 +2005,6 @@
*/
public AttributeType getLastLoginTimeAttribute()
{
-
return lastLoginTimeAttribute;
}
@@ -2051,7 +2019,6 @@
*/
public String getLastLoginTimeFormat()
{
-
return lastLoginTimeFormat;
}
@@ -2066,7 +2033,6 @@
*/
public CopyOnWriteArrayList<String> getPreviousLastLoginTimeFormats()
{
-
return previousLastLoginTimeFormats;
}
@@ -2082,7 +2048,6 @@
*/
public int getIdleLockoutInterval()
{
-
if (idleLockoutInterval < 0)
{
return 0;
@@ -2100,7 +2065,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -2116,8 +2080,6 @@
*/
public void toString(StringBuilder buffer)
{
-
-
buffer.append("Password Attribute: ");
buffer.append(passwordAttribute.getNameOrOID());
buffer.append(EOL);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
index 07cea50..5bf9c61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
@@ -84,7 +84,6 @@
*/
public PasswordPolicyConfig(PasswordPolicy policy)
{
-
this.currentPolicy = policy;
DirectoryServer.registerConfigurableComponent(this);
}
@@ -96,7 +95,6 @@
*/
public void finalizePasswordPolicyConfig()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -111,7 +109,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return currentPolicy.getConfigEntryDN();
}
@@ -126,8 +123,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
// Create a list of units and values that we can use to represent time
// periods.
LinkedHashMap<String,Double> timeUnits = new LinkedHashMap<String,Double>();
@@ -402,7 +397,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
assert configEntry.getDN().equals(this.currentPolicy.getConfigEntryDN() )
: "Internal Error: mismatch between DN of configuration entry and"
+ "DN of current password policy." ;
@@ -457,7 +451,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
assert configEntry.getDN().equals(this.currentPolicy.getConfigEntryDN() )
: "Internal Error: mismatch between DN of configuration entry and"
+ "DN of current password policy." ;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index 18ca927..9d3af44 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -85,8 +85,6 @@
public void initializePasswordPolicies()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -203,8 +201,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// See if we can create a password policy from the provided configuration
// entry. If so, then it's acceptable.
try
@@ -254,8 +250,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ArrayList<String> messages = new ArrayList<String>();
@@ -315,8 +309,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// We'll allow the policy to be removed as long as it isn't the default.
// FIXME: something like a referential integrity check is needed to ensure
// a policy is not removed when referenced by a user entry (either
@@ -348,8 +340,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
// We'll allow the policy to be removed as long as it isn't the default.
// FIXME: something like a referential integrity check is needed to ensure
// a policy is not removed when referenced by a user entry (either
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
index 0d10d51..f0a8022 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -206,8 +206,6 @@
boolean debug)
throws DirectoryException
{
-
-
this.userEntry = userEntry;
this.updateEntry = updateEntry;
this.debug = debug;
@@ -290,8 +288,6 @@
private PasswordPolicy getPasswordPolicyInternal()
throws DirectoryException
{
-
-
// See if the user entry contains the ds-pwp-password-policy-dn attribute to
// select a custom objectclass (whether real or virtual).
AttributeType type =
@@ -406,7 +402,6 @@
*/
private String getValue(AttributeType attributeType)
{
-
List<Attribute> attrList = userEntry.getAttribute(attributeType);
if ((attrList == null) || attrList.isEmpty())
{
@@ -462,7 +457,6 @@
private long getGeneralizedTime(AttributeType attributeType)
throws DirectoryException
{
-
List<Attribute> attrList = userEntry.getAttribute(attributeType);
if ((attrList == null) || attrList.isEmpty())
{
@@ -547,8 +541,6 @@
private List<Long> getGeneralizedTimes(AttributeType attributeType)
throws DirectoryException
{
-
-
ArrayList<Long> timeValues = new ArrayList<Long>();
List<Attribute> attrList = userEntry.getAttribute(attributeType);
@@ -626,7 +618,6 @@
private boolean getBoolean(AttributeType attributeType, boolean defaultValue)
throws DirectoryException
{
-
List<Attribute> attrList = userEntry.getAttribute(attributeType);
if ((attrList == null) || attrList.isEmpty())
{
@@ -723,7 +714,6 @@
*/
public PasswordPolicy getPolicy()
{
-
return passwordPolicy;
}
@@ -739,7 +729,6 @@
*/
public LinkedList<Modification> getModifications()
{
-
return modifications;
}
@@ -752,7 +741,6 @@
*/
public LinkedHashSet<AttributeValue> getPasswordValues()
{
-
List<Attribute> attrList =
userEntry.getAttribute(passwordPolicy.getPasswordAttribute());
for (Attribute a : attrList)
@@ -775,7 +763,6 @@
*/
public boolean requireSecureAuthentication()
{
-
return passwordPolicy.requireSecureAuthentication();
}
@@ -788,7 +775,6 @@
*/
public long getCurrentTime()
{
-
return currentTime;
}
@@ -803,7 +789,6 @@
*/
public String getCurrentGeneralizedTime()
{
-
return currentGeneralizedTime;
}
@@ -814,7 +799,6 @@
*/
public void setPasswordChangedTime()
{
-
if (debug)
{
if (debugEnabled())
@@ -866,7 +850,6 @@
*/
public boolean isDisabled()
{
-
if ((isDisabled == null) || (isDisabled == ConditionResult.UNDEFINED))
{
AttributeType type =
@@ -961,7 +944,6 @@
*/
public void setDisabled(boolean isDisabled)
{
-
if (debug)
{
if (debugEnabled())
@@ -1033,7 +1015,6 @@
*/
public boolean isAccountExpired()
{
-
if ((isAccountExpired == null) ||
(isAccountExpired == ConditionResult.UNDEFINED))
{
@@ -1150,7 +1131,6 @@
*/
public List<Long> getAuthFailureTimes()
{
-
if (authFailureTimes == null)
{
AttributeType type =
@@ -1296,7 +1276,6 @@
*/
public void updateAuthFailureTimes()
{
-
if (debug)
{
if (debugEnabled())
@@ -1368,7 +1347,6 @@
*/
public void clearAuthFailureTimes()
{
-
if (debug)
{
if (debugEnabled())
@@ -1415,8 +1393,6 @@
*/
public boolean lockedDueToFailures()
{
-
-
int maxFailures = passwordPolicy.getLockoutFailureCount();
if (maxFailures <= 0)
{
@@ -1579,7 +1555,6 @@
*/
public int getSecondsUntilUnlock()
{
-
if (secondsUntilUnlock < 0)
{
return -1;
@@ -1598,7 +1573,6 @@
*/
public void lockDueToFailures()
{
-
if (debug)
{
if (debugEnabled())
@@ -1643,7 +1617,6 @@
*/
public void clearFailureLockout()
{
-
if (debug)
{
if (debugEnabled())
@@ -1687,7 +1660,6 @@
*/
public long getLastLoginTime()
{
-
if (lastLoginTime == Long.MIN_VALUE)
{
AttributeType type = passwordPolicy.getLastLoginTimeAttribute();
@@ -1834,7 +1806,6 @@
*/
public void setLastLoginTime()
{
-
AttributeType type = passwordPolicy.getLastLoginTimeAttribute();
String format = passwordPolicy.getLastLoginTimeFormat();
@@ -1921,7 +1892,6 @@
*/
public boolean lockedDueToIdleInterval()
{
-
if ((isIdleLocked == null) || (isIdleLocked == ConditionResult.UNDEFINED))
{
if (passwordPolicy.getIdleLockoutInterval() <= 0)
@@ -2066,7 +2036,6 @@
*/
public boolean mustChangePassword()
{
-
// If the password policy doesn't use force change on add or force change on
// reset, or if it forbits the user from changing their password, then this
// must return false.
@@ -2183,7 +2152,6 @@
*/
public void setMustChangePassword(boolean mustChangePassword)
{
-
if (debug)
{
if (debugEnabled())
@@ -2254,7 +2222,6 @@
*/
public boolean lockedDueToMaximumResetAge()
{
-
if (passwordPolicy.getMaximumPasswordResetAge() <= 0)
{
if (debug)
@@ -2315,7 +2282,6 @@
*/
public long getPasswordExpirationTime()
{
-
if (expirationTime == Long.MIN_VALUE)
{
expirationTime = Long.MAX_VALUE;
@@ -2506,7 +2472,6 @@
*/
public boolean isPasswordExpired()
{
-
if ((isPasswordExpired == null) ||
(isPasswordExpired == ConditionResult.UNDEFINED))
{
@@ -2535,7 +2500,6 @@
*/
public boolean isWithinMinimumAge()
{
-
int minAge = passwordPolicy.getMinimumPasswordAge();
if (minAge <= 0)
{
@@ -2605,7 +2569,6 @@
*/
public boolean mayUseGraceLogin()
{
-
if ((mayUseGraceLogin == null) ||
(mayUseGraceLogin == ConditionResult.UNDEFINED))
{
@@ -2634,7 +2597,6 @@
*/
public boolean shouldWarn()
{
-
if ((shouldWarn == null) || (shouldWarn == ConditionResult.UNDEFINED))
{
getPasswordExpirationTime();
@@ -2661,7 +2623,6 @@
*/
public boolean isFirstWarning()
{
-
if ((isFirstWarning == null) ||
(isFirstWarning == ConditionResult.UNDEFINED))
{
@@ -2689,7 +2650,6 @@
*/
public int getSecondsUntilExpiration()
{
-
long expirationTime = getPasswordExpirationTime();
if (expirationTime < 0)
{
@@ -2717,7 +2677,6 @@
*/
public long getRequiredChangeTime()
{
-
if (requiredChangeTime == Long.MIN_VALUE)
{
AttributeType type = DirectoryServer.getAttributeType(
@@ -2768,7 +2727,6 @@
*/
public void setRequiredChangeTime()
{
-
if (debug)
{
if (debugEnabled())
@@ -2820,8 +2778,6 @@
*/
public long getWarnedTime()
{
-
-
if (warnedTime == Long.MIN_VALUE)
{
AttributeType type =
@@ -2869,7 +2825,6 @@
*/
public void setWarnedTime()
{
-
long warnTime = getWarnedTime();
if (warnTime == currentTime)
{
@@ -2921,7 +2876,6 @@
*/
public void clearWarnedTime()
{
-
AttributeType type =
DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_WARNED_TIME, true);
if (updateEntry)
@@ -2954,8 +2908,6 @@
*/
public List<Long> getGraceLoginTimes()
{
-
-
if (graceLoginTimes == null)
{
AttributeType type = DirectoryServer.getAttributeType(
@@ -3021,7 +2973,6 @@
*/
public int getGraceLoginsRemaining()
{
-
int maxGraceLogins = passwordPolicy.getGraceLoginCount();
if (maxGraceLogins <= 0)
{
@@ -3040,7 +2991,6 @@
*/
public void updateGraceLoginTimes()
{
-
if (debug)
{
if (debugEnabled())
@@ -3111,7 +3061,6 @@
*/
public void clearGraceLoginTimes()
{
-
if (debug)
{
if (debugEnabled())
@@ -3282,8 +3231,6 @@
*/
public boolean passwordMatches(ByteString password)
{
-
-
List<Attribute> attrList =
userEntry.getAttribute(passwordPolicy.getPasswordAttribute());
if ((attrList == null) || attrList.isEmpty())
@@ -3449,7 +3396,6 @@
*/
public boolean passwordIsPreEncoded(ByteString passwordValue)
{
-
if (passwordPolicy.usesAuthPasswordSyntax())
{
return AuthPasswordSyntax.isEncoded(passwordValue);
@@ -3476,7 +3422,6 @@
public List<ByteString> encodePassword(ByteString password)
throws DirectoryException
{
-
List<PasswordStorageScheme> schemes =
passwordPolicy.getDefaultStorageSchemes();
List<ByteString> encodedPasswords =
@@ -3524,7 +3469,6 @@
Set<ByteString> currentPasswords,
StringBuilder invalidReason)
{
-
for (DN validatorDN : passwordPolicy.getPasswordValidators().keySet())
{
PasswordValidator validator =
@@ -3571,7 +3515,6 @@
*/
public void handleDeprecatedStorageSchemes(ByteString password)
{
-
if (passwordPolicy.getDefaultStorageSchemes().isEmpty())
{
if (debug)
@@ -3976,7 +3919,6 @@
public ByteString generatePassword()
throws DirectoryException
{
-
PasswordGenerator generator = passwordPolicy.getPasswordGenerator();
if (generator == null)
{
@@ -4010,8 +3952,6 @@
AccountStatusNotificationType notificationType,
DN userDN, int messageID, String message)
{
-
-
Collection<AccountStatusNotificationHandler> handlers =
passwordPolicy.getAccountStatusNotificationHandlers().values();
if ((handlers == null) || handlers.isEmpty())
@@ -4037,8 +3977,6 @@
public void generateAccountStatusNotification(
AccountStatusNotification notification)
{
-
-
Collection<AccountStatusNotificationHandler> handlers =
passwordPolicy.getAccountStatusNotificationHandlers().values();
if ((handlers == null) || handlers.isEmpty())
@@ -4064,8 +4002,6 @@
public void updateUserEntry()
throws DirectoryException
{
-
-
// If there are no modifications, then there's nothing to do.
if (modifications.isEmpty())
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index e71be2b..cc9aa2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -89,7 +89,6 @@
*/
public PasswordStorageSchemeConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
storageSchemes = new ConcurrentHashMap<DN,PasswordStorageScheme>();
}
@@ -111,8 +110,6 @@
public void initializePasswordStorageSchemes()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -228,8 +225,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a password
// storage scheme.
if (! configEntry.hasObjectClass(OC_PASSWORD_STORAGE_SCHEME))
@@ -368,8 +363,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -596,8 +589,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (storageSchemes.containsKey(configEntryDN))
@@ -776,8 +767,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -940,8 +929,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -958,8 +945,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index e3b8649..26b351f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -88,7 +88,6 @@
*/
public PasswordValidatorConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
passwordValidators = new ConcurrentHashMap<DN,PasswordValidator>();
}
@@ -110,8 +109,6 @@
public void initializePasswordValidators()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -227,8 +224,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a password
// validator.
if (! configEntry.hasObjectClass(OC_PASSWORD_VALIDATOR))
@@ -367,8 +362,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -594,8 +587,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (passwordValidators.containsKey(configEntryDN))
@@ -773,8 +764,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -937,8 +926,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -955,8 +942,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java b/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
index 34be963..4fd52ba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
@@ -90,7 +90,6 @@
Set<PersistentSearchChangeType> changeTypes,
boolean returnECs)
{
-
this.searchOperation = searchOperation;
this.changeTypes = changeTypes;
this.returnECs = returnECs;
@@ -109,7 +108,6 @@
*/
public SearchOperation getSearchOperation()
{
-
return searchOperation;
}
@@ -122,7 +120,6 @@
*/
public Set<PersistentSearchChangeType> getChangeTypes()
{
-
return changeTypes;
}
@@ -135,7 +132,6 @@
*/
public boolean getReturnECs()
{
-
return returnECs;
}
@@ -148,7 +144,6 @@
*/
public DN getBaseDN()
{
-
return baseDN;
}
@@ -161,7 +156,6 @@
*/
public SearchScope getScope()
{
-
return scope;
}
@@ -174,7 +168,6 @@
*/
public SearchFilter getFilter()
{
-
return filter;
}
@@ -188,8 +181,6 @@
*/
public void processAdd(AddOperation addOperation, Entry entry)
{
-
-
// See if we care about add operations.
if (! changeTypes.contains(PersistentSearchChangeType.ADD))
{
@@ -305,8 +296,6 @@
*/
public void processDelete(DeleteOperation deleteOperation, Entry entry)
{
-
-
// See if we care about delete operations.
if (! changeTypes.contains(PersistentSearchChangeType.DELETE))
{
@@ -424,8 +413,6 @@
public void processModify(ModifyOperation modifyOperation, Entry oldEntry,
Entry newEntry)
{
-
-
// See if we care about modify operations.
if (! changeTypes.contains(PersistentSearchChangeType.MODIFY))
{
@@ -544,8 +531,6 @@
public void processModifyDN(ModifyDNOperation modifyDNOperation,
Entry oldEntry, Entry newEntry)
{
-
-
// See if we care about modify DN operations.
if (! changeTypes.contains(PersistentSearchChangeType.MODIFY_DN))
{
@@ -684,7 +669,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -700,7 +684,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("PersistentSearch(connID=");
buffer.append(searchOperation.getConnectionID());
buffer.append(",opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
index 3d7d0a1..ed24e78 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
@@ -160,7 +160,6 @@
*/
public PluginConfigManager()
{
-
pluginLock = new ReentrantLock();
startupPlugins = new DirectoryServerPlugin[0];
@@ -236,8 +235,6 @@
public void initializePluginConfig(Set<PluginType> pluginTypes)
throws ConfigException, InitializationException
{
-
-
registeredPlugins.clear();
@@ -583,7 +580,6 @@
*/
public ConcurrentHashMap<DN,DirectoryServerPlugin> getRegisteredPlugins()
{
-
return registeredPlugins;
}
@@ -600,7 +596,6 @@
*/
public DirectoryServerPlugin getRegisteredPlugin(DN pluginDN)
{
-
return registeredPlugins.get(pluginDN);
}
@@ -622,8 +617,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a plugin.
if (! configEntry.hasObjectClass(OC_PLUGIN))
{
@@ -795,8 +788,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1073,8 +1064,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
return false;
}
@@ -1092,8 +1081,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -1121,8 +1108,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
return false;
}
@@ -1139,8 +1124,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -1165,7 +1148,6 @@
private void registerPlugin(DirectoryServerPlugin plugin, DN pluginEntryDN,
HashSet<PluginType> pluginTypes)
{
-
pluginLock.lock();
try
@@ -1366,7 +1348,6 @@
private DirectoryServerPlugin[] addPlugin(DirectoryServerPlugin[] pluginArray,
DirectoryServerPlugin plugin)
{
-
DirectoryServerPlugin[] newPlugins =
new DirectoryServerPlugin[pluginArray.length+1];
System.arraycopy(pluginArray, 0, newPlugins, 0, pluginArray.length);
@@ -1385,7 +1366,6 @@
*/
private void deregisterPlugin(DN configEntryDN)
{
-
pluginLock.lock();
try
@@ -1594,7 +1574,6 @@
removePlugin(DirectoryServerPlugin[] pluginArray,
DirectoryServerPlugin plugin)
{
-
int slot = -1;
int length = pluginArray.length;
for (int i=0; i < length; i++)
@@ -1646,8 +1625,6 @@
*/
public StartupPluginResult invokeStartupPlugins()
{
-
-
StartupPluginResult result = null;
for (DirectoryServerPlugin p : startupPlugins)
@@ -1727,8 +1704,6 @@
*/
public void invokeShutdownPlugins(String reason)
{
-
-
for (DirectoryServerPlugin p : shutdownPlugins)
{
try
@@ -1764,8 +1739,6 @@
public PostConnectPluginResult invokePostConnectPlugins(ClientConnection
clientConnection)
{
-
-
PostConnectPluginResult result = null;
for (DirectoryServerPlugin p : postConnectPlugins)
@@ -1869,8 +1842,6 @@
DisconnectReason disconnectReason,
int messageID, String message)
{
-
-
PostDisconnectPluginResult result = null;
for (DirectoryServerPlugin p : postDisconnectPlugins)
@@ -1941,7 +1912,6 @@
public LDIFPluginResult invokeLDIFImportPlugins(LDIFImportConfig importConfig,
Entry entry)
{
-
LDIFPluginResult result = null;
for (DirectoryServerPlugin p : ldifImportPlugins)
@@ -2008,7 +1978,6 @@
public LDIFPluginResult invokeLDIFExportPlugins(LDIFExportConfig exportConfig,
Entry entry)
{
-
LDIFPluginResult result = null;
for (DirectoryServerPlugin p : ldifExportPlugins)
@@ -2074,7 +2043,6 @@
public PreParsePluginResult invokePreParseAbandonPlugins(
AbandonOperation abandonOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseAbandonPlugins)
@@ -2157,7 +2125,6 @@
public PreParsePluginResult invokePreParseAddPlugins(AddOperation
addOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseAddPlugins)
@@ -2238,7 +2205,6 @@
public PreParsePluginResult invokePreParseBindPlugins(
BindOperation bindOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseBindPlugins)
@@ -2319,7 +2285,6 @@
public PreParsePluginResult invokePreParseComparePlugins(
CompareOperation compareOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseComparePlugins)
@@ -2402,7 +2367,6 @@
public PreParsePluginResult invokePreParseDeletePlugins(
DeleteOperation deleteOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseDeletePlugins)
@@ -2485,7 +2449,6 @@
public PreParsePluginResult invokePreParseExtendedPlugins(
ExtendedOperation extendedOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseExtendedPlugins)
@@ -2568,7 +2531,6 @@
public PreParsePluginResult invokePreParseModifyPlugins(
ModifyOperation modifyOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseModifyPlugins)
@@ -2651,7 +2613,6 @@
public PreParsePluginResult invokePreParseModifyDNPlugins(
ModifyDNOperation modifyDNOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseModifyDNPlugins)
@@ -2734,7 +2695,6 @@
public PreParsePluginResult invokePreParseSearchPlugins(
SearchOperation searchOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseSearchPlugins)
@@ -2817,7 +2777,6 @@
public PreParsePluginResult invokePreParseUnbindPlugins(
UnbindOperation unbindOperation)
{
-
PreParsePluginResult result = null;
for (DirectoryServerPlugin p : preParseUnbindPlugins)
@@ -2900,7 +2859,6 @@
public PreOperationPluginResult invokePreOperationAddPlugins(
AddOperation addOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationAddPlugins)
@@ -2981,7 +2939,6 @@
public PreOperationPluginResult invokePreOperationBindPlugins(
BindOperation bindOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationBindPlugins)
@@ -3062,7 +3019,6 @@
public PreOperationPluginResult invokePreOperationComparePlugins(
CompareOperation compareOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationComparePlugins)
@@ -3145,7 +3101,6 @@
public PreOperationPluginResult invokePreOperationDeletePlugins(
DeleteOperation deleteOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationDeletePlugins)
@@ -3228,7 +3183,6 @@
public PreOperationPluginResult invokePreOperationExtendedPlugins(
ExtendedOperation extendedOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationExtendedPlugins)
@@ -3311,7 +3265,6 @@
public PreOperationPluginResult invokePreOperationModifyPlugins(
ModifyOperation modifyOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationModifyPlugins)
@@ -3394,7 +3347,6 @@
public PreOperationPluginResult invokePreOperationModifyDNPlugins(
ModifyDNOperation modifyDNOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationModifyDNPlugins)
@@ -3477,7 +3429,6 @@
public PreOperationPluginResult invokePreOperationSearchPlugins(
SearchOperation searchOperation)
{
-
PreOperationPluginResult result = null;
for (DirectoryServerPlugin p : preOperationSearchPlugins)
@@ -3560,7 +3511,6 @@
public PostOperationPluginResult invokePostOperationAbandonPlugins(
AbandonOperation abandonOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationAbandonPlugins)
@@ -3643,7 +3593,6 @@
public PostOperationPluginResult invokePostOperationAddPlugins(
AddOperation addOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationAddPlugins)
@@ -3724,7 +3673,6 @@
public PostOperationPluginResult invokePostOperationBindPlugins(
BindOperation bindOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationBindPlugins)
@@ -3805,7 +3753,6 @@
public PostOperationPluginResult invokePostOperationComparePlugins(
CompareOperation compareOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationComparePlugins)
@@ -3888,7 +3835,6 @@
public PostOperationPluginResult invokePostOperationDeletePlugins(
DeleteOperation deleteOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationDeletePlugins)
@@ -3971,7 +3917,6 @@
public PostOperationPluginResult invokePostOperationExtendedPlugins(
ExtendedOperation extendedOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationExtendedPlugins)
@@ -4054,7 +3999,6 @@
public PostOperationPluginResult invokePostOperationModifyPlugins(
ModifyOperation modifyOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationModifyPlugins)
@@ -4137,7 +4081,6 @@
public PostOperationPluginResult invokePostOperationModifyDNPlugins(
ModifyDNOperation modifyDNOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationModifyDNPlugins)
@@ -4220,7 +4163,6 @@
public PostOperationPluginResult invokePostOperationSearchPlugins(
SearchOperation searchOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationSearchPlugins)
@@ -4303,7 +4245,6 @@
public PostOperationPluginResult invokePostOperationUnbindPlugins(
UnbindOperation unbindOperation)
{
-
PostOperationPluginResult result = null;
for (DirectoryServerPlugin p : postOperationUnbindPlugins)
@@ -4386,7 +4327,6 @@
public PostResponsePluginResult invokePostResponseAddPlugins(
AddOperation addOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseAddPlugins)
@@ -4461,7 +4401,6 @@
public PostResponsePluginResult invokePostResponseBindPlugins(
BindOperation bindOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseBindPlugins)
@@ -4536,7 +4475,6 @@
public PostResponsePluginResult invokePostResponseComparePlugins(
CompareOperation compareOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseComparePlugins)
@@ -4611,7 +4549,6 @@
public PostResponsePluginResult invokePostResponseDeletePlugins(
DeleteOperation deleteOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseDeletePlugins)
@@ -4686,7 +4623,6 @@
public PostResponsePluginResult invokePostResponseExtendedPlugins(
ExtendedOperation extendedOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseExtendedPlugins)
@@ -4761,7 +4697,6 @@
public PostResponsePluginResult invokePostResponseModifyPlugins(
ModifyOperation modifyOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseModifyPlugins)
@@ -4836,7 +4771,6 @@
public PostResponsePluginResult invokePostResponseModifyDNPlugins(
ModifyDNOperation modifyDNOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseModifyDNPlugins)
@@ -4911,7 +4845,6 @@
public PostResponsePluginResult invokePostResponseSearchPlugins(
SearchOperation searchOperation)
{
-
PostResponsePluginResult result = null;
for (DirectoryServerPlugin p : postResponseSearchPlugins)
@@ -4988,7 +4921,6 @@
SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
SearchEntryPluginResult result = null;
for (DirectoryServerPlugin p : searchResultEntryPlugins)
@@ -5061,7 +4993,6 @@
SearchOperation searchOperation,
SearchResultReference searchReference)
{
-
SearchReferencePluginResult result = null;
for (DirectoryServerPlugin p : searchResultReferencePlugins)
@@ -5133,7 +5064,6 @@
invokeIntermediateResponsePlugins(
IntermediateResponse intermediateResponse)
{
-
IntermediateResponsePluginResult result = null;
Operation operation = intermediateResponse.getOperation();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
index 4f75047..e4a02a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
@@ -99,7 +99,6 @@
*/
public RootDNConfigManager()
{
-
bindMappings = new ConcurrentHashMap<DN,List<DN>>();
}
@@ -119,8 +118,6 @@
public void initializeRootDNs()
throws ConfigException, InitializationException
{
-
-
// First, get the base configuration entry for the root DNs.
ConfigHandler configHandler = DirectoryServer.getConfigHandler();
ConfigEntry baseEntry;
@@ -281,7 +278,6 @@
*/
public Set<Privilege> getRootPrivileges()
{
-
return rootPrivileges;
}
@@ -303,8 +299,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a root DN.
if (! configEntry.hasObjectClass(OC_ROOT_DN))
{
@@ -378,8 +372,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -488,8 +480,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN, and that
// there is no other root user with a conflicting alternate bind DN.
DN configEntryDN = configEntry.getDN();
@@ -576,8 +566,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -687,8 +675,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -705,8 +691,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -791,8 +775,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
int msgID = MSGID_CONFIG_ROOTDN_DESCRIPTION_ROOT_PRIVILEGE;
MultiChoiceConfigAttribute rootPrivStub =
new MultiChoiceConfigAttribute(ATTR_DEFAULT_ROOT_PRIVILEGE_NAME,
@@ -864,8 +846,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
ArrayList<String> messages = new ArrayList<String>();
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
index 9eb1f7c..db431cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
@@ -90,7 +90,6 @@
*/
public SASLConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
handlers = new ConcurrentHashMap<DN,SASLMechanismHandler>();
}
@@ -112,8 +111,6 @@
public void initializeSASLMechanismHandlers()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -229,8 +226,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a SASL
// mechanism handler.
if (! configEntry.hasObjectClass(OC_SASL_MECHANISM_HANDLER))
@@ -369,8 +364,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -591,8 +584,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (handlers.containsKey(configEntryDN))
@@ -770,8 +761,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -933,8 +922,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -951,8 +938,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
index 50fe638..c551e21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -109,7 +109,6 @@
*/
public SchemaConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
schema = new Schema();
@@ -124,7 +123,6 @@
*/
public static String getSchemaDirectoryPath()
{
-
String schemaDirPath = System.getProperty(PROPERTY_SCHEMA_DIRECTORY);
if ((schemaDirPath == null) || (schemaDirPath.length() == 0))
{
@@ -150,7 +148,6 @@
*/
public Schema getSchema()
{
-
return schema;
}
@@ -170,8 +167,6 @@
public void initializeMatchingRules()
throws ConfigException, InitializationException
{
-
-
// First, get the matching rule configuration base entry.
ConfigEntry matchingRuleBaseEntry;
try
@@ -418,8 +413,6 @@
public void initializeAttributeSyntaxes()
throws ConfigException, InitializationException
{
-
-
// First, get the attribute syntax configuration base entry.
ConfigEntry syntaxBaseEntry;
try
@@ -669,8 +662,6 @@
public void initializeSchemaFromFiles()
throws ConfigException, InitializationException
{
-
-
// Construct the path to the directory that should contain the schema files
// and make sure that it exists and is a directory. Get a list of the files
// in that directory sorted in alphabetic order.
@@ -790,7 +781,6 @@
public static void loadSchemaFile(Schema schema, String schemaFile)
throws ConfigException, InitializationException
{
-
loadSchemaFile(schema, schemaFile, true);
}
@@ -821,8 +811,6 @@
boolean failOnError)
throws ConfigException, InitializationException
{
-
-
// Create an LDIF reader to use when reading the files.
String schemaDirPath = getSchemaDirectoryPath();
LDIFReader reader;
@@ -1734,8 +1722,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
// If we've gotten here then the monitor entry appears to be acceptable.
@@ -1756,8 +1742,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1790,8 +1774,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
// If we've gotten here then the monitor entry appears to be acceptable.
@@ -1811,8 +1793,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -1841,8 +1821,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI -- Should we allow deletes of elements with this as superior?
return true;
@@ -1860,8 +1838,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
index 9f4f744..713d022 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
@@ -386,7 +386,6 @@
*/
public final ByteString getRawBaseDN()
{
-
return rawBaseDN;
}
@@ -401,7 +400,6 @@
*/
public final void setRawBaseDN(ByteString rawBaseDN)
{
-
this.rawBaseDN = rawBaseDN;
baseDN = null;
@@ -419,7 +417,6 @@
*/
public final DN getBaseDN()
{
-
return baseDN;
}
@@ -433,7 +430,6 @@
*/
public final void setBaseDN(DN baseDN)
{
-
this.baseDN = baseDN;
}
@@ -446,7 +442,6 @@
*/
public final SearchScope getScope()
{
-
return scope;
}
@@ -460,7 +455,6 @@
*/
public final void setScope(SearchScope scope)
{
-
this.scope = scope;
}
@@ -473,7 +467,6 @@
*/
public final DereferencePolicy getDerefPolicy()
{
-
return derefPolicy;
}
@@ -488,7 +481,6 @@
*/
public final void setDerefPolicy(DereferencePolicy derefPolicy)
{
-
this.derefPolicy = derefPolicy;
}
@@ -501,7 +493,6 @@
*/
public final int getSizeLimit()
{
-
return sizeLimit;
}
@@ -515,7 +506,6 @@
*/
public final void setSizeLimit(int sizeLimit)
{
-
this.sizeLimit = sizeLimit;
}
@@ -528,7 +518,6 @@
*/
public final int getTimeLimit()
{
-
return timeLimit;
}
@@ -542,7 +531,6 @@
*/
public final void setTimeLimit(int timeLimit)
{
-
this.timeLimit = timeLimit;
}
@@ -555,7 +543,6 @@
*/
public final boolean getTypesOnly()
{
-
return typesOnly;
}
@@ -569,7 +556,6 @@
*/
public final void setTypesOnly(boolean typesOnly)
{
-
this.typesOnly = typesOnly;
}
@@ -586,7 +572,6 @@
*/
public final LDAPFilter getRawFilter()
{
-
return rawFilter;
}
@@ -601,7 +586,6 @@
*/
public final void setRawFilter(LDAPFilter rawFilter)
{
-
this.rawFilter = rawFilter;
filter = null;
@@ -619,7 +603,6 @@
*/
public final SearchFilter getFilter()
{
-
return filter;
}
@@ -633,7 +616,6 @@
*/
public final LinkedHashSet<String> getAttributes()
{
-
return attributes;
}
@@ -648,7 +630,6 @@
*/
public final void setAttributes(LinkedHashSet<String> attributes)
{
-
if (attributes == null)
{
this.attributes.clear();
@@ -670,7 +651,6 @@
*/
public final int getEntriesSent()
{
-
return entriesSent;
}
@@ -685,7 +665,6 @@
*/
public final int getReferencesSent()
{
-
return referencesSent;
}
@@ -697,7 +676,6 @@
@Override()
public final long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -709,7 +687,6 @@
@Override()
public final long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -721,7 +698,6 @@
@Override()
public final long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -744,8 +720,6 @@
*/
public final boolean returnEntry(Entry entry, List<Control> controls)
{
-
-
// See if the operation has been abandoned. If so, then don't send the
// entry and indicate that the search should end.
if (cancelRequest != null)
@@ -1169,7 +1143,6 @@
*/
public final boolean returnReference(SearchResultReference reference)
{
-
// See if the operation has been abandoned. If so, then don't send the
// reference and indicate that the search should end.
if (cancelRequest != null)
@@ -1260,8 +1233,6 @@
*/
public final void sendSearchResultDone()
{
-
-
// Send the search result done message to the client. We want to make sure
// that this only gets sent once, and it's possible that this could be
// multithreaded in the event of a persistent search, so do it safely.
@@ -1435,7 +1406,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
return responseControls;
}
@@ -1469,7 +1439,6 @@
@Override()
public final void run()
{
-
setResultCode(ResultCode.UNDEFINED);
boolean sendResponse = true;
@@ -2128,8 +2097,6 @@
private final void searchBackend(Backend backend)
throws DirectoryException, CancelledOperationException
{
-
-
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
@@ -2168,7 +2135,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
if (persistentSearch != null)
@@ -2217,7 +2183,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return cancelRequest;
}
@@ -2229,7 +2194,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
this.cancelRequest = cancelRequest;
return true;
}
@@ -2242,7 +2206,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("SearchOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
index fd9266f..30ca421 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -85,7 +85,6 @@
*/
public SynchronizationProviderConfigManager()
{
-
// No implementation is required.
}
@@ -108,8 +107,6 @@
public void initializeSynchronizationProviders()
throws ConfigException, InitializationException
{
-
-
registeredProviders = new ConcurrentHashMap<DN,SynchronizationProvider>();
@@ -374,8 +371,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
DN providerDN = configEntry.getDN();
SynchronizationProvider provider = registeredProviders.get(providerDN);
@@ -549,8 +544,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN providerDN = configEntry.getDN();
SynchronizationProvider provider = registeredProviders.get(providerDN);
ResultCode resultCode = ResultCode.SUCCESS;
@@ -819,8 +812,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
return true;
}
@@ -838,8 +829,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
// NYI
return null;
}
@@ -862,8 +851,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// NYI
return true;
}
@@ -880,8 +867,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
// NYI
return null;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index caae610..f2da3f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -90,7 +90,6 @@
*/
public TrustManagerProviderConfigManager()
{
-
configHandler = DirectoryServer.getConfigHandler();
providers = new ConcurrentHashMap<DN,TrustManagerProvider>();
}
@@ -112,8 +111,6 @@
public void initializeTrustManagerProviders()
throws ConfigException, InitializationException
{
-
-
// First, get the configuration base entry.
ConfigEntry baseEntry;
try
@@ -229,8 +226,6 @@
public boolean configChangeIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that the entry has an appropriate objectclass for a trust
// manager provider.
if (! configEntry.hasObjectClass(OC_TRUST_MANAGER_PROVIDER))
@@ -369,8 +364,6 @@
*/
public ConfigChangeResult applyConfigurationChange(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -594,8 +587,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// Make sure that no entry already exists with the specified DN.
DN configEntryDN = configEntry.getDN();
if (providers.containsKey(configEntryDN))
@@ -779,8 +770,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -943,8 +932,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
-
// A delete should always be acceptable, so just return true.
return true;
}
@@ -961,8 +948,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
-
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
index 945c4cd..3f5f2e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
@@ -152,7 +152,6 @@
@Override()
public final List<Control> getResponseControls()
{
-
// An unbind operation can never have a response, so just return an empty
// list.
return NO_RESPONSE_CONTROLS;
@@ -188,7 +187,6 @@
@Override()
public long getProcessingStartTime()
{
-
return processingStartTime;
}
@@ -200,7 +198,6 @@
@Override()
public long getProcessingStopTime()
{
-
return processingStopTime;
}
@@ -212,7 +209,6 @@
@Override()
public long getProcessingTime()
{
-
return (processingStopTime - processingStartTime);
}
@@ -224,8 +220,6 @@
@Override()
public final void run()
{
-
-
// Get the plugin config manager that will be used for invoking plugins.
PluginConfigManager pluginConfigManager =
DirectoryServer.getPluginConfigManager();
@@ -266,7 +260,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
-
cancelRequest.addResponseMessage(getMessage(MSGID_CANNOT_CANCEL_UNBIND));
return CancelResult.CANNOT_CANCEL;
}
@@ -279,7 +272,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
-
return null;
}
@@ -291,7 +283,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
-
// Unbind operations cannot be canceled.
return false;
}
@@ -304,7 +295,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
-
buffer.append("UnbindOperation(connID=");
buffer.append(clientConnection.getConnectionID());
buffer.append(", opID=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 27662e2..0dcc837 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -80,8 +80,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
// No real implementation is required. Simply register with the Directory
// Server for the ANONYMOUS mechanism.
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_ANONYMOUS,
@@ -96,7 +94,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_ANONYMOUS);
}
@@ -109,8 +106,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// See if the client provided SASL credentials including trace information.
// If so, then log it to the error log.
ByteString saslCredentials = bindOperation.getSASLCredentials();
@@ -143,7 +138,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is not a password-based mechanism.
return false;
}
@@ -156,7 +150,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This is not a secure mechanism.
return false;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
index 0cee170..11ccab8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -78,7 +78,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -90,7 +89,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_BASE64;
}
@@ -103,7 +101,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
return ByteStringFactory.create(Base64.encode(plaintext.value()));
}
@@ -116,7 +113,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_BASE64);
@@ -135,8 +131,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
String userString = Base64.encode(plaintextPassword.value());
String storedString = storedPassword.stringValue();
return userString.equals(storedString);
@@ -150,7 +144,6 @@
@Override()
public boolean isReversible()
{
-
return true;
}
@@ -163,7 +156,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
try
{
return ByteStringFactory.create(Base64.decode(
@@ -192,7 +184,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -206,8 +197,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -223,8 +212,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -239,7 +226,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -254,7 +240,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// Base64-encoded values may be easily decoded with no key or special
// knowledge.
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
index 2840515..16ced44 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -63,7 +63,6 @@
*/
public BlindTrustManagerProvider()
{
-
// No implementation is required.
}
@@ -87,7 +86,6 @@
public void initializeTrustManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No implementation is required.
}
@@ -99,7 +97,6 @@
*/
public void finalizeTrustManagerProvider()
{
-
// No implementation is required.
}
@@ -118,7 +115,6 @@
public TrustManager[] getTrustManagers()
throws DirectoryException
{
-
return new TrustManager[] { this };
}
@@ -133,7 +129,6 @@
*/
public void checkClientTrusted(X509Certificate[] chain, String authType)
{
-
// As long as we don't throw an exception, then the client certificate will
// be considered trusted.
}
@@ -149,7 +144,6 @@
*/
public void checkServerTrusted(X509Certificate[] chain, String authType)
{
-
// As long as we don't throw an exception, then the server certificate will
// be considered trusted.
}
@@ -165,7 +159,6 @@
*/
public X509Certificate[] getAcceptedIssuers()
{
-
return new X509Certificate[0];
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 3cc0390..bb6e17b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -139,8 +139,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
@@ -230,7 +228,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_CRAM_MD5);
}
@@ -244,8 +241,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// The CRAM-MD5 bind process uses two stages. See if the client provided
// any credentials. If not, then we're in the first stage so we'll send the
// challenge to the client.
@@ -575,8 +570,6 @@
*/
private byte[] generateDigest(ByteString password, ByteString challenge)
{
-
-
// Get the byte arrays backing the password and challenge.
byte[] p = password.value();
byte[] c = challenge.value();
@@ -639,7 +632,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -655,8 +647,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SASLCRAMMD5_DESCRIPTION_IDENTITY_MAPPER_DN;
@@ -685,8 +675,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Look at the identity mapper configuration.
int msgID = MSGID_SASLCRAMMD5_DESCRIPTION_IDENTITY_MAPPER_DN;
DNConfigAttribute mapperStub =
@@ -756,8 +744,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -843,7 +829,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is a password-based mechanism.
return true;
}
@@ -856,7 +841,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This may be considered a secure mechanism.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
index 209040d..14ccff5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -97,7 +97,6 @@
public void initializeExtendedOperationHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No special configuration is required.
DirectoryServer.registerSupportedExtension(OID_CANCEL_REQUEST, this);
@@ -111,7 +110,6 @@
*/
public void finalizeExtendedOperationHandler()
{
-
DirectoryServer.deregisterSupportedExtension(OID_CANCEL_REQUEST);
}
@@ -124,8 +122,6 @@
*/
public void processExtendedOperation(ExtendedOperation operation)
{
-
-
// The value of the request must be a sequence containing an integer element
// that holds the message ID of the operation to cancel. If there is no
// value or it cannot be decoded, then fail.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
index 38832c4..3ad7fd6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -77,7 +77,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -89,7 +88,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_CLEAR;
}
@@ -102,7 +100,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
return plaintext.duplicate();
}
@@ -115,7 +112,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_CLEAR);
@@ -134,7 +130,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
return Arrays.equals(plaintextPassword.value(), storedPassword.value());
}
@@ -146,7 +141,6 @@
@Override()
public boolean isReversible()
{
-
return true;
}
@@ -159,7 +153,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
return storedPassword.duplicate();
}
@@ -171,7 +164,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -185,8 +177,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -202,8 +192,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -218,7 +206,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -233,7 +220,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// Clear-text passwords are not obscured in any way.
return false;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index a12d0c9..61cf333 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -193,8 +193,6 @@
public void initializeConfigHandler(String configFile, boolean checkSchema)
throws InitializationException
{
-
-
// Initialize the config lock.
configLock = new ReentrantLock();
@@ -732,8 +730,6 @@
private void applyChangesFile(File sourceFile, File changesFile)
throws IOException, LDIFException
{
-
-
// FIXME -- Do we need to do anything special for configuration archiving?
@@ -820,7 +816,6 @@
*/
public void finalizeConfigHandler()
{
-
try
{
DirectoryServer.deregisterBaseDN(configRootEntry.getDN(), false);
@@ -867,7 +862,6 @@
public ConfigEntry getConfigRootEntry()
throws ConfigException
{
-
return configRootEntry;
}
@@ -887,7 +881,6 @@
public ConfigEntry getConfigEntry(DN entryDN)
throws ConfigException
{
-
return configEntries.get(entryDN);
}
@@ -900,7 +893,6 @@
*/
public String getServerRoot()
{
-
return serverRoot;
}
@@ -925,7 +917,6 @@
public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
throws ConfigException, InitializationException
{
-
// No action is required, since all initialization was performed in the
// initializeConfigHandler method.
}
@@ -939,7 +930,6 @@
*/
public DN[] getBaseDNs()
{
-
return baseDNs;
}
@@ -950,7 +940,6 @@
*/
public long getEntryCount()
{
-
return configEntries.size();
}
@@ -967,7 +956,6 @@
*/
public boolean isLocal()
{
-
// The configuration information will always be local.
return true;
}
@@ -988,7 +976,6 @@
public Entry getEntry(DN entryDN)
throws DirectoryException
{
-
ConfigEntry configEntry = configEntries.get(entryDN);
if (configEntry == null)
{
@@ -1018,7 +1005,6 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
-
return configEntries.containsKey(entryDN);
}
@@ -1040,8 +1026,6 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
-
-
// If there is an add operation, then make sure that the associated user has
// both the CONFIG_READ and CONFIG_WRITE privileges.
if (addOperation != null)
@@ -1193,8 +1177,6 @@
public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
throws DirectoryException
{
-
-
// If there is a delete operation, then make sure that the associated user
// has both the CONFIG_READ and CONFIG_WRITE privileges.
if (deleteOperation != null)
@@ -1342,8 +1324,6 @@
public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
throws DirectoryException
{
-
-
// If there is a modify operation, then make sure that the associated user
// has both the CONFIG_READ and CONFIG_WRITE privileges. Also, if the
// operation targets the set of root privileges then make sure the user has
@@ -1532,8 +1512,6 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException
{
-
-
// If there is a modify DN operation, then make sure that the associated
// user has both the CONFIG_READ and CONFIG_WRITE privileges.
if (modifyDNOperation != null)
@@ -1574,8 +1552,6 @@
public void search(SearchOperation searchOperation)
throws DirectoryException
{
-
-
// Make sure that the associated user has the CONFIG_READ privilege.
ClientConnection clientConnection = searchOperation.getClientConnection();
if (! clientConnection.hasPrivilege(Privilege.CONFIG_READ, searchOperation))
@@ -1699,7 +1675,6 @@
SearchOperation searchOperation)
throws DirectoryException
{
-
Entry e = baseEntry.getEntry();
if (filter.matchesEntry(e))
{
@@ -1733,8 +1708,6 @@
public void writeUpdatedConfig()
throws DirectoryException
{
-
-
// FIXME -- This needs support for encryption.
@@ -1977,7 +1950,6 @@
*/
public boolean supportsLDIFExport()
{
-
return true;
}
@@ -2000,7 +1972,6 @@
LDIFExportConfig exportConfig)
throws DirectoryException
{
-
LDIFWriter writer;
try
{
@@ -2056,7 +2027,6 @@
private void writeEntryAndChildren(LDIFWriter writer, ConfigEntry configEntry)
throws DirectoryException
{
-
try
{
// Write the entry itself to LDIF.
@@ -2099,7 +2069,6 @@
*/
public boolean supportsLDIFImport()
{
-
return false;
}
@@ -2122,7 +2091,6 @@
LDIFImportConfig importConfig)
throws DirectoryException
{
-
int msgID = MSGID_CONFIG_FILE_UNWILLING_TO_IMPORT;
String message = getMessage(msgID);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -2144,7 +2112,6 @@
*/
public boolean supportsBackup()
{
-
// We do support an online backup mechanism for the configuration.
return true;
}
@@ -2169,8 +2136,6 @@
public boolean supportsBackup(BackupConfig backupConfig,
StringBuilder unsupportedReason)
{
-
-
// We should support online backup for the configuration in any form. This
// implementation does not support incremental backups, but in this case
// even if we're asked to do an incremental we'll just do a full backup
@@ -2196,8 +2161,6 @@
public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
throws DirectoryException
{
-
-
// Get the properties to use for the backup. We don't care whether or not
// it's incremental, so there's no need to get that.
String backupID = backupConfig.getBackupID();
@@ -2607,8 +2570,6 @@
String backupID)
throws DirectoryException
{
-
-
// NYI
}
@@ -2622,8 +2583,6 @@
*/
public boolean supportsRestore()
{
-
-
// We will provide a restore, but only for offline operations.
return true;
}
@@ -2647,8 +2606,6 @@
RestoreConfig restoreConfig)
throws DirectoryException
{
-
-
// First, make sure that the requested backup exists.
BackupDirectory backupDirectory = restoreConfig.getBackupDirectory();
String backupPath = backupDirectory.getPath();
@@ -3177,7 +3134,6 @@
*/
public DN getComponentEntryDN()
{
-
return configRootEntry.getDN();
}
@@ -3192,7 +3148,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -3210,7 +3165,6 @@
*/
public LinkedHashMap<String,String> getAlerts()
{
-
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_CANNOT_WRITE_CONFIGURATION,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
index 5b5efc4..f661d3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
@@ -84,7 +84,6 @@
public void initializeEntryCache(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No implementation required.
}
@@ -97,7 +96,6 @@
*/
public void finalizeEntryCache()
{
-
// No implementation required.
}
@@ -115,7 +113,6 @@
*/
public boolean containsEntry(DN entryDN)
{
-
// This implementation does not store any entries.
return false;
}
@@ -134,7 +131,6 @@
*/
public Entry getEntry(DN entryDN)
{
-
// This implementation does not store any entries.
return null;
}
@@ -153,7 +149,6 @@
*/
public long getEntryID(DN entryDN)
{
-
// This implementation does not store any entries.
return -1;
}
@@ -178,7 +173,6 @@
*/
public Entry getEntry(DN entryDN, LockType lockType, List<Lock> lockList)
{
-
// This implementation does not store entries.
return null;
}
@@ -206,7 +200,6 @@
public Entry getEntry(Backend backend, long entryID, LockType lockType,
List<Lock> lockList)
{
-
// This implementation does not store entries.
return null;
}
@@ -225,7 +218,6 @@
*/
public void putEntry(Entry entry, Backend backend, long entryID)
{
-
// This implementation does not store entries.
}
@@ -251,7 +243,6 @@
*/
public boolean putEntryIfAbsent(Entry entry, Backend backend, long entryID)
{
-
// This implementation does not store entries, so we will never have a
// conflict.
return true;
@@ -266,7 +257,6 @@
*/
public void removeEntry(DN entryDN)
{
-
// This implementation does not store entries.
}
@@ -278,7 +268,6 @@
*/
public void clear()
{
-
// This implementation does not store entries.
}
@@ -292,7 +281,6 @@
*/
public void clearBackend(Backend backend)
{
-
// This implementation does not store entries.
}
@@ -305,7 +293,6 @@
*/
public void clearSubtree(DN baseDN)
{
-
// This implementation does not store entries.
}
@@ -319,7 +306,6 @@
*/
public void handleLowMemory()
{
-
// This implementation does not store entries, so there are no resources
// that it can free.
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 3ee3dea..c5d0ead 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -147,8 +147,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
@@ -261,7 +259,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_DIGEST_MD5);
}
@@ -275,8 +272,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// The DIGEST-MD5 bind process uses two stages. See if the client provided
// any credentials. If not, then this is an initial authentication so we
// will send a challenge to the client.
@@ -1229,7 +1224,6 @@
*/
private String generateNonce()
{
-
byte[] nonceBytes = new byte[16];
digestLock.lock();
@@ -1271,8 +1265,6 @@
StringBuilder token)
throws DirectoryException
{
-
-
// If the position is greater than or equal to the length, then we shouldn't
// do anything.
if (startPos >= length)
@@ -1429,7 +1421,6 @@
String qop, String charset)
throws UnsupportedEncodingException
{
-
digestLock.lock();
try
@@ -1536,7 +1527,6 @@
String qop, String charset)
throws UnsupportedEncodingException
{
-
digestLock.lock();
try
@@ -1626,7 +1616,6 @@
*/
private String getHexString(byte[] byteArray)
{
-
StringBuilder buffer = new StringBuilder(2*byteArray.length);
for (byte b : byteArray)
{
@@ -1647,7 +1636,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1663,8 +1651,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SASLDIGESTMD5_DESCRIPTION_IDENTITY_MAPPER_DN;
@@ -1698,8 +1684,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Look at the identity mapper configuration.
int msgID = MSGID_SASLDIGESTMD5_DESCRIPTION_IDENTITY_MAPPER_DN;
DNConfigAttribute mapperStub =
@@ -1793,8 +1777,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -1952,7 +1934,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is a password-based mechanism.
return true;
}
@@ -1965,7 +1946,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This may be considered a secure mechanism.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
index 346a4e1..5c11650 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
@@ -56,7 +56,6 @@
*/
public DigestMD5StateInfo(String nonce, String nonceCount)
{
-
this.nonce = nonce;
this.nonceCount = nonceCount;
}
@@ -71,7 +70,6 @@
*/
public String getNonce()
{
-
return nonce;
}
@@ -86,7 +84,6 @@
*/
public String getNonceCount()
{
-
return nonceCount;
}
@@ -101,7 +98,6 @@
*/
public void setNonceCount(String nonceCount)
{
-
this.nonceCount = nonceCount;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index c26da0b..c6be7f4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -119,8 +119,6 @@
public void initializeStatusNotificationHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
configEntryDN = configEntry.getDN();
@@ -188,7 +186,6 @@
notificationType,
DN userDN, int messageID, String message)
{
-
if (notificationTypes.contains(notificationType))
{
int msgID = MSGID_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION;
@@ -209,7 +206,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -224,8 +220,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
LinkedList<String> typeNames = new LinkedList<String>();
@@ -265,8 +259,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Initialize the set of notification types that should generate log
// messages.
int msgID = MSGID_ERRORLOG_ACCTNOTHANDLER_DESCRIPTION_NOTIFICATION_TYPES;
@@ -342,8 +334,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index eef49f3..d62f7fd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -115,8 +115,6 @@
public void initializeIdentityMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
configEntryDN = configEntry.getDN();
@@ -250,8 +248,6 @@
*/
public void finalizeIdentityMapper()
{
-
-
// Deregister with the server as a configurable component.
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -276,8 +272,6 @@
public Entry getEntryForID(String id)
throws DirectoryException
{
-
-
// Get the attribute type and base DN arrays as local variables to protect
// against concurrent modifications.
String[] matchAttrs = rawMatchAttributes;
@@ -404,7 +398,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -419,8 +412,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
String[] attrs = rawMatchAttributes;
@@ -481,8 +472,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configAcceptable = true;
@@ -590,8 +579,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 2961633..d3560ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -137,8 +137,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
@@ -276,7 +274,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_EXTERNAL);
}
@@ -290,8 +287,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// Get the client connection used for the bind request, and get the
// security manager for that connection. If either are null, then fail.
ClientConnection clientConnection = bindOperation.getClientConnection();
@@ -539,7 +534,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -555,8 +549,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SASLEXTERNAL_DESCRIPTION_VALIDATION_POLICY;
@@ -598,8 +590,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Look at the validation policy configuration.
int msgID = MSGID_SASLEXTERNAL_DESCRIPTION_VALIDATION_POLICY;
MultiChoiceConfigAttribute validateStub =
@@ -742,8 +732,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -938,7 +926,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is not a password-based mechanism.
return false;
}
@@ -951,7 +938,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This may be considered a secure mechanism.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
index f70adde..64c4efc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -196,7 +196,6 @@
public void initializeEntryCache(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
configEntryDN = configEntry.getDN();
@@ -468,8 +467,6 @@
*/
public void finalizeEntryCache()
{
-
-
// Release all memory currently in use by this cache.
cacheLock.lock();
@@ -506,7 +503,6 @@
*/
public boolean containsEntry(DN entryDN)
{
-
// Indicate whether the DN map contains the specified DN.
return dnMap.containsKey(entryDN);
}
@@ -525,8 +521,6 @@
*/
public Entry getEntry(DN entryDN)
{
-
-
// Simply return the entry from the DN map.
CacheEntry e = dnMap.get(entryDN);
if (e == null)
@@ -553,7 +547,6 @@
*/
public long getEntryID(DN entryDN)
{
-
// Simply return the ID from the DN map.
CacheEntry e = dnMap.get(entryDN);
if (e == null)
@@ -586,8 +579,6 @@
*/
public Entry getEntry(DN entryDN, LockType lockType, List<Lock> lockList)
{
-
-
// Get the entry from the DN map if it is present. If not, then return
// null.
CacheEntry entry = dnMap.get(entryDN);
@@ -713,7 +704,6 @@
public Entry getEntry(Backend backend, long entryID, LockType lockType,
List<Lock> lockList)
{
-
// Get the hash map for the provided backend. If it isn't present, then
// return null.
HashMap<Long,CacheEntry> map = idMap.get(backend);
@@ -841,8 +831,6 @@
*/
public void putEntry(Entry entry, Backend backend, long entryID)
{
-
-
// If there is a set of exclude filters, then make sure that the provided
// entry doesn't match any of them.
if (! excludeFilters.isEmpty())
@@ -1030,8 +1018,6 @@
*/
public boolean putEntryIfAbsent(Entry entry, Backend backend, long entryID)
{
-
-
// If there is a set of exclude filters, then make sure that the provided
// entry doesn't match any of them.
if (! excludeFilters.isEmpty())
@@ -1221,8 +1207,6 @@
*/
public void removeEntry(DN entryDN)
{
-
-
// Acquire the lock on the cache. We should not return until the entry is
// removed, so we will block until we can obtain the lock.
// FIXME -- An alternate approach could be to block for a maximum length of
@@ -1278,7 +1262,6 @@
*/
public void clear()
{
-
// Acquire a lock on the cache. We should not return until the cache has
// been cleared, so we will block until we can obtain the lock.
cacheLock.lock();
@@ -1319,7 +1302,6 @@
*/
public void clearBackend(Backend backend)
{
-
// Acquire a lock on the cache. We should not return until the cache has
// been cleared, so we will block until we can obtain the lock.
cacheLock.lock();
@@ -1383,8 +1365,6 @@
*/
public void clearSubtree(DN baseDN)
{
-
-
// Determine which backend should be used for the provided base DN. If
// there is none, then we don't need to do anything.
Backend backend = DirectoryServer.getBackend(baseDN);
@@ -1431,8 +1411,6 @@
*/
private void clearSubtree(DN baseDN, Backend backend)
{
-
-
// See if there are any entries for the provided backend in the cache. If
// not, then return.
HashMap<Long,CacheEntry> map = idMap.get(backend);
@@ -1503,8 +1481,6 @@
*/
public void handleLowMemory()
{
-
-
// Grab the lock on the cache and wait until we have it.
cacheLock.lock();
@@ -1566,7 +1542,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1581,7 +1556,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -1660,8 +1634,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Start out assuming that the configuration is valid.
boolean configIsAcceptable = true;
@@ -1898,8 +1870,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
// Create a set of variables to use for the result.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 157984f..36d7cae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -106,7 +106,6 @@
*/
public FileBasedKeyManagerProvider()
{
-
// No implementation is required.
}
@@ -130,8 +129,6 @@
public void initializeKeyManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
// Store the DN of the configuration entry.
configEntryDN = configEntry.getDN();
@@ -492,8 +489,6 @@
*/
public void finalizeKeyManagerProvider()
{
-
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -512,8 +507,6 @@
public KeyManager[] getKeyManagers()
throws DirectoryException
{
-
-
KeyStore keyStore;
try
{
@@ -573,7 +566,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -588,7 +580,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -669,8 +660,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
DN configEntryDN = configEntry.getDN();
@@ -1004,7 +993,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 655fd8b..a7684b4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -105,7 +105,6 @@
*/
public FileBasedTrustManagerProvider()
{
-
// No implementation is required.
}
@@ -129,8 +128,6 @@
public void initializeTrustManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
// Store the DN of the configuration entry.
configEntryDN = configEntry.getDN();
@@ -487,7 +484,6 @@
*/
public void finalizeTrustManagerProvider()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -506,8 +502,6 @@
public TrustManager[] getTrustManagers()
throws DirectoryException
{
-
-
KeyStore trustStore;
try
{
@@ -567,7 +561,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -582,7 +575,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -663,8 +655,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Make sure that a trust store file was provided.
int msgID = MSGID_FILE_TRUSTMANAGER_DESCRIPTION_FILE;
StringConfigAttribute fileStub =
@@ -982,7 +972,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index 288a95e..2960853 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -109,7 +109,6 @@
public FilteredStaticGroupMemberList(DN groupDN, Set<DN> memberDNs, DN baseDN,
SearchScope scope, SearchFilter filter)
{
-
ensureNotNull(groupDN, memberDNs);
this.groupDN = groupDN;
@@ -252,7 +251,6 @@
@Override()
public boolean hasMoreMembers()
{
-
if (! memberDNIterator.hasNext())
{
return false;
@@ -270,7 +268,6 @@
public DN nextMemberDN()
throws MembershipException
{
-
if (! memberDNIterator.hasNext())
{
return null;
@@ -296,7 +293,6 @@
public Entry nextMemberEntry()
throws MembershipException
{
-
if (! memberDNIterator.hasNext())
{
return null;
@@ -326,7 +322,6 @@
@Override()
public void close()
{
-
// No implementation is required.
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index a6732a8..64d8dd0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -134,7 +134,6 @@
public void initializeCertificateMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
this.configEntryDN = configEntry.getDN();
// Get the attribute type that will be used to hold the fingerprint.
@@ -263,7 +262,6 @@
*/
public void finalizeCertificateMapper()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -275,8 +273,6 @@
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
{
-
-
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
@@ -396,7 +392,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -411,7 +406,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_FCM_DESCRIPTION_FINGERPRINT_ATTR;
@@ -464,7 +458,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
DN configEntryDN = configEntry.getDN();
boolean configAcceptable = true;
@@ -618,7 +611,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 64af5b6..fffaa8d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -122,8 +122,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
@@ -364,7 +362,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_GSSAPI);
}
@@ -378,8 +375,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// GSSAPI binds use multiple stages, so we need to determine whether this is
// the first stage or a subsequent one. To do that, see if we have SASL
// state information in the client connection.
@@ -488,7 +483,6 @@
public Entry getUserForAuthzID(BindOperation bindOperation, String authzID)
throws DirectoryException
{
-
return identityMapper.getEntryForID(authzID);
}
@@ -503,7 +497,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -519,8 +512,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SASLGSSAPI_DESCRIPTION_IDENTITY_MAPPER_DN;
@@ -561,8 +552,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Look at the identity mapper configuration
int msgID = MSGID_SASLGSSAPI_DESCRIPTION_IDENTITY_MAPPER_DN;
DNConfigAttribute mapperStub =
@@ -709,8 +698,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -1027,7 +1014,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is not a password-based mechanism.
return false;
}
@@ -1040,7 +1026,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This may be considered a secure mechanism.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
index fa41622..bf03828 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
@@ -115,7 +115,6 @@
BindOperation bindOperation, String serverFQDN)
throws InitializationException
{
-
this.gssapiHandler = gssapiHandler;
this.bindOperation = bindOperation;
this.serverFQDN = serverFQDN;
@@ -177,7 +176,6 @@
*/
public void setBindOperation(BindOperation bindOperation)
{
-
this.bindOperation = bindOperation;
}
@@ -193,7 +191,6 @@
*/
public Entry getUserEntry()
{
-
return userEntry;
}
@@ -228,7 +225,6 @@
*/
public void processAuthenticationStage()
{
-
try
{
Subject.doAs(loginContext.getSubject(), this);
@@ -256,8 +252,6 @@
*/
public Boolean run()
{
-
-
if (saslServer == null)
{
// Create the SASL server instance for use with this authentication
@@ -493,8 +487,6 @@
public void handle(Callback[] callbacks)
throws UnsupportedCallbackException
{
-
-
for (Callback callback : callbacks)
{
if (callback instanceof NameCallback)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
index 3049364..dd2291b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
@@ -83,7 +83,6 @@
*/
public String getSecurityMechanismName()
{
-
return "INTERNAL";
}
@@ -94,7 +93,6 @@
*/
public boolean isSecure()
{
-
// Internal connections are inherently secure.
return true;
}
@@ -122,7 +120,6 @@
SocketChannel socketChannel)
throws DirectoryException
{
-
return new InternalConnectionSecurityProvider(clientConnection,
socketChannel);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
index 811780b..e11892e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
@@ -126,7 +126,6 @@
public void initializeAlertHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
sequenceNumber = new AtomicLong(1);
if (configEntry == null)
@@ -174,7 +173,6 @@
*/
public void finalizeAlertHandler()
{
-
// No action is required.
}
@@ -187,7 +185,6 @@
*/
public ObjectName getObjectName()
{
-
return objectName;
}
@@ -206,7 +203,6 @@
public void sendAlertNotification(AlertGenerator generator, String alertType,
int alertID, String alertMessage)
{
-
sendNotification(new Notification(alertType, generator.getClassName(),
sequenceNumber.getAndIncrement(),
System.currentTimeMillis(),
@@ -224,7 +220,6 @@
*/
public MBeanNotificationInfo[] getNotificationInfo()
{
-
ArrayList<MBeanNotificationInfo> notifications =
new ArrayList<MBeanNotificationInfo>();
ConcurrentHashMap<DN,JMXMBean> mBeans = DirectoryServer.getJMXMBeans();
@@ -258,7 +253,6 @@
public Attribute getAttribute(String attribute)
throws AttributeNotFoundException
{
-
// There are no attributes for this MBean.
int msgID = MSGID_CONFIG_JMX_ATTR_NO_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -283,8 +277,6 @@
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, InvalidAttributeValueException
{
-
-
// There are no attributes for this MBean.
int msgID = MSGID_CONFIG_JMX_ATTR_NO_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -303,8 +295,6 @@
*/
public AttributeList getAttributes(String[] attributes)
{
-
-
// There are no attributes for this MBean.
return new AttributeList();
}
@@ -322,7 +312,6 @@
*/
public AttributeList setAttributes(AttributeList attributes)
{
-
// There are no attributes for this MBean.
return new AttributeList();
}
@@ -349,7 +338,6 @@
public Object invoke(String actionName, Object[] params, String[] signature)
throws MBeanException
{
-
// There are no invokable components for this MBean.
StringBuilder buffer = new StringBuilder();
buffer.append(actionName);
@@ -385,7 +373,6 @@
*/
public MBeanInfo getMBeanInfo()
{
-
return new MBeanInfo(CLASS_NAME, "JMX Alert Handler",
new MBeanAttributeInfo[0], new MBeanConstructorInfo[0],
new MBeanOperationInfo[0], getNotificationInfo());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
index ec47eeb..6f4c90c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -101,8 +101,6 @@
public void initializePasswordValidator(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
configEntryDN = configEntry.getDN();
@@ -186,7 +184,6 @@
@Override()
public void finalizePasswordValidator()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -201,8 +198,6 @@
Operation operation, Entry userEntry,
StringBuilder invalidReason)
{
-
-
int numChars = newPassword.stringValue().length();
if ((minLength > 0) && (numChars < minLength))
@@ -229,7 +224,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -240,8 +234,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrs = new LinkedList<ConfigAttribute>();
int msgID = MSGID_PWLENGTHVALIDATOR_DESCRIPTION_MIN_LENGTH;
@@ -265,8 +257,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Get the configured minimum length.
int newMinLength = 0;
int msgID = MSGID_PWLENGTHVALIDATOR_DESCRIPTION_MIN_LENGTH;
@@ -349,8 +339,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
index be2d32a..dd21060 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -104,7 +104,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM_MD5);
@@ -133,7 +132,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_MD5;
}
@@ -146,7 +144,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] digestBytes;
digestLock.lock();
@@ -186,7 +183,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_MD5);
@@ -234,7 +230,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
byte[] userPWDigestBytes;
digestLock.lock();
@@ -287,7 +282,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -301,8 +295,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -318,8 +310,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -332,7 +322,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -345,7 +334,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_MD5);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -362,7 +350,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -377,7 +364,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// MD5 may be considered reasonably secure for this purpose.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
index b1b3f19..651ffaa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
@@ -134,7 +134,6 @@
public void initializeConnectionSecurityProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
clearBuffer = null;
clientConnection = null;
socketChannel = null;
@@ -148,7 +147,6 @@
*/
public void finalizeConnectionSecurityProvider()
{
-
// No implementation is required.
}
@@ -161,7 +159,6 @@
*/
public String getSecurityMechanismName()
{
-
return "NULL";
}
@@ -177,7 +174,6 @@
*/
public boolean isSecure()
{
-
// This is not a secure provider.
return false;
}
@@ -205,7 +201,6 @@
SocketChannel socketChannel)
throws DirectoryException
{
-
return new NullConnectionSecurityProvider(clientConnection,
socketChannel);
}
@@ -229,7 +224,6 @@
*/
public void disconnect(boolean connectionValid)
{
-
// No implementation is required.
}
@@ -245,7 +239,6 @@
*/
public int getClearBufferSize()
{
-
return BUFFER_SIZE;
}
@@ -261,7 +254,6 @@
*/
public int getEncodedBufferSize()
{
-
return BUFFER_SIZE;
}
@@ -282,7 +274,6 @@
*/
public boolean readData()
{
-
clearBuffer.clear();
while (true)
{
@@ -366,7 +357,6 @@
*/
public boolean writeData(ByteBuffer clearData)
{
-
int position = clearData.position();
int limit = clearData.limit();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
index 8c6b92a..f84d034 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -57,7 +57,6 @@
*/
public NullKeyManagerProvider()
{
-
// No implementation is required.
}
@@ -81,7 +80,6 @@
public void initializeKeyManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No implementation is required.
}
@@ -93,7 +91,6 @@
*/
public void finalizeKeyManagerProvider()
{
-
// No implementation is required.
}
@@ -112,7 +109,6 @@
public KeyManager[] getKeyManagers()
throws DirectoryException
{
-
return new KeyManager[0];
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
index b102b3f..20fa129 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -58,7 +58,6 @@
*/
public NullTrustManagerProvider()
{
-
// No implementation is required.
}
@@ -82,7 +81,6 @@
public void initializeTrustManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No implementation is required.
}
@@ -94,7 +92,6 @@
*/
public void finalizeTrustManagerProvider()
{
-
// No implementation is required.
}
@@ -113,7 +110,6 @@
public TrustManager[] getTrustManagers()
throws DirectoryException
{
-
return new TrustManager[0];
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index a222907..365fc3e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -106,7 +106,6 @@
*/
public PKCS11KeyManagerProvider()
{
-
// No implementation is required.
}
@@ -130,8 +129,6 @@
public void initializeKeyManagerProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
// Store the DN of the configuration entry.
configEntryDN = configEntry.getDN();
@@ -376,7 +373,6 @@
*/
public void finalizeKeyManagerProvider()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -395,7 +391,6 @@
public KeyManager[] getKeyManagers()
throws DirectoryException
{
-
KeyStore keyStore;
try
{
@@ -449,7 +444,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -464,7 +458,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -531,7 +524,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
DN configEntryDN = configEntry.getDN();
@@ -761,7 +753,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 73e040d..4dd4a71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -148,7 +148,6 @@
public void initializeExtendedOperationHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
configEntryDN = configEntry.getDN();
int msgID = MSGID_EXTOP_PASSMOD_DESCRIPTION_ID_MAPPER;
@@ -210,7 +209,6 @@
*/
public void finalizeExtendedOperationHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSupportedExtension(OID_PASSWORD_MODIFY_REQUEST);
@@ -225,7 +223,6 @@
*/
public void processExtendedOperation(ExtendedOperation operation)
{
-
// Initialize the variables associated with components that may be included
// in the request.
ByteString userIdentity = null;
@@ -1219,7 +1216,6 @@
*/
private Entry getEntryByDN(ExtendedOperation operation, DN entryDN)
{
-
// Retrieve the user's entry from the directory. If it does not exist, then
// fail.
try
@@ -1286,7 +1282,6 @@
*/
public Set<String> getSupportedControls()
{
-
return supportedControlOIDs;
}
@@ -1301,7 +1296,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1316,7 +1310,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
List<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_EXTOP_PASSMOD_DESCRIPTION_ID_MAPPER;
@@ -1345,8 +1338,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Make sure that the specified identity mapper is OK.
int msgID = MSGID_EXTOP_PASSMOD_DESCRIPTION_ID_MAPPER;
DNConfigAttribute mapperStub =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 8f92a6f..c3b890e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -116,8 +116,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
@@ -179,7 +177,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_PLAIN);
}
@@ -193,8 +190,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
-
-
// Get the SASL credentials provided by the user and decode them.
String authzID = null;
String authcID = null;
@@ -614,7 +609,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -630,8 +624,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SASLPLAIN_DESCRIPTION_IDENTITY_MAPPER_DN;
@@ -660,8 +652,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Look at the identity mapper configuration.
int msgID = MSGID_SASLPLAIN_DESCRIPTION_IDENTITY_MAPPER_DN;
DNConfigAttribute mapperStub =
@@ -731,8 +721,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
@@ -818,7 +806,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
-
// This is a password-based mechanism.
return true;
}
@@ -831,7 +818,6 @@
@Override()
public boolean isSecure(String mechanism)
{
-
// This is not a secure mechanism.
return false;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index 51c64ef..4b88e85 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -116,8 +116,6 @@
public void initializePasswordGenerator(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
this.configEntryDN = configEntry.getDN();
generatorLock = new ReentrantLock();
@@ -283,7 +281,6 @@
*/
public void finalizePasswordGenerator()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -304,8 +301,6 @@
public ByteString generatePassword(Entry userEntry)
throws DirectoryException
{
-
-
StringBuilder buffer = new StringBuilder(totalLength);
generatorLock.lock();
@@ -336,8 +331,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
-
return configEntryDN;
}
@@ -352,8 +345,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
ArrayList<String> charsetValues = new ArrayList<String>();
@@ -400,8 +391,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Get the character sets for use in generating the password. At least one
// must have been provided.
HashMap<String,NamedCharacterSet> charsets =
@@ -559,8 +548,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 6edf775..4340a08 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -104,7 +104,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM_SHA_1);
@@ -133,7 +132,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SHA_1;
}
@@ -146,7 +144,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] digestBytes;
digestLock.lock();
@@ -186,7 +183,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SHA_1);
@@ -233,7 +229,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
byte[] userPWDigestBytes;
digestLock.lock();
@@ -286,7 +281,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -300,8 +294,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -317,8 +309,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
// This storage scheme does not support the authentication password syntax.
return false;
}
@@ -331,7 +321,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -344,7 +333,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SHA_1);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -361,7 +349,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_DOES_NOT_SUPPORT_AUTH_PASSWORD;
String message = getMessage(msgID, getStorageSchemeName());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message,
@@ -376,7 +363,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// SHA-1 should be considered secure.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 94ec9a4..2ae7e64 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -118,7 +118,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM_MD5);
@@ -149,7 +148,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SALTED_MD5;
}
@@ -162,7 +160,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -221,7 +218,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SALTED_MD5);
@@ -286,8 +282,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
// Base64-decode the stored value and take the last 8 bytes as the salt.
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes;
@@ -357,7 +351,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does support the authentication password syntax.
return true;
}
@@ -370,7 +363,6 @@
@Override()
public String getAuthPasswordSchemeName()
{
-
return AUTH_PASSWORD_SCHEME_NAME_SALTED_MD5;
}
@@ -383,8 +375,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -445,8 +435,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
byte[] saltBytes;
byte[] digestBytes;
try
@@ -492,7 +480,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -505,7 +492,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SALTED_MD5);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -522,7 +508,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, AUTH_PASSWORD_SCHEME_NAME_SALTED_MD5);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -537,7 +522,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// MD5 may be considered reasonably secure for this purpose.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index c4cab1b..fb5ddfb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -118,7 +118,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM_SHA_1);
@@ -148,7 +147,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SALTED_SHA_1;
}
@@ -161,7 +159,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -220,7 +217,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SALTED_SHA_1);
@@ -285,8 +281,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
// Base64-decode the stored value and take the last 8 bytes as the salt.
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes;
@@ -356,7 +350,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does support the authentication password syntax.
return true;
}
@@ -369,7 +362,6 @@
@Override()
public String getAuthPasswordSchemeName()
{
-
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1;
}
@@ -382,8 +374,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -444,8 +434,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
byte[] saltBytes;
byte[] digestBytes;
try
@@ -491,7 +479,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -504,7 +491,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SALTED_SHA_1);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -521,7 +507,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -536,7 +521,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// SHA-1 should be considered secure.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index 3a04313..506f80b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -119,7 +119,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest =
@@ -151,7 +150,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SALTED_SHA_256;
}
@@ -164,7 +162,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -223,7 +220,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SALTED_SHA_256);
@@ -288,8 +284,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
// Base64-decode the stored value and take the last 8 bytes as the salt.
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes;
@@ -359,7 +353,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does support the authentication password syntax.
return true;
}
@@ -372,7 +365,6 @@
@Override()
public String getAuthPasswordSchemeName()
{
-
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_256;
}
@@ -385,8 +377,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -447,8 +437,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
byte[] saltBytes;
byte[] digestBytes;
try
@@ -494,7 +482,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -507,7 +494,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SALTED_SHA_256);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -524,7 +510,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID,
AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_256);
@@ -540,7 +525,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// SHA-2 should be considered secure.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index d28d5ef..44607ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -119,7 +119,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest =
@@ -151,7 +150,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SALTED_SHA_384;
}
@@ -164,7 +162,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -223,7 +220,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SALTED_SHA_384);
@@ -288,8 +284,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
// Base64-decode the stored value and take the last 8 bytes as the salt.
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes;
@@ -359,7 +353,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does support the authentication password syntax.
return true;
}
@@ -372,7 +365,6 @@
@Override()
public String getAuthPasswordSchemeName()
{
-
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_384;
}
@@ -385,8 +377,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -447,8 +437,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
byte[] saltBytes;
byte[] digestBytes;
try
@@ -494,7 +482,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -507,7 +494,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SALTED_SHA_384);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -524,7 +510,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID,
AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_384);
@@ -540,7 +525,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// SHA-2 should be considered secure.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 0756c4c..d54861b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -119,7 +119,6 @@
public void initializePasswordStorageScheme(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
try
{
messageDigest =
@@ -150,7 +149,6 @@
@Override()
public String getStorageSchemeName()
{
-
return STORAGE_SCHEME_NAME_SALTED_SHA_512;
}
@@ -163,7 +161,6 @@
public ByteString encodePassword(ByteString plaintext)
throws DirectoryException
{
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -222,7 +219,6 @@
public ByteString encodePasswordWithScheme(ByteString plaintext)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append('{');
buffer.append(STORAGE_SCHEME_NAME_SALTED_SHA_512);
@@ -287,8 +283,6 @@
public boolean passwordMatches(ByteString plaintextPassword,
ByteString storedPassword)
{
-
-
// Base64-decode the stored value and take the last 8 bytes as the salt.
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes;
@@ -358,7 +352,6 @@
@Override()
public boolean supportsAuthPasswordSyntax()
{
-
// This storage scheme does support the authentication password syntax.
return true;
}
@@ -371,7 +364,6 @@
@Override()
public String getAuthPasswordSchemeName()
{
-
return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_512;
}
@@ -384,8 +376,6 @@
public ByteString encodeAuthPassword(ByteString plaintext)
throws DirectoryException
{
-
-
byte[] plainBytes = plaintext.value();
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] plainPlusSalt = new byte[plainBytes.length + NUM_SALT_BYTES];
@@ -446,8 +436,6 @@
public boolean authPasswordMatches(ByteString plaintextPassword,
String authInfo, String authValue)
{
-
-
byte[] saltBytes;
byte[] digestBytes;
try
@@ -493,7 +481,6 @@
@Override()
public boolean isReversible()
{
-
return false;
}
@@ -506,7 +493,6 @@
public ByteString getPlaintextValue(ByteString storedPassword)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID, STORAGE_SCHEME_NAME_SALTED_SHA_512);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -523,7 +509,6 @@
String authValue)
throws DirectoryException
{
-
int msgID = MSGID_PWSCHEME_NOT_REVERSIBLE;
String message = getMessage(msgID,
AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_512);
@@ -539,7 +524,6 @@
@Override()
public boolean isStorageSchemeSecure()
{
-
// SHA-2 should be considered secure.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
index 4639934..48ac719 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
@@ -82,7 +82,6 @@
*/
public SimpleStaticGroupMemberList(DN groupDN, Set<DN> memberDNs)
{
-
ensureNotNull(groupDN, memberDNs);
this.groupDN = groupDN;
@@ -98,7 +97,6 @@
@Override()
public boolean hasMoreMembers()
{
-
return memberDNIterator.hasNext();
}
@@ -111,7 +109,6 @@
public DN nextMemberDN()
throws MembershipException
{
-
if (memberDNIterator.hasNext())
{
return memberDNIterator.next();
@@ -129,7 +126,6 @@
public Entry nextMemberEntry()
throws MembershipException
{
-
if (memberDNIterator.hasNext())
{
DN memberDN = memberDNIterator.next();
@@ -173,7 +169,6 @@
@Override()
public void close()
{
-
// No implementation is required.
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index 58829db..fabf98d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -175,7 +175,6 @@
public void initializeEntryCache(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
dnMap.clear();
idMap.clear();
@@ -369,7 +368,6 @@
*/
public void finalizeEntryCache()
{
-
dnMap.clear();
idMap.clear();
}
@@ -388,7 +386,6 @@
*/
public boolean containsEntry(DN entryDN)
{
-
// Indicate whether the DN map contains the specified DN.
return dnMap.containsKey(entryDN);
}
@@ -407,7 +404,6 @@
*/
public Entry getEntry(DN entryDN)
{
-
SoftReference<CacheEntry> ref = dnMap.get(entryDN);
if (ref == null)
{
@@ -441,7 +437,6 @@
*/
public long getEntryID(DN entryDN)
{
-
SoftReference<CacheEntry> ref = dnMap.get(entryDN);
if (ref == null)
{
@@ -482,7 +477,6 @@
public Entry getEntry(DN entryDN, LockType lockType,
List<Lock> lockList)
{
-
SoftReference<CacheEntry> ref = dnMap.get(entryDN);
if (ref == null)
{
@@ -616,7 +610,6 @@
public Entry getEntry(Backend backend, long entryID,
LockType lockType, List<Lock> lockList)
{
-
ConcurrentHashMap<Long,SoftReference<CacheEntry>> map = idMap.get(backend);
if (map == null)
{
@@ -743,8 +736,6 @@
*/
public void putEntry(Entry entry, Backend backend, long entryID)
{
-
-
// If there is a set of exclude filters, then make sure that the provided
// entry doesn't match any of them.
if (! excludeFilters.isEmpty())
@@ -856,8 +847,6 @@
public boolean putEntryIfAbsent(Entry entry, Backend backend,
long entryID)
{
-
-
// If there is a set of exclude filters, then make sure that the provided
// entry doesn't match any of them.
if (! excludeFilters.isEmpty())
@@ -957,8 +946,6 @@
*/
public void removeEntry(DN entryDN)
{
-
-
SoftReference<CacheEntry> ref = dnMap.remove(entryDN);
if (ref != null)
{
@@ -991,7 +978,6 @@
*/
public void clear()
{
-
dnMap.clear();
idMap.clear();
}
@@ -1006,8 +992,6 @@
*/
public void clearBackend(Backend backend)
{
-
-
// FIXME -- Would it be better just to dump everything?
ConcurrentHashMap<Long,SoftReference<CacheEntry>> map =
idMap.remove(backend);
@@ -1037,8 +1021,6 @@
*/
public void clearSubtree(DN baseDN)
{
-
-
// Determine the backend used to hold the specified base DN and clear it.
Backend backend = DirectoryServer.getBackend(baseDN);
if (backend == null)
@@ -1062,8 +1044,6 @@
*/
public void handleLowMemory()
{
-
-
// This function should automatically be taken care of by the nature of the
// soft references used in this cache.
// FIXME -- Do we need to do anything at all here?
@@ -1080,7 +1060,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1095,7 +1074,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -1158,8 +1136,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// Start out assuming that the configuration is valid.
boolean configIsAcceptable = true;
@@ -1341,8 +1317,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
// Create a set of variables to use for the result.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
index d5f2335..7eaf9f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -97,7 +97,6 @@
public void initializeExtendedOperationHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// FIXME -- Are there any configurable options that we should support?
DirectoryServer.registerSupportedExtension(OID_START_TLS_REQUEST, this);
}
@@ -110,7 +109,6 @@
*/
public void finalizeExtendedOperationHandler()
{
-
DirectoryServer.deregisterSupportedExtension(OID_START_TLS_REQUEST);
}
@@ -123,8 +121,6 @@
*/
public void processExtendedOperation(ExtendedOperation operation)
{
-
-
// We should always include the StartTLS OID in the response (the same OID
// is used for both the request and the response), so make sure that it will
// happen.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
index 5c1aafb..fc48c61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
@@ -139,7 +139,6 @@
public void initializeGroupImplementation(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No additional initialization is required.
}
@@ -153,7 +152,6 @@
public StaticGroup newInstance(Entry groupEntry)
throws DirectoryException
{
-
ensureNotNull(groupEntry);
@@ -240,7 +238,6 @@
public SearchFilter getGroupDefinitionFilter()
throws DirectoryException
{
-
// FIXME -- This needs to exclude enhanced groups once we have support for
// them.
String filterString =
@@ -291,7 +288,6 @@
@Override()
public DN getGroupDN()
{
-
return groupEntryDN;
}
@@ -303,7 +299,6 @@
@Override()
public boolean supportsNestedGroups()
{
-
// FIXME -- We should add support for nested groups.
return false;
}
@@ -316,7 +311,6 @@
@Override()
public List<DN> getNestedGroupDNs()
{
-
// FIXME -- We should add support for nested groups.
return Collections.<DN>emptyList();
}
@@ -330,7 +324,6 @@
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
-
// FIXME -- We should add support for nested groups.
throw new UnsupportedOperationException();
}
@@ -344,7 +337,6 @@
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
-
// FIXME -- We should add support for nested groups.
throw new UnsupportedOperationException();
}
@@ -358,7 +350,6 @@
public boolean isMember(DN userDN)
throws DirectoryException
{
-
return memberDNs.contains(userDN);
}
@@ -371,7 +362,6 @@
public boolean isMember(Entry userEntry)
throws DirectoryException
{
-
return memberDNs.contains(userEntry.getDN());
}
@@ -384,7 +374,6 @@
public MemberList getMembers()
throws DirectoryException
{
-
return new SimpleStaticGroupMemberList(groupEntryDN, memberDNs);
}
@@ -398,7 +387,6 @@
SearchFilter filter)
throws DirectoryException
{
-
if ((baseDN == null) && (filter == null))
{
return new SimpleStaticGroupMemberList(groupEntryDN, memberDNs);
@@ -418,7 +406,6 @@
@Override()
public boolean mayAlterMemberList()
{
-
return true;
}
@@ -431,7 +418,6 @@
public void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException
{
-
ensureNotNull(userEntry);
synchronized (this)
@@ -496,7 +482,6 @@
public void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException
{
-
ensureNotNull(userDN);
synchronized (this)
@@ -558,7 +543,6 @@
@Override()
public void toString(StringBuilder buffer)
{
-
buffer.append("StaticGroup(");
buffer.append(groupEntryDN);
buffer.append(")");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 5964f20..109aa90 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -113,7 +113,6 @@
public void initializeCertificateMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
this.configEntryDN = configEntry.getDN();
// Get the attribute that will be used to map subject attributes to user
@@ -250,7 +249,6 @@
*/
public void finalizeCertificateMapper()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -262,8 +260,6 @@
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
{
-
-
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
@@ -393,7 +389,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -408,7 +403,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
LinkedList<String> mapValues = new LinkedList<String>();
@@ -462,7 +456,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
DN configEntryDN = configEntry.getDN();
boolean configAcceptable = true;
@@ -631,7 +624,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 3c88e17..11dab3b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -110,7 +110,6 @@
public void initializeCertificateMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
this.configEntryDN = configEntry.getDN();
// Get the attribute type that will be used to hold the certificate subject.
@@ -202,7 +201,6 @@
*/
public void finalizeCertificateMapper()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -214,8 +212,6 @@
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
{
-
-
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
@@ -310,7 +306,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -325,7 +320,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_SDTUACM_DESCRIPTION_SUBJECT_ATTR;
@@ -372,7 +366,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
DN configEntryDN = configEntry.getDN();
boolean configAcceptable = true;
@@ -478,7 +471,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
DN configEntryDN = configEntry.getDN();
ResultCode resultCode = ResultCode.SUCCESS;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index 6831ee8..34cab94 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -94,7 +94,6 @@
public void initializeCertificateMapper(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -123,8 +122,6 @@
public Entry mapCertificateToUser(Certificate[] certificateChain)
throws DirectoryException
{
-
-
// Make sure that a peer certificate was provided.
if ((certificateChain == null) || (certificateChain.length == 0))
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
index 152f3ad..3846b8c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
@@ -288,7 +288,6 @@
public void initializeConnectionSecurityProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// Initialize default values for the connection-specific variables.
clientConnection = null;
socketChannel = null;
@@ -315,7 +314,6 @@
*/
public void finalizeConnectionSecurityProvider()
{
-
// No implementation is required.
}
@@ -328,7 +326,6 @@
*/
public String getSecurityMechanismName()
{
-
return SSL_CONTEXT_INSTANCE_NAME;
}
@@ -344,7 +341,6 @@
*/
public boolean isSecure()
{
-
// This should be considered secure.
return true;
}
@@ -372,7 +368,6 @@
SocketChannel socketChannel)
throws DirectoryException
{
-
return new TLSConnectionSecurityProvider(clientConnection, socketChannel,
this);
}
@@ -396,7 +391,6 @@
*/
public void disconnect(boolean connectionValid)
{
-
if (connectionValid)
{
try
@@ -478,7 +472,6 @@
*/
public int getClearBufferSize()
{
-
return clearBufferSize;
}
@@ -494,7 +487,6 @@
*/
public int getEncodedBufferSize()
{
-
return sslBufferSize;
}
@@ -515,8 +507,6 @@
*/
public boolean readData()
{
-
-
while (true)
{
try
@@ -698,7 +688,6 @@
*/
public boolean writeData(ByteBuffer clearData)
{
-
int originalPosition = clearData.position();
int originalLimit = clearData.limit();
int length = originalLimit - originalPosition;
@@ -986,7 +975,6 @@
*/
public String[] getEnabledProtocols()
{
-
return enabledProtocols;
}
@@ -1001,7 +989,6 @@
*/
public void setEnabledProtocols(String[] enabledProtocols)
{
-
this.enabledProtocols = enabledProtocols;
}
@@ -1014,7 +1001,6 @@
*/
public String[] getEnabledCipherSuites()
{
-
return enabledCipherSuites;
}
@@ -1028,7 +1014,6 @@
*/
public void setEnabledCipherSuites(String[] enabledCipherSuites)
{
-
this.enabledCipherSuites = enabledCipherSuites;
}
@@ -1041,7 +1026,6 @@
*/
public SSLClientAuthPolicy getSSLClientAuthPolicy()
{
-
return sslClientAuthPolicy;
}
@@ -1055,7 +1039,6 @@
*/
public void setSSLClientAuthPolicy(SSLClientAuthPolicy sslClientAuthPolicy)
{
-
this.sslClientAuthPolicy = sslClientAuthPolicy;
}
@@ -1068,7 +1051,6 @@
*/
public SSLSession getSSLSession()
{
-
return sslEngine.getSession();
}
@@ -1085,7 +1067,6 @@
*/
public Certificate[] getClientCertificateChain()
{
-
try
{
return sslEngine.getSession().getPeerCertificates();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
index eba7cef..f97f536 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -132,7 +132,6 @@
*/
public TraditionalWorkQueue()
{
-
// No implementation should be performed here.
}
@@ -144,8 +143,6 @@
public void initializeWorkQueue(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
shutdownRequested = false;
killThreads = false;
opsSubmitted = new AtomicLong(0);
@@ -312,7 +309,6 @@
*/
public void finalizeWorkQueue(String reason)
{
-
shutdownRequested = true;
@@ -372,7 +368,6 @@
*/
public boolean shutdownRequested()
{
-
return shutdownRequested;
}
@@ -392,7 +387,6 @@
public void submitOperation(Operation operation)
throws DirectoryException
{
-
if (shutdownRequested)
{
int messageID = MSGID_OP_REJECTED_BY_SHUTDOWN;
@@ -427,7 +421,6 @@
*/
public Operation nextOperation(TraditionalWorkerThread workerThread)
{
-
return retryNextOperation(workerThread, 0);
}
@@ -452,8 +445,6 @@
private Operation retryNextOperation(TraditionalWorkerThread workerThread,
int numFailures)
{
-
-
// See if we should kill off this thread. This could be necessary if the
// number of worker threads has been decreased with the server online. If
// so, then return null and the thread will exit.
@@ -611,7 +602,6 @@
*/
public boolean removeOperation(Operation operation)
{
-
return opQueue.remove(operation);
}
@@ -628,7 +618,6 @@
*/
public long getOpsSubmitted()
{
-
return opsSubmitted.longValue();
}
@@ -643,7 +632,6 @@
*/
public long getOpsRejectedDueToQueueFull()
{
-
return queueFullRejects.longValue();
}
@@ -660,7 +648,6 @@
*/
public int size()
{
-
return opQueue.size();
}
@@ -675,7 +662,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -690,7 +676,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -732,8 +717,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configIsAcceptable = true;
@@ -855,8 +838,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ArrayList<String> resultMessages = new ArrayList<String>();
int newNumThreads;
int newMaxCapacity;
@@ -1105,7 +1086,6 @@
*/
public boolean isIdle()
{
-
if (opQueue.size() > 0)
{
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index 3f6570b..a7afcd0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -112,7 +112,6 @@
*/
public void setStoppedByReducedThreadNumber()
{
-
stoppedByReducedThreadNumber = true;
}
@@ -129,7 +128,6 @@
*/
public boolean isActive()
{
-
return (isAlive() && (operation != null));
}
@@ -141,7 +139,6 @@
*/
public void run()
{
-
workerThread = currentThread();
while (! shutdownRequested)
@@ -265,7 +262,6 @@
*/
public void shutDown()
{
-
if (debugEnabled())
{
debugInfo(getName() + " being signaled to shut down.");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 646d73d..29fa150 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -88,7 +88,6 @@
public void initializeExtendedOperationHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No special configuration is required.
DirectoryServer.registerSupportedExtension(OID_WHO_AM_I_REQUEST, this);
@@ -102,7 +101,6 @@
*/
public void finalizeExtendedOperationHandler()
{
-
DirectoryServer.deregisterSupportedExtension(OID_WHO_AM_I_REQUEST);
}
@@ -115,8 +113,6 @@
*/
public void processExtendedOperation(ExtendedOperation operation)
{
-
-
// Get the client connection and determine the DN of the user associated
// with it.
ClientConnection clientConnection = operation.getClientConnection();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java b/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
index 7d9c485..41e154b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
@@ -87,7 +87,6 @@
*/
public LazyDN(String dnString)
{
-
this.dnString = dnString;
this.decodedDN = null;
}
@@ -101,7 +100,6 @@
public boolean isNullDN()
throws RuntimeException
{
-
return getDecodedDN().isNullDN();
}
@@ -114,7 +112,6 @@
public int getNumComponents()
throws RuntimeException
{
-
return getDecodedDN().getNumComponents();
}
@@ -139,7 +136,6 @@
public RDN getRDN(int pos)
throws RuntimeException
{
-
return getDecodedDN().getRDN(pos);
}
@@ -152,7 +148,6 @@
public DN getParent()
throws RuntimeException
{
-
return getDecodedDN().getParent();
}
@@ -165,7 +160,6 @@
public DN getParentDNInSuffix()
throws RuntimeException
{
-
return getDecodedDN().getParentDNInSuffix();
}
@@ -178,7 +172,6 @@
public DN concat(RDN rdn)
throws RuntimeException
{
-
return getDecodedDN().concat(rdn);
}
@@ -191,7 +184,6 @@
public DN concat(RDN[] rdnComponents)
throws RuntimeException
{
-
return getDecodedDN().concat(rdnComponents);
}
@@ -204,7 +196,6 @@
public DN concat(DN relativeBaseDN)
throws RuntimeException
{
-
return getDecodedDN().concat(relativeBaseDN);
}
@@ -217,7 +208,6 @@
public boolean isDescendantOf(DN dn)
throws RuntimeException
{
-
return getDecodedDN().isDescendantOf(dn);
}
@@ -230,7 +220,6 @@
public boolean isAncestorOf(DN dn)
throws RuntimeException
{
-
return getDecodedDN().isAncestorOf(dn);
}
@@ -243,7 +232,6 @@
public boolean equals(Object o)
throws RuntimeException
{
-
return getDecodedDN().equals(o);
}
@@ -256,7 +244,6 @@
public int hashCode()
throws RuntimeException
{
-
return getDecodedDN().hashCode();
}
@@ -268,7 +255,6 @@
@Override()
public String toString()
{
-
return dnString;
}
@@ -280,7 +266,6 @@
@Override()
public void toString(StringBuilder buffer)
{
-
buffer.append(dnString);
}
@@ -293,7 +278,6 @@
public String toNormalizedString()
throws RuntimeException
{
-
return getDecodedDN().toNormalizedString();
}
@@ -306,7 +290,6 @@
public void toNormalizedString(StringBuilder buffer)
throws RuntimeException
{
-
getDecodedDN().toNormalizedString(buffer);
}
@@ -319,7 +302,6 @@
public int compareTo(DN dn)
throws RuntimeException
{
-
return getDecodedDN().compareTo(dn);
}
@@ -335,7 +317,6 @@
private DN getDecodedDN()
throws RuntimeException
{
-
if (decodedDN == null)
{
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
index a56c5fa..fba3ae5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
@@ -102,7 +102,6 @@
public void initializeAccessLogger(ConfigEntry configEntry)
throws ConfigException
{
-
configDN = configEntry.getDN();
// FIXME - read the logger name from the config
@@ -878,7 +877,6 @@
public void logSearchResultEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
// NYI
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
index 0380dff..a96af5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
@@ -109,7 +109,6 @@
public void initializeAccessLogger(ConfigEntry configEntry)
throws ConfigException
{
-
configDN = configEntry.getDN();
// FIXME - read the logger name from the config
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
index 0c7d33e..afb83ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
@@ -101,7 +101,6 @@
public void initializeErrorLogger(ConfigEntry configEntry)
throws ConfigException
{
-
configDN = configEntry.getDN();
defaultSeverities = new HashSet<ErrorLogSeverity>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
index 7f9e2f4..332d49a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -49,7 +49,6 @@
*/
public FileNumberRetentionPolicy(String dir, String prefix, int numFiles)
{
-
this.numFiles = numFiles;
this.directory = new File(dir);
this.prefix = prefix;
@@ -63,7 +62,6 @@
*/
public int deleteFiles()
{
-
int count = 0;
File[] selectedFiles = directory.listFiles(new LogFileFilter(prefix));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
index e448d41..a15fb86 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -55,7 +55,6 @@
public FixedTimeRotationPolicy(int[] timeOfDays)
{
-
Calendar cal = new GregorianCalendar();
cal.set( Calendar.MILLISECOND, 0 );
cal.set( Calendar.SECOND, 0 );
@@ -87,7 +86,6 @@
*/
public boolean rotateFile()
{
-
long currTime = TimeThread.getTime();
if (debugEnabled())
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index 7e2c0cd..28756f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -56,7 +56,6 @@
public FreeDiskSpaceRetentionPolicy(String dir, String prefix,
long freeDiskSpace)
{
-
this.directory = new File(dir);
this.freeDiskSpace = freeDiskSpace;
this.prefix = prefix;
@@ -70,7 +69,6 @@
*/
public int deleteFiles()
{
-
int count = 0;
long freeSpace = 0;
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
index 1f7d603..96bdc3d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
@@ -87,8 +87,6 @@
*/
public void run()
{
-
-
this.loggerThread = Thread.currentThread();
while (!stopRequested)
@@ -142,8 +140,6 @@
*/
public String getShutdownListenerName()
{
-
-
return "Logger Thread " + getName();
}
@@ -158,8 +154,6 @@
*/
public void processServerShutdown(String reason)
{
-
-
stopRequested = true;
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
index 74f6255..28e286d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
@@ -77,7 +77,6 @@
getRotationPolicies(ConfigEntry configEntry)
throws ConfigException
{
-
HashSet<String> allowedValues = new HashSet<String>();
allowedValues.add("size");
allowedValues.add("timeofday");
@@ -207,7 +206,6 @@
getRetentionPolicies(ConfigEntry configEntry)
throws ConfigException
{
-
StringConfigAttribute logFileStub =
new StringConfigAttribute(ATTR_LOGGER_FILE,
getMessage(MSGID_CONFIG_LOGGER_DESCRIPTION_CLASS_NAME),
@@ -343,7 +341,6 @@
getPostRotationActions(ConfigEntry configEntry)
throws ConfigException
{
-
ArrayList<ActionType> actions = new ArrayList<ActionType>();
StringConfigAttribute rotationActionStub =
@@ -447,7 +444,6 @@
public static int getIntegerAttribute(ConfigEntry configEntry,
String attrName, int msgID) throws ConfigException
{
-
int value = -1;
IntegerConfigAttribute attrStub =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index ca4b632..2b28e4e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -49,7 +49,6 @@
*/
public SizeBasedRetentionPolicy(String dir, String prefix, long size)
{
-
this.size = size;
this.directory = new File(dir);
this.prefix = prefix;
@@ -63,7 +62,6 @@
*/
public int deleteFiles()
{
-
int count = 0;
File[] selectedFiles = directory.listFiles(new LogFileFilter(prefix));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
index 481dc86..3910ebb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -47,7 +47,6 @@
*/
public SizeBasedRotationPolicy(long size)
{
-
sizeLimit = size;
}
@@ -79,7 +78,6 @@
*/
public boolean rotateFile()
{
-
if (fileHandler.getFileSize() >= sizeLimit)
{
if (debugEnabled())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
index 0873dcb..4b78509 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -45,7 +45,6 @@
*/
public TimeLimitRotationPolicy(long time)
{
-
timeInterval = time;
lastModifiedTime = TimeThread.getTime();
}
@@ -59,7 +58,6 @@
*/
public boolean rotateFile()
{
-
long currTime = TimeThread.getTime();
if (currTime - lastModifiedTime > timeInterval)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
index 09cef62..342e700 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
@@ -104,7 +104,6 @@
*/
public void initializeMonitorProvider(ConfigEntry configEntry)
{
-
monitorName = backend.getBackendID() + " Backend";
backendIDType = DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_ID,
@@ -133,7 +132,6 @@
*/
public String getMonitorInstanceName()
{
-
return monitorName;
}
@@ -148,7 +146,6 @@
*/
public ObjectClass getMonitorObjectClass()
{
-
return DirectoryConfig.getObjectClass(OC_MONITOR_BACKEND, true);
}
@@ -159,7 +156,6 @@
*/
public long getUpdateInterval()
{
-
// We don't need do anything on a periodic basis.
return 0;
}
@@ -171,7 +167,6 @@
*/
public void updateMonitorData()
{
-
// No implementaiton is required.
}
@@ -182,7 +177,6 @@
*/
public List<Attribute> getMonitorData()
{
-
LinkedList<Attribute> attrs = new LinkedList<Attribute>();
LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
index d369c66..5a8bc35 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -103,7 +103,6 @@
*/
public void initializeMonitorProvider(ConfigEntry configEntry)
{
-
monitorName = connectionHandler.getConnectionHandlerName();
connectionsType =
@@ -130,7 +129,6 @@
*/
public String getMonitorInstanceName()
{
-
return monitorName;
}
@@ -145,7 +143,6 @@
*/
public ObjectClass getMonitorObjectClass()
{
-
return DirectoryConfig.getObjectClass(OC_MONITOR_CONNHANDLER, true);
}
@@ -156,7 +153,6 @@
*/
public long getUpdateInterval()
{
-
// We don't need do anything on a periodic basis.
return 0;
}
@@ -168,7 +164,6 @@
*/
public void updateMonitorData()
{
-
// No implementaiton is required.
}
@@ -179,7 +174,6 @@
*/
public List<Attribute> getMonitorData()
{
-
LinkedList<Attribute> attrs = new LinkedList<Attribute>();
int numConnections = 0;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
index f2d8d76..ea237ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
@@ -86,7 +86,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -100,7 +99,6 @@
*/
public String getMonitorInstanceName()
{
-
return "JVM Stack Trace";
}
@@ -117,7 +115,6 @@
*/
public long getUpdateInterval()
{
-
// This monitor does not need to run periodically.
return 0;
}
@@ -133,7 +130,6 @@
*/
public void updateMonitorData()
{
-
// This monitor does not need to run periodically.
return;
}
@@ -150,8 +146,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
-
-
Map<Thread,StackTraceElement[]> threadStacks = Thread.getAllStackTraces();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
index f2865cf..e4df522 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -88,7 +88,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -102,7 +101,6 @@
*/
public String getMonitorInstanceName()
{
-
return "System Information";
}
@@ -119,7 +117,6 @@
*/
public long getUpdateInterval()
{
-
// This monitor does not need to run periodically.
return 0;
}
@@ -135,7 +132,6 @@
*/
public void updateMonitorData()
{
-
// This monitor does not need to run periodically.
return;
}
@@ -152,8 +148,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
-
-
ArrayList<Attribute> attrs = new ArrayList<Attribute>(12);
attrs.add(createAttribute("javaVersion",
@@ -216,7 +210,6 @@
*/
private Attribute createAttribute(String name, String value)
{
-
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
index 9b4628c..72914ec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
@@ -145,7 +145,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
maxBacklog = 0;
totalBacklog = 0;
numPolls = 0;
@@ -161,7 +160,6 @@
*/
public String getMonitorInstanceName()
{
-
return "Work Queue";
}
@@ -178,8 +176,6 @@
*/
public long getUpdateInterval()
{
-
-
// We will poll the work queue every 10 seconds.
return 10000;
}
@@ -195,7 +191,6 @@
*/
public void updateMonitorData()
{
-
int backlog = workQueue.size();
totalBacklog += backlog;
numPolls++;
@@ -218,7 +213,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
-
int backlog = workQueue.size();
totalBacklog += backlog;
numPolls++;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
index f86df1d..8835382 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
@@ -87,7 +87,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getMonitorInstanceName()
{
-
return "Version";
}
@@ -118,7 +116,6 @@
*/
public long getUpdateInterval()
{
-
// This monitor does not need to run periodically.
return 0;
}
@@ -134,7 +131,6 @@
*/
public void updateMonitorData()
{
-
// This monitor does not need to run periodically.
return;
}
@@ -151,8 +147,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
-
-
ArrayList<Attribute> attrs = new ArrayList<Attribute>(8);
attrs.add(createAttribute("productName", DynamicConstants.PRODUCT_NAME));
@@ -187,7 +181,6 @@
*/
private Attribute createAttribute(String name, String value)
{
-
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
index cccc249..095a0ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -129,8 +129,6 @@
ConfigEntry configEntry)
throws ConfigException
{
-
-
// Make sure that the plugin has been enabled for the appropriate types.
for (PluginType t : pluginTypes)
{
@@ -159,8 +157,6 @@
public final LDIFPluginResult doLDIFImport(LDIFImportConfig importConfig,
Entry entry)
{
-
-
// See if the entry being imported already contains an entryUUID attribute.
// If so, then leave it alone.
List<Attribute> uuidList = entry.getAttribute(entryUUIDType);
@@ -199,8 +195,6 @@
public final PreOperationPluginResult
doPreOperation(PreOperationAddOperation addOperation)
{
-
-
// See if the entry being added already contains an entryUUID attribute.
// It shouldn't, since it's NO-USER-MODIFICATION, but if it does then leave
// it alone.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
index 5270c32..fb6f307 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
@@ -84,8 +84,6 @@
ConfigEntry configEntry)
throws ConfigException
{
-
-
// The set of plugin types must contain only the pre-parse search element.
if (pluginTypes.isEmpty())
{
@@ -122,8 +120,6 @@
public final PreParsePluginResult
doPreParse(PreParseSearchOperation searchOperation)
{
-
-
// Iterate through the requested attributes to see if any of them start with
// an "@" symbol. If not, then we don't need to do anything. If so, then
// keep track of them.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
index 96a3d56..2b522af 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -121,8 +121,6 @@
ConfigEntry configEntry)
throws ConfigException
{
-
-
// Make sure that the plugin has been enabled for the appropriate types.
for (PluginType t : pluginTypes)
{
@@ -152,8 +150,6 @@
public final PreOperationPluginResult
doPreOperation(PreOperationAddOperation addOperation)
{
-
-
// Create the attribute list for the creatorsName attribute, if appropriate.
DN creatorDN = addOperation.getAuthorizationDN();
LinkedHashSet<AttributeValue> nameValues =
@@ -203,8 +199,6 @@
public final PreOperationPluginResult
doPreOperation(PreOperationModifyOperation modifyOperation)
{
-
-
// Create the modifiersName attribute.
DN modifierDN = modifyOperation.getAuthorizationDN();
LinkedHashSet<AttributeValue> nameValues =
@@ -282,8 +276,6 @@
public final PreOperationPluginResult
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
{
-
-
// Create the modifiersName attribute.
DN modifierDN = modifyDNOperation.getAuthorizationDN();
LinkedHashSet<AttributeValue> nameValues =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index cc0b9f6..a7ac0f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -179,8 +179,6 @@
ConfigEntry configEntry)
throws ConfigException
{
-
-
// Make sure that the plugin has been enabled for the appropriate types.
for (PluginType t : pluginTypes)
{
@@ -208,8 +206,6 @@
public final LDIFPluginResult doLDIFImport(LDIFImportConfig importConfig,
Entry entry)
{
-
-
// Create a list that we will use to hold new encoded values.
ArrayList<ByteString> encodedValueList = new ArrayList<ByteString>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
index b9b6435..ecf6c74 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
@@ -85,7 +85,6 @@
*/
public ProfileStack(StackTraceElement[] stackElements)
{
-
numFrames = stackElements.length;
classNames = new String[numFrames];
methodNames = new String[numFrames];
@@ -123,7 +122,6 @@
private ProfileStack(String[] classNames, String[] methodNames,
int[] lineNumbers)
{
-
this.numFrames = classNames.length;
this.classNames = classNames;
this.methodNames = methodNames;
@@ -139,7 +137,6 @@
*/
public int getNumFrames()
{
-
return numFrames;
}
@@ -152,7 +149,6 @@
*/
public String[] getClassNames()
{
-
return classNames;
}
@@ -168,7 +164,6 @@
*/
public String getClassName(int depth)
{
-
return classNames[depth];
}
@@ -181,7 +176,6 @@
*/
public String[] getMethodNames()
{
-
return methodNames;
}
@@ -197,7 +191,6 @@
*/
public String getMethodName(int depth)
{
-
return methodNames[depth];
}
@@ -210,7 +203,6 @@
*/
public int[] getLineNumbers()
{
-
return lineNumbers;
}
@@ -226,7 +218,6 @@
*/
public int getLineNumber(int depth)
{
-
return lineNumbers[depth];
}
@@ -241,7 +232,6 @@
*/
public int hashCode()
{
-
if (numFrames == 0)
{
return 0;
@@ -266,7 +256,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -319,7 +308,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(3*numFrames);
for (int i=0; i < numFrames; i++)
{
@@ -344,7 +332,6 @@
*/
public static ProfileStack decode(ASN1Element stackElement)
{
-
try
{
ArrayList<ASN1Element> elements =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
index f12e0ac..5bb2228 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
@@ -74,7 +74,6 @@
*/
public ProfileStackFrame(String className, String methodName)
{
-
this.className = className;
this.methodName = methodName;
@@ -91,7 +90,6 @@
*/
public String getClassName()
{
-
return className;
}
@@ -104,7 +102,6 @@
*/
public String getMethodName()
{
-
return methodName;
}
@@ -119,7 +116,6 @@
*/
public String getHTMLSafeMethodName()
{
-
int length = methodName.length();
StringBuilder buffer = new StringBuilder(length + 6);
@@ -154,7 +150,6 @@
*/
public HashMap<Integer,Long> getLineNumbers()
{
-
return lineNumbers;
}
@@ -170,7 +165,6 @@
*/
public void updateLineNumberCount(int lineNumber, long numOccurrences)
{
-
Long existingCount = lineNumbers.get(lineNumber);
if (existingCount == null)
{
@@ -193,7 +187,6 @@
*/
public long getTotalCount()
{
-
long totalCount = 0;
for (Long l : lineNumbers.values())
@@ -216,7 +209,6 @@
*/
public ProfileStackFrame[] getSubordinateFrames()
{
-
ProfileStackFrame[] subFrames = new ProfileStackFrame[0];
subFrames = subordinateFrames.values().toArray(subFrames);
@@ -235,7 +227,6 @@
*/
public boolean hasSubFrames()
{
-
return (! subordinateFrames.isEmpty());
}
@@ -255,7 +246,6 @@
public void recurseSubFrames(ProfileStack stack, int depth, long count,
HashMap<String,HashMap<ProfileStack,Long>> stacksByMethod)
{
-
if (depth < 0)
{
return;
@@ -299,7 +289,6 @@
*/
public int hashCode()
{
-
return (className.hashCode() + methodName.hashCode());
}
@@ -317,7 +306,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -364,7 +352,6 @@
public int compareTo(Object o)
throws ClassCastException
{
-
ProfileStackFrame f;
try
{
@@ -405,7 +392,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(getTotalCount());
buffer.append(" ");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
index b94c590..26aee29 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -178,8 +178,6 @@
ConfigEntry configEntry)
throws ConfigException
{
-
-
// Initialize the set of profiler actions.
profilerActions = new LinkedHashSet<String>(4);
profilerActions.add(PROFILE_ACTION_NONE);
@@ -332,8 +330,6 @@
@Override()
public final void finalizePlugin()
{
-
-
// If the profiler thread is still active, then cause it to dump the
// information it has captured and exit.
synchronized (this)
@@ -377,7 +373,6 @@
@Override()
public final StartupPluginResult doStartup()
{
-
// If the profiler should be started automatically, then do so now.
if (autoStart)
{
@@ -395,7 +390,6 @@
*/
public final DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -406,7 +400,6 @@
*/
public final List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -460,8 +453,6 @@
public final boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
// See if there is an acceptable value for the sample interval.
int msgID = MSGID_PLUGIN_PROFILER_DESCRIPTION_INTERVAL;
IntegerWithUnitConfigAttribute intervalStub =
@@ -589,8 +580,6 @@
public final ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
index ae5e0be..e7d6be7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
@@ -111,7 +111,6 @@
*/
public void run()
{
-
captureThread = currentThread();
captureStartTime = System.currentTimeMillis();
@@ -195,7 +194,6 @@
*/
public void stopProfiling()
{
-
stopProfiling = true;
try
@@ -228,8 +226,6 @@
public void writeCaptureData(String filename)
throws IOException
{
-
-
// Open the capture file for writing. We'll use an ASN.1 writer to write
// the data.
ASN1Writer writer = new ASN1Writer(new FileOutputStream(filename));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
index ba2b28a..6444f6c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
@@ -118,7 +118,6 @@
*/
public boolean booleanValue()
{
-
return booleanValue;
}
@@ -131,7 +130,6 @@
*/
public void setValue(boolean booleanValue)
{
-
this.booleanValue = booleanValue;
setValueInternal(encodeValue(booleanValue));
}
@@ -149,7 +147,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_BOOLEAN_SET_VALUE_NULL;
@@ -183,7 +180,6 @@
public static ASN1Boolean decodeAsBoolean(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_BOOLEAN_DECODE_ELEMENT_NULL;
@@ -219,7 +215,6 @@
public static ASN1Boolean decodeAsBoolean(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 Boolean element.
if (encodedElement == null)
@@ -303,7 +298,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Boolean(type=");
buffer.append(byteToHex(getType()));
buffer.append(", value=");
@@ -324,7 +318,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
index 576686a..44eb285 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
@@ -79,7 +79,6 @@
*/
public ASN1Element(byte type)
{
-
this.type = type;
this.value = NO_VALUE;
}
@@ -94,7 +93,6 @@
*/
public ASN1Element(byte type, byte[] value)
{
-
this.type = type;
if (value == null)
@@ -116,7 +114,6 @@
*/
public byte getType()
{
-
return type;
}
@@ -129,7 +126,6 @@
*/
public void setType(byte type)
{
-
this.type = type;
}
@@ -143,7 +139,6 @@
*/
public boolean isUniversal()
{
-
return ((type & TYPE_MASK_ALL_BUT_CLASS) == TYPE_MASK_UNIVERSAL);
}
@@ -157,7 +152,6 @@
*/
public boolean isApplicationSpecific()
{
-
return ((type & TYPE_MASK_ALL_BUT_CLASS) == TYPE_MASK_APPLICATION);
}
@@ -171,7 +165,6 @@
*/
public boolean isContextSpecific()
{
-
return ((type & TYPE_MASK_ALL_BUT_CLASS) == TYPE_MASK_CONTEXT);
}
@@ -185,7 +178,6 @@
*/
public boolean isPrivate()
{
-
return ((type & TYPE_MASK_ALL_BUT_CLASS) == TYPE_MASK_PRIVATE);
}
@@ -199,7 +191,6 @@
*/
public boolean isPrimitive()
{
-
return ((type & TYPE_MASK_ALL_BUT_PC) == TYPE_MASK_PRIMITIVE);
}
@@ -213,7 +204,6 @@
*/
public boolean isConstructed()
{
-
return ((type & TYPE_MASK_ALL_BUT_PC) == TYPE_MASK_CONSTRUCTED);
}
@@ -226,7 +216,6 @@
*/
public byte[] value()
{
-
return value;
}
@@ -243,7 +232,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
this.value = NO_VALUE;
@@ -266,7 +254,6 @@
*/
protected final void setValueInternal(byte[] value)
{
-
this.value = value;
}
@@ -281,7 +268,6 @@
*/
public static byte[] encodeLength(int length)
{
-
if (length < 128)
{
return new byte[] { (byte) length };
@@ -336,7 +322,6 @@
*/
public byte[] encode()
{
-
if (value.length == 0)
{
return new byte[] { type, 0x00 };
@@ -379,7 +364,6 @@
*/
public static byte[] encodeValue(boolean booleanValue)
{
-
return (booleanValue ? BOOLEAN_VALUE_TRUE : BOOLEAN_VALUE_FALSE);
}
@@ -396,7 +380,6 @@
*/
public static byte[] encodeValue(int intValue)
{
-
if ((intValue & 0x0000007F) == intValue)
{
return new byte[]
@@ -446,7 +429,6 @@
*/
public static byte[] encodeLongValue(long longValue)
{
-
if ((longValue & 0x000000000000007FL) == longValue)
{
return new byte[]
@@ -546,7 +528,6 @@
*/
public static byte[] encodeValue(ArrayList<ASN1Element> elements)
{
-
if (elements == null)
{
return NO_VALUE;
@@ -588,8 +569,6 @@
public static ASN1Element decode(byte[] encodedElement)
throws ASN1Exception
{
-
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 element.
if (encodedElement == null)
@@ -675,8 +654,6 @@
int length)
throws ASN1Exception
{
-
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 element.
if (encodedElement == null)
@@ -754,7 +731,6 @@
public ASN1Boolean decodeAsBoolean()
throws ASN1Exception
{
-
return ASN1Boolean.decodeAsBoolean(this);
}
@@ -771,7 +747,6 @@
public ASN1Enumerated decodeAsEnumerated()
throws ASN1Exception
{
-
return ASN1Enumerated.decodeAsEnumerated(this);
}
@@ -788,7 +763,6 @@
public ASN1Integer decodeAsInteger()
throws ASN1Exception
{
-
return ASN1Integer.decodeAsInteger(this);
}
@@ -805,7 +779,6 @@
public ASN1Long decodeAsLong()
throws ASN1Exception
{
-
return ASN1Long.decodeAsLong(this);
}
@@ -822,7 +795,6 @@
public ASN1Null decodeAsNull()
throws ASN1Exception
{
-
return ASN1Null.decodeAsNull(this);
}
@@ -839,7 +811,6 @@
public ASN1OctetString decodeAsOctetString()
throws ASN1Exception
{
-
return ASN1OctetString.decodeAsOctetString(this);
}
@@ -856,7 +827,6 @@
public ASN1Sequence decodeAsSequence()
throws ASN1Exception
{
-
return ASN1Sequence.decodeAsSequence(this);
}
@@ -873,7 +843,6 @@
public ASN1Set decodeAsSet()
throws ASN1Exception
{
-
return ASN1Set.decodeAsSet(this);
}
@@ -893,8 +862,6 @@
public static ArrayList<ASN1Element> decodeElements(byte[] encodedElements)
throws ASN1Exception
{
-
-
// Make sure that the element array is not null.
if (encodedElements == null)
{
@@ -976,7 +943,6 @@
*/
public String getProtocolElementName()
{
-
return "ASN.1";
}
@@ -994,7 +960,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -1023,7 +988,6 @@
*/
public boolean equalsIgnoreType(ASN1Element element)
{
-
return Arrays.equals(value, element.value);
}
@@ -1041,7 +1005,6 @@
*/
public boolean equalsIgnoreType(ByteString byteString)
{
-
return Arrays.equals(value, byteString.value());
}
@@ -1058,7 +1021,6 @@
*/
public boolean equalsElement(ASN1Element e)
{
-
if (this == e)
{
return true;
@@ -1082,7 +1044,6 @@
*/
public int hashCode()
{
-
int hashCode = type;
int length = Math.min(20, value.length);
for (int i=0; i < length; i++)
@@ -1102,7 +1063,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -1118,7 +1078,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Element(type=");
buffer.append(byteToHex(type));
buffer.append(", length=");
@@ -1139,7 +1098,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
index e9137b0..653270a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
@@ -118,7 +118,6 @@
*/
public int intValue()
{
-
return intValue;
}
@@ -131,7 +130,6 @@
*/
public void setValue(int intValue)
{
-
this.intValue = intValue;
setValueInternal(encodeValue(intValue));
}
@@ -149,7 +147,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_ENUMERATED_SET_VALUE_NULL;
@@ -188,7 +185,6 @@
public static ASN1Enumerated decodeAsEnumerated(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_ENUMERATED_DECODE_ELEMENT_NULL;
@@ -229,7 +225,6 @@
public static ASN1Enumerated decodeAsEnumerated(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 enumerated element.
if (encodedElement == null)
@@ -320,7 +315,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Enumerated(type=");
buffer.append(byteToHex(getType()));
buffer.append(", value=");
@@ -341,7 +335,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
index 2792302..53a9f38 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
@@ -99,7 +99,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
index 4c06dfa..61a8746 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
@@ -118,7 +118,6 @@
*/
public int intValue()
{
-
return intValue;
}
@@ -131,7 +130,6 @@
*/
public void setValue(int intValue)
{
-
this.intValue = intValue;
setValueInternal(encodeValue(intValue));
}
@@ -149,7 +147,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_INTEGER_SET_VALUE_NULL;
@@ -188,7 +185,6 @@
public static ASN1Integer decodeAsInteger(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_INTEGER_DECODE_ELEMENT_NULL;
@@ -229,7 +225,6 @@
public static ASN1Integer decodeAsInteger(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 integer element.
if (encodedElement == null)
@@ -320,7 +315,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Integer(type=");
buffer.append(byteToHex(getType()));
buffer.append(", value=");
@@ -341,7 +335,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
index 0dd09f9..fbabff7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
@@ -131,7 +131,6 @@
*/
public long longValue()
{
-
return longValue;
}
@@ -144,7 +143,6 @@
*/
public void setValue(long longValue)
{
-
this.longValue = longValue;
setValueInternal(encodeLongValue(longValue));
}
@@ -162,7 +160,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_INTEGER_SET_VALUE_NULL;
@@ -201,7 +198,6 @@
public static ASN1Long decodeAsLong(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_INTEGER_DECODE_ELEMENT_NULL;
@@ -241,7 +237,6 @@
public static ASN1Long decodeAsLong(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 long element.
if (encodedElement == null)
@@ -332,7 +327,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Long(type=");
buffer.append(byteToHex(getType()));
buffer.append(", value=");
@@ -353,7 +347,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
index fe9f005..6a695b4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
@@ -90,7 +90,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if ((value != null) && (value.length != 0))
{
int msgID = MSGID_ASN1_NULL_SET_VALUE_INVALID_LENGTH;
@@ -114,7 +113,6 @@
public static ASN1Null decodeAsNull(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_NULL_DECODE_ELEMENT_NULL;
@@ -148,7 +146,6 @@
public static ASN1Null decodeAsNull(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 null element.
if (encodedElement == null)
@@ -230,7 +227,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Null(type=");
buffer.append(byteToHex(getType()));
buffer.append(")");
@@ -249,7 +245,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
index 35af76e..0154b4a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
@@ -181,7 +181,6 @@
*/
public String stringValue()
{
-
if (stringValue == null)
{
/*
@@ -229,7 +228,6 @@
*/
public void stringValue(StringBuilder buffer)
{
-
if (stringValue != null)
{
buffer.append(stringValue);
@@ -277,7 +275,6 @@
*/
public void setValue(String stringValue)
{
-
if (stringValue == null)
{
this.stringValue = null;
@@ -299,7 +296,6 @@
*/
public void setValue(byte[] value)
{
-
if (value == null)
{
setValueInternal(NO_VALUE);
@@ -327,7 +323,6 @@
public static ASN1OctetString decodeAsOctetString(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_OCTET_STRING_DECODE_ELEMENT_NULL;
@@ -354,7 +349,6 @@
public static ASN1OctetString decodeAsOctetString(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 element.
if (encodedElement == null)
@@ -428,7 +422,6 @@
*/
public ASN1OctetString duplicate()
{
-
byte[] value = value();
int length = value.length;
@@ -448,7 +441,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(stringValue());
}
@@ -465,7 +457,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
@@ -500,7 +491,6 @@
*/
public ASN1OctetString toASN1OctetString()
{
-
return this;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
index 97ec560..e86db95 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
@@ -72,7 +72,6 @@
public ASN1Reader(Socket socket)
throws IOException
{
-
this.socket = socket;
inputStream = socket.getInputStream();
@@ -90,7 +89,6 @@
*/
public ASN1Reader(InputStream inputStream)
{
-
this.inputStream = inputStream;
socket = null;
maxElementSize = -1;
@@ -107,7 +105,6 @@
*/
public int getMaxElementSize()
{
-
return maxElementSize;
}
@@ -122,7 +119,6 @@
*/
public void setMaxElementSize(int maxElementSize)
{
-
this.maxElementSize = maxElementSize;
}
@@ -144,7 +140,6 @@
public int getIOTimeout()
throws IOException
{
-
if (socket == null)
{
return -1;
@@ -173,7 +168,6 @@
public void setIOTimeout(int ioTimeout)
throws IOException
{
-
if (socket == null)
{
return;
@@ -288,7 +282,6 @@
*/
public void close()
{
-
try
{
inputStream.close();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
index 13cfad7..abe1332 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
@@ -173,7 +173,6 @@
*/
public ArrayList<ASN1Element> elements()
{
-
return elements;
}
@@ -186,7 +185,6 @@
*/
public void setElements(ArrayList<ASN1Element> elements)
{
-
if (elements == null)
{
this.elements.clear();
@@ -212,7 +210,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_SEQUENCE_SET_VALUE_NULL;
@@ -239,7 +236,6 @@
public static ASN1Sequence decodeAsSequence(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_SEQUENCE_DECODE_ELEMENT_NULL;
@@ -268,7 +264,6 @@
public static ASN1Sequence decodeAsSequence(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 sequence element.
if (encodedElement == null)
@@ -352,7 +347,6 @@
public static ASN1Sequence decodeAsSequence(byte type, byte[] encodedValue)
throws ASN1Exception
{
-
ArrayList<ASN1Element> elements = decodeElements(encodedValue);
return new ASN1Sequence(type, encodedValue, elements);
}
@@ -367,7 +361,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Sequence(type=");
buffer.append(byteToHex(getType()));
buffer.append(", values={ ");
@@ -401,7 +394,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
index ec451dd..6b1d80a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
@@ -173,7 +173,6 @@
*/
public ArrayList<ASN1Element> elements()
{
-
return elements;
}
@@ -186,7 +185,6 @@
*/
public void setElements(ArrayList<ASN1Element> elements)
{
-
if (elements == null)
{
this.elements.clear();
@@ -212,7 +210,6 @@
public void setValue(byte[] value)
throws ASN1Exception
{
-
if (value == null)
{
int msgID = MSGID_ASN1_SET_SET_VALUE_NULL;
@@ -239,7 +236,6 @@
public static ASN1Set decodeAsSet(ASN1Element element)
throws ASN1Exception
{
-
if (element == null)
{
int msgID = MSGID_ASN1_SET_DECODE_ELEMENT_NULL;
@@ -267,7 +263,6 @@
public static ASN1Set decodeAsSet(byte[] encodedElement)
throws ASN1Exception
{
-
// First make sure that the array is not null and long enough to contain
// a valid ASN.1 set element.
if (encodedElement == null)
@@ -344,7 +339,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ASN1Set(type=");
buffer.append(byteToHex(getType()));
buffer.append(", values={ ");
@@ -378,7 +372,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
index efe9576..038b235 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
@@ -66,7 +66,6 @@
public ASN1Writer(Socket socket)
throws IOException
{
-
this.socket = socket;
outputStream = socket.getOutputStream();
}
@@ -81,7 +80,6 @@
*/
public ASN1Writer(OutputStream outputStream)
{
-
this.outputStream = outputStream;
socket = null;
}
@@ -102,7 +100,6 @@
public int writeElement(ASN1Element element)
throws IOException
{
-
byte[] elementBytes = element.encode();
outputStream.write(elementBytes);
outputStream.flush();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index bae36ca..b1f5ecb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -289,7 +289,6 @@
*/
public static InternalClientConnection getRootConnection()
{
-
return rootConnection;
}
@@ -304,7 +303,6 @@
*/
public static long nextOperationID()
{
-
long opID = nextOperationID.getAndIncrement();
if (opID < 0)
{
@@ -336,7 +334,6 @@
*/
public static int nextMessageID()
{
-
int msgID = nextMessageID.getAndIncrement();
if (msgID < 0)
{
@@ -368,7 +365,6 @@
*/
public long getConnectionID()
{
-
return connectionID;
}
@@ -383,7 +379,6 @@
*/
public ConnectionHandler getConnectionHandler()
{
-
return InternalConnectionHandler.getInstance();
}
@@ -398,7 +393,6 @@
*/
public String getProtocol()
{
-
return "internal";
}
@@ -411,7 +405,6 @@
*/
public String getClientAddress()
{
-
return "internal";
}
@@ -426,7 +419,6 @@
*/
public String getServerAddress()
{
-
return "internal";
}
@@ -443,7 +435,6 @@
*/
public InetAddress getRemoteAddress()
{
-
return null;
}
@@ -460,7 +451,6 @@
*/
public InetAddress getLocalAddress()
{
-
return null;
}
@@ -480,7 +470,6 @@
*/
public boolean isSecure()
{
-
// Internal connections will generally be considered secure, but
// they may be declared insecure if they are accessed through some
// external mechanism (e.g., a DSML handler that runs the server
@@ -500,7 +489,6 @@
*/
public ConnectionSecurityProvider getConnectionSecurityProvider()
{
-
return securityProvider;
}
@@ -517,7 +505,6 @@
public void setConnectionSecurityProvider(ConnectionSecurityProvider
securityProvider)
{
-
this.securityProvider = securityProvider;
}
@@ -533,7 +520,6 @@
*/
public String getSecurityMechanism()
{
-
return securityProvider.getSecurityMechanismName();
}
@@ -560,7 +546,6 @@
*/
public boolean processDataRead(ByteBuffer buffer)
{
-
// This method will not do anything with the data because there is
// no actual "connection" from which information can be read, nor
// any protocol to use to read it.
@@ -577,7 +562,6 @@
*/
public void sendResponse(Operation operation)
{
-
// There will not be any response sent by this method, since there
// is not an actual connection.
}
@@ -593,7 +577,6 @@
*/
public AuthenticationInfo getAuthenticationInfo()
{
-
return authenticationInfo;
}
@@ -612,7 +595,6 @@
public void setAuthenticationInfo(AuthenticationInfo
authenticationInfo)
{
-
// No implementation required.
}
@@ -625,7 +607,6 @@
*/
public void setUnauthenticated()
{
-
// No implementation required.
}
@@ -645,7 +626,6 @@
public AddOperation processAdd(ByteString rawEntryDN,
List<LDAPAttribute> rawAttributes)
{
-
AddOperation addOperation =
new AddOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN,
@@ -681,7 +661,6 @@
Map<AttributeType,List<Attribute>>
operationalAttributes)
{
-
AddOperation addOperation =
new AddOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), entryDN,
@@ -710,7 +689,6 @@
public BindOperation processSimpleBind(ByteString rawBindDN,
ByteString password)
{
-
BindOperation bindOperation =
new BindOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawBindDN,
@@ -738,7 +716,6 @@
public BindOperation processSimpleBind(DN bindDN,
ByteString password)
{
-
BindOperation bindOperation =
new BindOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), bindDN,
@@ -768,7 +745,6 @@
String saslMechanism,
ASN1OctetString saslCredentials)
{
-
BindOperation bindOperation =
new BindOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawBindDN,
@@ -798,7 +774,6 @@
String saslMechanism,
ASN1OctetString saslCredentials)
{
-
BindOperation bindOperation =
new BindOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), bindDN,
@@ -829,7 +804,6 @@
String attributeType,
ByteString assertionValue)
{
-
CompareOperation compareOperation =
new CompareOperation(this, nextOperationID(),
nextMessageID(),
@@ -861,7 +835,6 @@
AttributeType attributeType,
ByteString assertionValue)
{
-
CompareOperation compareOperation =
new CompareOperation(this, nextOperationID(),
nextMessageID(),
@@ -887,7 +860,6 @@
*/
public DeleteOperation processDelete(ByteString rawEntryDN)
{
-
DeleteOperation deleteOperation =
new DeleteOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN);
@@ -911,7 +883,6 @@
*/
public DeleteOperation processDelete(DN entryDN)
{
-
DeleteOperation deleteOperation =
new DeleteOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), entryDN);
@@ -939,7 +910,6 @@
public ExtendedOperation processExtendedOperation(String requestOID,
ASN1OctetString requestValue)
{
-
ExtendedOperation extendedOperation =
new ExtendedOperation(this, nextOperationID(),
nextMessageID(),
@@ -969,7 +939,6 @@
public ModifyOperation processModify(ByteString rawEntryDN,
List<LDAPModification> rawModifications)
{
-
ModifyOperation modifyOperation =
new ModifyOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN,
@@ -997,7 +966,6 @@
public ModifyOperation processModify(DN entryDN,
List<Modification> modifications)
{
-
ModifyOperation modifyOperation =
new ModifyOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), entryDN,
@@ -1027,7 +995,6 @@
ByteString rawNewRDN,
boolean deleteOldRDN)
{
-
return processModifyDN(rawEntryDN, rawNewRDN, deleteOldRDN, null);
}
@@ -1054,7 +1021,6 @@
boolean deleteOldRDN,
ByteString rawNewSuperior)
{
-
ModifyDNOperation modifyDNOperation =
new ModifyDNOperation(this, nextOperationID(),
nextMessageID(),
@@ -1085,7 +1051,6 @@
public ModifyDNOperation processModifyDN(DN entryDN, RDN newRDN,
boolean deleteOldRDN)
{
-
return processModifyDN(entryDN, newRDN, deleteOldRDN, null);
}
@@ -1111,7 +1076,6 @@
boolean deleteOldRDN,
DN newSuperior)
{
-
ModifyDNOperation modifyDNOperation =
new ModifyDNOperation(this, nextOperationID(),
nextMessageID(),
@@ -1144,7 +1108,6 @@
SearchScope scope,
LDAPFilter filter)
{
-
return processSearch(rawBaseDN, scope,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
false, filter, new LinkedHashSet<String>(0));
@@ -1180,7 +1143,6 @@
boolean typesOnly, LDAPFilter filter,
LinkedHashSet<String> attributes)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(),
nextMessageID(),
@@ -1227,7 +1189,6 @@
LinkedHashSet<String> attributes,
InternalSearchListener searchListener)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(),
nextMessageID(),
@@ -1262,7 +1223,6 @@
SearchScope scope,
SearchFilter filter)
{
-
return processSearch(baseDN, scope,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
false, filter, new LinkedHashSet<String>(0));
@@ -1297,7 +1257,6 @@
boolean typesOnly, SearchFilter filter,
LinkedHashSet<String> attributes)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(),
nextMessageID(),
@@ -1343,7 +1302,6 @@
LinkedHashSet<String> attributes,
InternalSearchListener searchListener)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(),
nextMessageID(),
@@ -1370,7 +1328,6 @@
public void sendSearchEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
((InternalSearchOperation) searchOperation).
addSearchEntry(searchEntry);
}
@@ -1393,8 +1350,6 @@
public boolean sendSearchReference(SearchOperation searchOperation,
SearchResultReference searchReference)
{
-
-
((InternalSearchOperation)
searchOperation).addSearchReference(searchReference);
return true;
@@ -1415,8 +1370,6 @@
protected boolean sendIntermediateResponseMessage(
IntermediateResponse intermediateResponse)
{
-
-
// FIXME -- Do we need to support internal intermediate responses?
// If so, then implement this.
return false;
@@ -1448,7 +1401,6 @@
boolean sendNotification, String message,
int messageID)
{
-
// No implementation is required since there is nothing to
// disconnect. Further, since there is no real disconnect, we can
// wait to have the garbage collector call
@@ -1468,7 +1420,6 @@
*/
public boolean bindInProgress()
{
-
// For internal operations, we don't care if there are any binds
// in progress.
return false;
@@ -1486,7 +1437,6 @@
*/
public void setBindInProgress(boolean bindInProgress)
{
-
// No implementation is required.
}
@@ -1501,7 +1451,6 @@
*/
public Collection<Operation> getOperationsInProgress()
{
-
return operationList;
}
@@ -1519,7 +1468,6 @@
*/
public Operation getOperationInProgress(int messageID)
{
-
// Internal operations will not be tracked.
return null;
}
@@ -1541,7 +1489,6 @@
*/
public boolean removeOperationInProgress(int messageID)
{
-
// No implementation is required, since internal operations will
// not be tracked.
return false;
@@ -1562,7 +1509,6 @@
public CancelResult cancelOperation(int messageID,
CancelRequest cancelRequest)
{
-
// Internal operations cannot be cancelled.
return CancelResult.CANNOT_CANCEL;
}
@@ -1577,7 +1523,6 @@
*/
public void cancelAllOperations(CancelRequest cancelRequest)
{
-
// No implementation is required since internal operations cannot
// be cancelled.
}
@@ -1596,7 +1541,6 @@
public void cancelAllOperationsExcept(CancelRequest cancelRequest,
int messageID)
{
-
// No implementation is required since internal operations cannot
// be cancelled.
}
@@ -1608,7 +1552,6 @@
*/
public String getMonitorSummary()
{
-
StringBuilder buffer = new StringBuilder();
buffer.append("connID=\"");
buffer.append(connectionID);
@@ -1630,7 +1573,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("InternalClientConnection(connID=");
buffer.append(connectionID);
buffer.append(", authDN=\"");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
index 7bc4c0e..03b89a1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
@@ -95,7 +95,6 @@
*/
public static InternalConnectionHandler getInstance()
{
-
return handlerInstance;
}
@@ -143,7 +142,6 @@
public void finalizeConnectionHandler(String finalizeReason,
boolean closeConnections)
{
-
// No implementation is required.
}
@@ -154,7 +152,6 @@
*/
public String getConnectionHandlerName()
{
-
return "Internal Connection Handler";
}
@@ -165,7 +162,6 @@
*/
public String getProtocol()
{
-
return protocol;
}
@@ -176,7 +172,6 @@
*/
public Collection<HostPort> getListeners()
{
-
return listeners;
}
@@ -191,7 +186,6 @@
*/
public Collection<ClientConnection> getClientConnections()
{
-
return connectionList;
}
@@ -203,7 +197,6 @@
*/
public void run()
{
-
// No implementation is required since this connection handler
// won't actually accept connections.
return;
@@ -218,7 +211,6 @@
*/
public String toString()
{
-
return "Internal Connection Handler";
}
@@ -233,7 +225,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("Internal Connection Handler");
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
index 04b5b79..31dd8d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
@@ -214,7 +214,6 @@
*/
public LinkedList<SearchResultEntry> getSearchEntries()
{
-
return entryList;
}
@@ -230,7 +229,6 @@
*/
public void addSearchEntry(SearchResultEntry searchEntry)
{
-
if (searchListener == null)
{
entryList.add(searchEntry);
@@ -253,7 +251,6 @@
*/
public LinkedList<SearchResultReference> getSearchReferences()
{
-
return referenceList;
}
@@ -270,7 +267,6 @@
public void addSearchReference(
SearchResultReference searchReference)
{
-
if (searchListener == null)
{
referenceList.add(searchReference);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
index 1358ae9..4e14e91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
@@ -194,7 +194,6 @@
*/
public Socket createSocket(String host, int port) throws IOException
{
-
//
// gets ssl socket factory
SSLSocketFactory sslSocketFactory = getSSLSocketFactory();
@@ -250,7 +249,6 @@
private synchronized String getRealServerHostname(String rmiHostname)
throws IOException
{
-
if (serverHostname == null)
{
//
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index 4d2a86d..a381cfb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -177,7 +177,6 @@
*/
private boolean checkParameters(DirectoryRMIServerSocketFactory that)
{
-
if (needClientCertificate != that.needClientCertificate)
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index c653629..4839813 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -161,7 +161,6 @@
*/
public void handleNotification(Notification notif, Object handback)
{
-
JMXConnectionNotification jcn ;
//
@@ -208,7 +207,6 @@
*/
public long nextOperationID()
{
-
long opID = nextOperationID.getAndIncrement();
if (opID < 0)
{
@@ -240,7 +238,6 @@
*/
public int nextMessageID()
{
-
int msgID = nextMessageID.getAndIncrement();
if (msgID < 0)
{
@@ -270,7 +267,6 @@
*/
public long getConnectionID()
{
-
return connectionID;
}
@@ -281,7 +277,6 @@
*/
public ConnectionHandler getConnectionHandler()
{
-
return jmxConnectionHandler;
}
@@ -294,7 +289,6 @@
*/
public String getProtocol()
{
-
return "jmx";
}
@@ -307,7 +301,6 @@
*/
public String getClientAddress()
{
-
return "jmx";
}
@@ -322,7 +315,6 @@
*/
public String getServerAddress()
{
-
return "jmx";
}
@@ -338,7 +330,6 @@
*/
public InetAddress getRemoteAddress()
{
-
return null;
}
@@ -355,7 +346,6 @@
*/
public InetAddress getLocalAddress()
{
-
return null;
}
@@ -374,7 +364,6 @@
*/
public boolean isSecure()
{
-
return securityProvider.isSecure();
}
@@ -387,7 +376,6 @@
*/
public ConnectionSecurityProvider getConnectionSecurityProvider()
{
-
return securityProvider;
}
@@ -402,7 +390,6 @@
public void setConnectionSecurityProvider(ConnectionSecurityProvider
securityProvider)
{
-
this.securityProvider = securityProvider;
}
@@ -418,7 +405,6 @@
*/
public String getSecurityMechanism()
{
-
return securityProvider.getSecurityMechanismName();
}
@@ -442,7 +428,6 @@
*/
public boolean processDataRead(ByteBuffer buffer)
{
-
// This method will not do anything with the data because there is no
// actual "connection" from which information can be read, nor any protocol
// to use to read it.
@@ -459,7 +444,6 @@
*/
public void sendResponse(Operation operation)
{
-
// There will not be any response sent by this method, since there is not an
// actual connection.
}
@@ -479,7 +463,6 @@
public AddOperation processAdd(ASN1OctetString rawEntryDN,
ArrayList<LDAPAttribute> rawAttributes)
{
-
AddOperation addOperation =
new AddOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN, rawAttributes);
@@ -504,7 +487,6 @@
String attributeType,
ASN1OctetString assertionValue)
{
-
CompareOperation compareOperation =
new CompareOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN,
@@ -526,7 +508,6 @@
*/
public DeleteOperation processDelete(ASN1OctetString rawEntryDN)
{
-
DeleteOperation deleteOperation =
new DeleteOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN);
@@ -550,7 +531,6 @@
public ExtendedOperation processExtendedOperation(String requestOID,
ASN1OctetString requestValue)
{
-
ExtendedOperation extendedOperation =
new ExtendedOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), requestOID,
@@ -575,7 +555,6 @@
public ModifyOperation processModify(ASN1OctetString rawEntryDN,
ArrayList<LDAPModification> rawModifications)
{
-
ModifyOperation modifyOperation =
new ModifyOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN,
@@ -602,7 +581,6 @@
ASN1OctetString rawNewRDN,
boolean deleteOldRDN)
{
-
return processModifyDN(rawEntryDN, rawNewRDN, deleteOldRDN, null);
}
@@ -627,7 +605,6 @@
boolean deleteOldRDN,
ASN1OctetString rawNewSuperior)
{
-
ModifyDNOperation modifyDNOperation =
new ModifyDNOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawEntryDN, rawNewRDN,
@@ -655,7 +632,6 @@
public InternalSearchOperation processSearch(ASN1OctetString rawBaseDN,
SearchScope scope, LDAPFilter filter)
{
-
return processSearch(rawBaseDN, scope,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
filter, new LinkedHashSet<String>(0));
@@ -686,7 +662,6 @@
boolean typesOnly, LDAPFilter filter,
LinkedHashSet<String> attributes)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawBaseDN,
@@ -724,7 +699,6 @@
LinkedHashSet<String> attributes,
InternalSearchListener searchListener)
{
-
InternalSearchOperation searchOperation =
new InternalSearchOperation(this, nextOperationID(), nextMessageID(),
new ArrayList<Control>(0), rawBaseDN,
@@ -750,7 +724,6 @@
public void sendSearchEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
((InternalSearchOperation) searchOperation).addSearchEntry(searchEntry);
}
@@ -772,8 +745,6 @@
public boolean sendSearchReference(SearchOperation searchOperation,
SearchResultReference searchReference)
{
-
-
((InternalSearchOperation)
searchOperation).addSearchReference(searchReference);
return true;
@@ -793,8 +764,6 @@
protected boolean sendIntermediateResponseMessage(
IntermediateResponse intermediateResponse)
{
-
-
// FIXME -- Do we need to support Jmx intermediate responses? If so,
// then implement this.
return false;
@@ -824,7 +793,6 @@
boolean sendNotification, String message,
int messageID)
{
-
// we are already performing a disconnect
if (disconnectStarted)
{
@@ -880,7 +848,6 @@
*/
public boolean bindInProgress()
{
-
// For Jmx operations, we don't care if there are any binds in
// progress.
return false;
@@ -898,7 +865,6 @@
*/
public void setBindInProgress(boolean bindInProgress)
{
-
// No implementation is required.
}
@@ -912,7 +878,6 @@
*/
public Collection<Operation> getOperationsInProgress()
{
-
return operationList;
}
@@ -928,7 +893,6 @@
*/
public Operation getOperationInProgress(int messageID)
{
-
// Jmx operations will not be tracked.
return null;
}
@@ -948,7 +912,6 @@
*/
public boolean removeOperationInProgress(int messageID)
{
-
// No implementation is required, since Jmx operations will not be
// tracked.
return false;
@@ -969,7 +932,6 @@
public CancelResult cancelOperation(int messageID,
CancelRequest cancelRequest)
{
-
// Jmx operations cannot be cancelled.
return CancelResult.CANNOT_CANCEL;
}
@@ -984,7 +946,6 @@
*/
public void cancelAllOperations(CancelRequest cancelRequest)
{
-
// No implementation is required since Jmx operations cannot be
// cancelled.
}
@@ -1003,7 +964,6 @@
public void cancelAllOperationsExcept(CancelRequest cancelRequest,
int messageID)
{
-
// No implementation is required since Jmx operations cannot be
// cancelled.
}
@@ -1015,7 +975,6 @@
*/
public String getMonitorSummary()
{
-
StringBuilder buffer = new StringBuilder();
buffer.append("connID=\"");
buffer.append(connectionID);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 979bc5d..6f33c6c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -222,7 +222,6 @@
public void initializeConnectionHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
//
// If the initializeConnectionHandler method is called,
// it means that the "enabled" attribure was true.
@@ -321,7 +320,6 @@
public void finalizeConnectionHandler(
String finalizeReason, boolean closeConnections)
{
-
// We should also close the RMI registry.
rmiConnector.finalizeConnectionHandler(closeConnections, true);
}
@@ -331,7 +329,6 @@
*/
public String getConnectionHandlerName()
{
-
return connectionHandlerName;
}
@@ -340,7 +337,6 @@
*/
public String getProtocol()
{
-
return protocol;
}
@@ -349,7 +345,6 @@
*/
public Collection<HostPort> getListeners()
{
-
return listeners;
}
@@ -380,7 +375,6 @@
*/
public String getShutdownListenerName()
{
-
return handlerName;
}
@@ -408,7 +402,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -421,7 +414,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
return configAttrs;
}
@@ -445,7 +437,6 @@
public boolean hasAcceptableConfiguration(
ConfigEntry configEntry, List<String> unacceptableReasons)
{
-
boolean configValid = true;
//
@@ -562,7 +553,6 @@
public ConfigChangeResult applyNewConfiguration(
ConfigEntry configEntry, boolean detailedResults)
{
-
//
// Create variables to include in the response.
ResultCode resultCode = ResultCode.SUCCESS;
@@ -822,7 +812,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(handlerName);
}
@@ -835,7 +824,6 @@
*/
public DN getComponentEntryDN()
{
-
return configEntryDN;
}
@@ -848,7 +836,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -864,7 +851,6 @@
*/
public LinkedHashMap<String, String> getAlerts()
{
-
LinkedHashMap<String, String> alerts = new LinkedHashMap<String, String>();
return alerts;
@@ -887,7 +873,6 @@
private BooleanConfigAttribute getEnabledAtt(ConfigEntry configEntry)
throws InitializationException, ConfigException
{
-
int msgID = MSGID_CONFIG_CONNHANDLER_ATTR_DESCRIPTION_ENABLED;
BooleanConfigAttribute enabledStub =
new BooleanConfigAttribute(ATTR_CONNECTION_HANDLER_ENABLED,
@@ -951,7 +936,6 @@
private IntegerConfigAttribute getListenPort(ConfigEntry configEntry)
throws InitializationException, ConfigException
{
-
int msgID = MSGID_JMX_CONNHANDLER_DESCRIPTION_LISTEN_PORT;
IntegerConfigAttribute portStub = new IntegerConfigAttribute(
ATTR_LISTEN_PORT, getMessage(msgID), true, false, false, true, 1,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
index 1a2cbc1..fb21d3a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -87,7 +87,6 @@
*/
public RmiAuthenticator(JmxConnectionHandler jmxConnectionHandler)
{
-
this.jmxConnectionHandler = jmxConnectionHandler;
}
@@ -115,7 +114,6 @@
*/
public Subject authenticate(Object credentials)
{
-
//
// If we are in the finalized phase, we should not accept
// new connection
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
index 3349e07..eb2ce98 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -283,7 +283,6 @@
*/
private void startConnectorNoClientCertificate() throws Exception
{
-
try
{
//
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
index 231083d..949ab11 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
@@ -65,7 +65,6 @@
*/
public AbandonRequestProtocolOp(int idToAbandon)
{
-
this.idToAbandon = idToAbandon;
}
@@ -78,7 +77,6 @@
*/
public int getIDToAbandon()
{
-
return idToAbandon;
}
@@ -91,7 +89,6 @@
*/
public void setIDToAbandon(int idToAbandon)
{
-
this.idToAbandon = idToAbandon;
}
@@ -104,7 +101,6 @@
*/
public byte getType()
{
-
return OP_TYPE_ABANDON_REQUEST;
}
@@ -117,7 +113,6 @@
*/
public String getProtocolOpName()
{
-
return "Abandon Request";
}
@@ -131,7 +126,6 @@
*/
public ASN1Element encode()
{
-
return new ASN1Integer(OP_TYPE_ABANDON_REQUEST, idToAbandon);
}
@@ -151,7 +145,6 @@
element)
throws LDAPException
{
-
int idToAbandon;
try
{
@@ -182,7 +175,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AbandonRequest(idToAbandon=");
buffer.append(idToAbandon);
buffer.append(")");
@@ -200,7 +192,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
index d0201c2..7b8fa6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
@@ -74,7 +74,6 @@
*/
public AddRequestProtocolOp(ASN1OctetString dn)
{
-
this.dn = dn;
this.attributes = new ArrayList<LDAPAttribute>();
}
@@ -91,7 +90,6 @@
public AddRequestProtocolOp(ASN1OctetString dn,
ArrayList<LDAPAttribute> attributes)
{
-
this.dn = dn;
if (attributes == null)
@@ -113,7 +111,6 @@
*/
public ASN1OctetString getDN()
{
-
return dn;
}
@@ -126,7 +123,6 @@
*/
public void setDN(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -140,7 +136,6 @@
*/
public List<LDAPAttribute> getAttributes()
{
-
return attributes;
}
@@ -153,7 +148,6 @@
*/
public byte getType()
{
-
return OP_TYPE_ADD_REQUEST;
}
@@ -166,7 +160,6 @@
*/
public String getProtocolOpName()
{
-
return "Add Request";
}
@@ -180,7 +173,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(dn);
@@ -212,7 +204,6 @@
public static AddRequestProtocolOp decodeAddRequest(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -296,7 +287,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AddRequest(dn=");
dn.toString(buffer);
buffer.append(", attrs={");
@@ -328,7 +318,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
@@ -363,8 +352,6 @@
*/
public void toLDIF(StringBuilder buffer, int wrapColumn)
{
-
-
// Add the DN to the buffer.
String dnString;
int colsRemaining;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
index f70cead..8c47178 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
@@ -81,7 +81,6 @@
*/
public AddResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public AddResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public AddResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_ADD_RESPONSE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Add Response";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -317,7 +303,6 @@
public static AddResponseProtocolOp decodeAddResponse(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -457,7 +442,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AddResponse(resultCode=");
buffer.append(resultCode);
@@ -504,7 +488,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
index d0397ae..25077fe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
@@ -88,7 +88,6 @@
public BindRequestProtocolOp(ASN1OctetString dn, int protocolVersion,
ASN1OctetString simplePassword)
{
-
this.dn = dn;
this.protocolVersion = protocolVersion;
this.simplePassword = simplePassword;
@@ -111,7 +110,6 @@
public BindRequestProtocolOp(ASN1OctetString dn, String saslMechanism,
ASN1OctetString saslCredentials)
{
-
this.dn = dn;
this.saslMechanism = saslMechanism;
this.saslCredentials = saslCredentials;
@@ -140,7 +138,6 @@
String saslMechanism,
ASN1OctetString saslCredentials)
{
-
this.dn = dn;
this.protocolVersion = protocolVersion;
this.authenticationType = authenticationType;
@@ -158,7 +155,6 @@
*/
public ASN1OctetString getDN()
{
-
return dn;
}
@@ -171,7 +167,6 @@
*/
public void setDN(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -184,7 +179,6 @@
*/
public int getProtocolVersion()
{
-
return protocolVersion;
}
@@ -197,7 +191,6 @@
*/
public void setProtocolVersion(int protocolVersion)
{
-
this.protocolVersion = protocolVersion;
}
@@ -210,7 +203,6 @@
*/
public AuthenticationType getAuthenticationType()
{
-
return authenticationType;
}
@@ -223,7 +215,6 @@
*/
public void setAuthenticationType(AuthenticationType authenticationType)
{
-
this.authenticationType = authenticationType;
}
@@ -237,7 +228,6 @@
*/
public ASN1OctetString getSimplePassword()
{
-
return simplePassword;
}
@@ -252,7 +242,6 @@
*/
public void setSimplePassword(ASN1OctetString simplePassword)
{
-
this.simplePassword = simplePassword;
authenticationType = AuthenticationType.SIMPLE;
saslMechanism = null;
@@ -269,7 +258,6 @@
*/
public String getSASLMechanism()
{
-
return saslMechanism;
}
@@ -283,7 +271,6 @@
*/
public ASN1OctetString getSASLCredentials()
{
-
return saslCredentials;
}
@@ -299,7 +286,6 @@
public void setSASLAuthenticationInfo(String saslMechanism,
ASN1OctetString saslCredentials)
{
-
this.saslMechanism = saslMechanism;
this.saslCredentials = saslCredentials;
authenticationType = AuthenticationType.SASL;
@@ -316,7 +302,6 @@
*/
public byte getType()
{
-
return OP_TYPE_BIND_REQUEST;
}
@@ -329,7 +314,6 @@
*/
public String getProtocolOpName()
{
-
return "Bind Request";
}
@@ -343,7 +327,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(3);
elements.add(new ASN1Integer(protocolVersion));
@@ -384,7 +367,6 @@
public static BindRequestProtocolOp decodeBindRequest(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -530,7 +512,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("BindRequest(version=");
buffer.append(protocolVersion);
buffer.append(", dn=");
@@ -572,7 +553,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index c69f1d1..a49e6a7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -84,7 +84,6 @@
*/
public BindResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -104,7 +103,6 @@
*/
public BindResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -126,7 +124,6 @@
public BindResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -151,7 +148,6 @@
DN matchedDN, List<String> referralURLs,
ASN1OctetString serverSASLCredentials)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -168,7 +164,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -181,7 +176,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -195,7 +189,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -208,7 +201,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -222,7 +214,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -235,7 +226,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -249,7 +239,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -262,7 +251,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -276,7 +264,6 @@
*/
public ASN1OctetString getServerSASLCredentials()
{
-
return serverSASLCredentials;
}
@@ -290,7 +277,6 @@
*/
public void setServerSASLCredentials(ASN1OctetString serverSASLCredentials)
{
-
this.serverSASLCredentials = serverSASLCredentials;
}
@@ -303,7 +289,6 @@
*/
public byte getType()
{
-
return OP_TYPE_BIND_RESPONSE;
}
@@ -316,7 +301,6 @@
*/
public String getProtocolOpName()
{
-
return "Bind Response";
}
@@ -330,7 +314,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(5);
elements.add(new ASN1Enumerated(resultCode));
@@ -382,7 +365,6 @@
public static BindResponseProtocolOp decodeBindResponse(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -599,7 +581,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("BindResponse(resultCode=");
buffer.append(resultCode);
@@ -652,7 +633,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index ed0628d..ba6e30b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -76,7 +76,6 @@
public CompareRequestProtocolOp(ASN1OctetString dn, String attributeType,
ASN1OctetString assertionValue)
{
-
this.dn = dn;
this.attributeType = attributeType;
this.assertionValue = assertionValue;
@@ -91,7 +90,6 @@
*/
public ASN1OctetString getDN()
{
-
return dn;
}
@@ -104,7 +102,6 @@
*/
public void setDN(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -117,7 +114,6 @@
*/
public String getAttributeType()
{
-
return attributeType;
}
@@ -130,7 +126,6 @@
*/
public void setAttributeType(String attributeType)
{
-
this.attributeType = attributeType;
}
@@ -143,7 +138,6 @@
*/
public ASN1OctetString getAssertionValue()
{
-
return assertionValue;
}
@@ -156,7 +150,6 @@
*/
public void setAssertionValue(ASN1OctetString assertionValue)
{
-
this.assertionValue = assertionValue;
}
@@ -169,7 +162,6 @@
*/
public byte getType()
{
-
return OP_TYPE_COMPARE_REQUEST;
}
@@ -182,7 +174,6 @@
*/
public String getProtocolOpName()
{
-
return "Compare Request";
}
@@ -196,7 +187,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(dn);
@@ -224,7 +214,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -346,7 +335,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("CompareRequest(dn=");
dn.toString(buffer);
buffer.append(", attribute=");
@@ -368,7 +356,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
index f1cc462..e70b043 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
@@ -81,7 +81,6 @@
*/
public CompareResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public CompareResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public CompareResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_COMPARE_RESPONSE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Compare Response";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -318,7 +304,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -458,7 +443,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("CompareResponse(resultCode=");
buffer.append(resultCode);
@@ -505,7 +489,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 8e9bac4..0c8204c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -63,7 +63,6 @@
*/
public DeleteRequestProtocolOp(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -76,7 +75,6 @@
*/
public ASN1OctetString getDN()
{
-
return dn;
}
@@ -89,7 +87,6 @@
*/
public void setDN(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -102,7 +99,6 @@
*/
public byte getType()
{
-
return OP_TYPE_DELETE_REQUEST;
}
@@ -115,7 +111,6 @@
*/
public String getProtocolOpName()
{
-
return "Delete Request";
}
@@ -129,7 +124,6 @@
*/
public ASN1Element encode()
{
-
dn.setType(OP_TYPE_DELETE_REQUEST);
return dn;
}
@@ -149,7 +143,6 @@
public static DeleteRequestProtocolOp decodeDeleteRequest(ASN1Element element)
throws LDAPException
{
-
try
{
return new DeleteRequestProtocolOp(element.decodeAsOctetString());
@@ -177,7 +170,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("DeleteRequest(dn=");
dn.toString(buffer);
buffer.append(")");
@@ -195,7 +187,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
index 3db1f2d..a67857f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
@@ -81,7 +81,6 @@
*/
public DeleteResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public DeleteResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public DeleteResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_DELETE_RESPONSE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Delete Response";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -318,7 +304,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -458,7 +443,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("DeleteResponse(resultCode=");
buffer.append(resultCode);
@@ -505,7 +489,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index e325b79..70da1c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -71,7 +71,6 @@
*/
public ExtendedRequestProtocolOp(String oid)
{
-
this.oid = oid;
this.value = null;
}
@@ -87,7 +86,6 @@
*/
public ExtendedRequestProtocolOp(String oid, ASN1OctetString value)
{
-
this.oid = oid;
this.value = value;
}
@@ -101,7 +99,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -114,7 +111,6 @@
*/
public void setOID(String oid)
{
-
this.oid = oid;
}
@@ -128,7 +124,6 @@
*/
public ASN1OctetString getValue()
{
-
return value;
}
@@ -141,7 +136,6 @@
*/
public void setValue(ASN1OctetString value)
{
-
this.value = value;
}
@@ -154,7 +148,6 @@
*/
public byte getType()
{
-
return OP_TYPE_EXTENDED_REQUEST;
}
@@ -167,7 +160,6 @@
*/
public String getProtocolOpName()
{
-
return "Extended Request";
}
@@ -181,7 +173,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(new ASN1OctetString(TYPE_EXTENDED_REQUEST_OID, oid));
@@ -211,7 +202,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -295,7 +285,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ExtendedRequest(oid=");
buffer.append(oid);
@@ -320,7 +309,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
index 21cf233..18a23ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
@@ -87,7 +87,6 @@
*/
public ExtendedResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -108,7 +107,6 @@
*/
public ExtendedResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -131,7 +129,6 @@
public ExtendedResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -157,7 +154,6 @@
DN matchedDN, List<String> referralURLs,
String oid, ASN1OctetString value)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -175,7 +171,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -188,7 +183,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -202,7 +196,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -215,7 +208,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -229,7 +221,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -242,7 +233,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -256,7 +246,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -269,7 +258,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -283,7 +271,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -296,7 +283,6 @@
*/
public void setOID(String oid)
{
-
this.oid = oid;
}
@@ -310,7 +296,6 @@
*/
public ASN1OctetString getValue()
{
-
return value;
}
@@ -323,7 +308,6 @@
*/
public void setValue(ASN1OctetString value)
{
-
this.value = value;
}
@@ -336,7 +320,6 @@
*/
public byte getType()
{
-
return OP_TYPE_EXTENDED_RESPONSE;
}
@@ -349,7 +332,6 @@
*/
public String getProtocolOpName()
{
-
return "Extended Response";
}
@@ -363,7 +345,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(6);
elements.add(new ASN1Enumerated(resultCode));
@@ -421,7 +402,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -606,7 +586,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ExtendedResponse(resultCode=");
buffer.append(resultCode);
@@ -665,7 +644,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index 3ef414f..e16276b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -74,7 +74,6 @@
*/
public IntermediateResponseProtocolOp(String oid)
{
-
this.oid = oid;
this.value = null;
}
@@ -90,7 +89,6 @@
*/
public IntermediateResponseProtocolOp(String oid, ASN1OctetString value)
{
-
this.oid = oid;
this.value = value;
}
@@ -105,7 +103,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -118,7 +115,6 @@
*/
public void setOID(String oid)
{
-
this.oid = oid;
}
@@ -132,7 +128,6 @@
*/
public ASN1OctetString getValue()
{
-
return value;
}
@@ -145,7 +140,6 @@
*/
public void setValue(ASN1OctetString value)
{
-
this.value = value;
}
@@ -158,7 +152,6 @@
*/
public byte getType()
{
-
return OP_TYPE_INTERMEDIATE_RESPONSE;
}
@@ -171,7 +164,6 @@
*/
public String getProtocolOpName()
{
-
return "Intermediate Response";
}
@@ -185,7 +177,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
if (oid != null)
@@ -220,7 +211,6 @@
decodeIntermediateResponse(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -346,7 +336,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("IntermediateResponse(oid=");
buffer.append(String.valueOf(oid));
@@ -371,7 +360,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
index 9354dd2..5a7487e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
@@ -78,7 +78,6 @@
*/
public LDAPAttribute(String attributeType)
{
-
this.attributeType = attributeType;
values = new ArrayList<ASN1OctetString>(0);
@@ -94,7 +93,6 @@
*/
public LDAPAttribute(String attributeType, ArrayList<ASN1OctetString> values)
{
-
this.attributeType = attributeType;
if (values == null)
@@ -116,7 +114,6 @@
*/
public LDAPAttribute(Attribute attribute)
{
-
StringBuilder attrName = new StringBuilder(attribute.getName());
for (String o : attribute.getOptions())
{
@@ -149,7 +146,6 @@
*/
public String getAttributeType()
{
-
return attributeType;
}
@@ -162,7 +158,6 @@
*/
public void setAttributeType(String attributeType)
{
-
this.attributeType = attributeType;
}
@@ -176,7 +171,6 @@
*/
public ArrayList<ASN1OctetString> getValues()
{
-
return values;
}
@@ -189,7 +183,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(new ASN1OctetString(attributeType));
@@ -227,7 +220,6 @@
public static LDAPAttribute decode(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -314,7 +306,6 @@
public Attribute toAttribute()
throws LDAPException
{
-
String baseName;
String lowerBaseName;
int semicolonPos = attributeType.indexOf(';');
@@ -382,7 +373,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -397,7 +387,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPAttribute(type=");
buffer.append(attributeType);
buffer.append(", values={");
@@ -428,7 +417,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index d60b933..a19009b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -272,7 +272,6 @@
*/
public long getConnectionID()
{
-
return connectionID;
}
@@ -285,7 +284,6 @@
*/
public ConnectionHandler getConnectionHandler()
{
-
return connectionHandler;
}
@@ -300,7 +298,6 @@
*/
public LDAPRequestHandler getRequestHandler()
{
-
return requestHandler;
}
@@ -315,7 +312,6 @@
*/
public void setRequestHandler(LDAPRequestHandler requestHandler)
{
-
this.requestHandler = requestHandler;
}
@@ -330,7 +326,6 @@
*/
public SocketChannel getSocketChannel()
{
-
return clientChannel;
}
@@ -345,7 +340,6 @@
*/
public String getProtocol()
{
-
return protocol;
}
@@ -358,7 +352,6 @@
*/
public String getClientAddress()
{
-
return clientAddress;
}
@@ -371,7 +364,6 @@
*/
public int getClientPort()
{
-
return clientPort;
}
@@ -398,7 +390,6 @@
*/
public String getServerAddress()
{
-
return serverAddress;
}
@@ -411,7 +402,6 @@
*/
public int getServerPort()
{
-
return serverPort;
}
@@ -439,7 +429,6 @@
*/
public InetAddress getRemoteAddress()
{
-
return clientChannel.socket().getInetAddress();
}
@@ -456,7 +445,6 @@
*/
public InetAddress getLocalAddress()
{
-
return clientChannel.socket().getLocalAddress();
}
@@ -475,7 +463,6 @@
*/
public boolean isSecure()
{
-
return securityProvider.isSecure();
}
@@ -488,7 +475,6 @@
*/
public ConnectionSecurityProvider getConnectionSecurityProvider()
{
-
return securityProvider;
}
@@ -503,7 +489,6 @@
public void setConnectionSecurityProvider(ConnectionSecurityProvider
securityProvider)
{
-
this.securityProvider = securityProvider;
if (securityProvider.isSecure())
@@ -528,7 +513,6 @@
*/
public String getSecurityMechanism()
{
-
return securityProvider.getSecurityMechanismName();
}
@@ -541,7 +525,6 @@
*/
public long nextOperationID()
{
-
return nextOperationID.getAndIncrement();
}
@@ -555,7 +538,6 @@
*/
public void sendResponse(Operation operation)
{
-
LDAPMessage message = operationToResponseLDAPMessage(operation);
if (message != null)
{
@@ -577,7 +559,6 @@
*/
private LDAPMessage operationToResponseLDAPMessage(Operation operation)
{
-
ResultCode resultCode = operation.getResultCode();
if (resultCode == null)
{
@@ -734,7 +715,6 @@
public void sendSearchEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
-
SearchResultEntryProtocolOp protocolOp =
new SearchResultEntryProtocolOp(searchEntry);
@@ -776,8 +756,6 @@
public boolean sendSearchReference(SearchOperation searchOperation,
SearchResultReference searchReference)
{
-
-
// Make sure this is not an LDAPv2 client. If it is, then they can't see
// referrals so we'll not send anything. Also, throw an exception so that
// the core server will know not to try sending any more referrals to this
@@ -831,7 +809,6 @@
protected boolean sendIntermediateResponseMessage(
IntermediateResponse intermediateResponse)
{
-
IntermediateResponseProtocolOp protocolOp =
new IntermediateResponseProtocolOp(intermediateResponse.getOID(),
intermediateResponse.getValue());
@@ -869,7 +846,6 @@
private void sendLDAPMessage(ConnectionSecurityProvider secProvider,
LDAPMessage message)
{
-
ASN1Element messageElement = message.encode();
ByteBuffer messageBuffer = ByteBuffer.wrap(messageElement.encode());
@@ -958,8 +934,6 @@
boolean sendNotification, String message,
int messageID)
{
-
-
// If we are already in the middle of a disconnect, then don't do anything.
if (disconnectRequested)
{
@@ -1142,7 +1116,6 @@
*/
public Collection<Operation> getOperationsInProgress()
{
-
return operationsInProgress.values();
}
@@ -1158,7 +1131,6 @@
*/
public Operation getOperationInProgress(int messageID)
{
-
return operationsInProgress.get(messageID);
}
@@ -1178,7 +1150,6 @@
public void addOperationInProgress(Operation operation)
throws DirectoryException
{
-
int messageID = operation.getMessageID();
// We need to grab a lock to ensure that no one else can add operations to
@@ -1261,7 +1232,6 @@
*/
public boolean removeOperationInProgress(int messageID)
{
-
Operation operation = operationsInProgress.remove(messageID);
return (operation != null);
}
@@ -1281,7 +1251,6 @@
public CancelResult cancelOperation(int messageID,
CancelRequest cancelRequest)
{
-
Operation op = operationsInProgress.get(messageID);
if (op == null)
{
@@ -1326,8 +1295,6 @@
*/
public void cancelAllOperations(CancelRequest cancelRequest)
{
-
-
// Make sure that no one can add any new operations.
opsInProgressLock.lock();
@@ -1387,8 +1354,6 @@
public void cancelAllOperationsExcept(CancelRequest cancelRequest,
int messageID)
{
-
-
// Make sure that no one can add any new operations.
opsInProgressLock.lock();
@@ -1754,8 +1719,6 @@
*/
private boolean processLDAPMessage(LDAPMessage message)
{
-
-
if (keepStats)
{
statTracker.updateMessageRead(message);
@@ -1852,8 +1815,6 @@
private boolean processAbandonRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
AbandonRequestProtocolOp protocolOp = message.getAbandonRequestProtocolOp();
AbandonOperation abandonOp =
new AbandonOperation(this, nextOperationID.getAndIncrement(),
@@ -1886,8 +1847,6 @@
private boolean processAddRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
// Create the add operation and add it into the work queue.
AddRequestProtocolOp protocolOp = message.getAddRequestProtocolOp();
AddOperation addOp =
@@ -1935,8 +1894,6 @@
private boolean processBindRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
BindRequestProtocolOp protocolOp = message.getBindRequestProtocolOp();
// See if this is an LDAPv2 bind request, and if so whether that should be
@@ -2034,8 +1991,6 @@
private boolean processCompareRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
CompareRequestProtocolOp protocolOp = message.getCompareRequestProtocolOp();
CompareOperation compareOp =
new CompareOperation(this, nextOperationID.getAndIncrement(),
@@ -2087,8 +2042,6 @@
private boolean processDeleteRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
DeleteRequestProtocolOp protocolOp = message.getDeleteRequestProtocolOp();
DeleteOperation deleteOp =
new DeleteOperation(this, nextOperationID.getAndIncrement(),
@@ -2138,8 +2091,6 @@
private boolean processExtendedRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
// See if this is an LDAPv2 client. If it is, then they should not be
// issuing extended requests. We can't send a response that we can be sure
// they can understand, so we have no choice but to close the connection.
@@ -2211,8 +2162,6 @@
private boolean processModifyRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
ModifyRequestProtocolOp protocolOp = message.getModifyRequestProtocolOp();
ModifyOperation modifyOp =
new ModifyOperation(this, nextOperationID.getAndIncrement(),
@@ -2262,8 +2211,6 @@
private boolean processModifyDNRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
ModifyDNRequestProtocolOp protocolOp =
message.getModifyDNRequestProtocolOp();
ModifyDNOperation modifyDNOp =
@@ -2317,8 +2264,6 @@
private boolean processSearchRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
SearchRequestProtocolOp protocolOp = message.getSearchRequestProtocolOp();
SearchOperation searchOp =
new SearchOperation(this, nextOperationID.getAndIncrement(),
@@ -2374,8 +2319,6 @@
private boolean processUnbindRequest(LDAPMessage message,
ArrayList<Control> controls)
{
-
-
UnbindOperation unbindOp =
new UnbindOperation(this, nextOperationID.getAndIncrement(),
message.getMessageID(), controls);
@@ -2394,7 +2337,6 @@
*/
public String getMonitorSummary()
{
-
StringBuilder buffer = new StringBuilder();
buffer.append("connID=\"");
buffer.append(connectionID);
@@ -2445,7 +2387,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAP client connection from ");
buffer.append(clientAddress);
buffer.append(":");
@@ -2473,8 +2414,6 @@
*/
public boolean tlsProtectionAvailable(StringBuilder unavailableReason)
{
-
-
// Make sure that this client connection does not already have some other
// security provider enabled.
if (! (securityProvider instanceof NullConnectionSecurityProvider))
@@ -2550,7 +2489,6 @@
public void enableTLSConnectionSecurityProvider()
throws DirectoryException
{
-
if (tlsSecurityProvider == null)
{
int msgID = MSGID_LDAP_TLS_NO_PROVIDER;
@@ -2581,7 +2519,6 @@
public void disableTLSConnectionSecurityProvider()
throws DirectoryException
{
-
int msgID = MSGID_LDAP_TLS_CLOSURE_NOT_ALLOWED;
String message = getMessage(msgID);
@@ -2608,7 +2545,6 @@
public void sendClearResponse(Operation operation)
throws DirectoryException
{
-
if (clearSecurityProvider == null)
{
int msgID = MSGID_LDAP_NO_CLEAR_SECURITY_PROVIDER;
@@ -2628,7 +2564,6 @@
*/
public DN getKeyManagerProviderDN()
{
-
return connectionHandler.getKeyManagerProviderDN();
}
@@ -2639,7 +2574,6 @@
*/
public DN getTrustManagerProviderDN()
{
-
return connectionHandler.getTrustManagerProviderDN();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 3747a87..8c3bd43 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -290,8 +290,6 @@
public void initializeConnectionHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
-
enabled = true;
configEntryDN = configEntry.getDN();
@@ -1235,7 +1233,6 @@
public void finalizeConnectionHandler(String finalizeReason,
boolean closeConnections)
{
-
shutdownRequested = true;
DirectoryServer.deregisterConfigurableComponent(this);
@@ -1276,7 +1273,6 @@
*/
public String getConnectionHandlerName()
{
-
return handlerName;
}
@@ -1287,7 +1283,6 @@
*/
public String getProtocol()
{
-
return protocol;
}
@@ -1298,7 +1293,6 @@
*/
public Collection<HostPort> getListeners()
{
-
return listeners;
}
@@ -1313,7 +1307,6 @@
*/
public Collection<ClientConnection> getClientConnections()
{
-
LinkedList<ClientConnection> connectionList =
new LinkedList<ClientConnection>();
for (LDAPRequestHandler requestHandler : requestHandlers)
@@ -1335,7 +1328,6 @@
*/
public int getListenPort()
{
-
return listenPort;
}
@@ -1347,7 +1339,6 @@
*/
public void run()
{
-
connHandlerThread = Thread.currentThread();
setName(handlerName);
@@ -1670,7 +1661,6 @@
*/
private void cleanUpSelector()
{
-
try
{
Iterator<SelectionKey> iterator = selector.keys().iterator();
@@ -1722,7 +1712,6 @@
*/
public boolean keepStats()
{
-
return keepStats;
}
@@ -1736,7 +1725,6 @@
*/
public void setKeepStats(boolean keepStats)
{
-
this.keepStats = keepStats;
}
@@ -1749,7 +1737,6 @@
*/
public LDAPStatistics getStatTracker()
{
-
return statTracker;
}
@@ -1764,7 +1751,6 @@
*/
public boolean allowLDAPv2()
{
-
return allowLDAPv2;
}
@@ -1779,7 +1765,6 @@
*/
public boolean allowStartTLS()
{
-
return allowStartTLS;
}
@@ -1794,7 +1779,6 @@
*/
public boolean useSSL()
{
-
return useSSL;
}
@@ -1807,7 +1791,6 @@
*/
public SSLClientAuthPolicy getSSLClientAuthPolicy()
{
-
return sslClientAuthPolicy;
}
@@ -1822,7 +1805,6 @@
*/
public String[] getEnabledSSLProtocols()
{
-
return enabledSSLProtocols;
}
@@ -1837,7 +1819,6 @@
*/
public String[] getEnabledSSLCipherSuites()
{
-
return enabledSSLCipherSuites;
}
@@ -1855,7 +1836,6 @@
*/
public DN getKeyManagerProviderDN()
{
-
return keyManagerProviderDN;
}
@@ -1873,7 +1853,6 @@
*/
public DN getTrustManagerProviderDN()
{
-
return trustManagerProviderDN;
}
@@ -1902,7 +1881,6 @@
*/
public int getMaxRequestSize()
{
-
return maxRequestSize;
}
@@ -1915,7 +1893,6 @@
*/
public String getShutdownListenerName()
{
-
return handlerName;
}
@@ -1930,7 +1907,6 @@
*/
public void processServerShutdown(String reason)
{
-
shutdownRequested = true;
try
@@ -1956,7 +1932,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -1971,7 +1946,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> configAttrs = new LinkedList<ConfigAttribute>();
int msgID = MSGID_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_ADDRESS;
@@ -2168,8 +2142,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configValid = true;
@@ -2888,8 +2860,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
// Create variables to include in the response.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
@@ -3777,7 +3747,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(handlerName);
}
@@ -3792,7 +3761,6 @@
*/
public DN getComponentEntryDN()
{
-
return configEntryDN;
}
@@ -3807,7 +3775,6 @@
*/
public String getClassName()
{
-
return CLASS_NAME;
}
@@ -3825,7 +3792,6 @@
*/
public LinkedHashMap<String,String> getAlerts()
{
-
LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_LDAP_CONNECTION_HANDLER_CONSECUTIVE_FAILURES,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
index 768e5dc..718cd25 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
@@ -68,7 +68,6 @@
*/
public LDAPControl(Control control)
{
-
this.control = control;
}
@@ -82,7 +81,6 @@
*/
public LDAPControl(String oid)
{
-
control = new Control(oid, false);
}
@@ -98,7 +96,6 @@
*/
public LDAPControl(String oid, boolean isCritical)
{
-
control = new Control(oid, isCritical);
}
@@ -114,7 +111,6 @@
*/
public LDAPControl(String oid, boolean isCritical, ASN1OctetString value)
{
-
control = new Control(oid, isCritical, value);
}
@@ -127,7 +123,6 @@
*/
public Control getControl()
{
-
return control;
}
@@ -140,7 +135,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(3);
elements.add(new ASN1OctetString(control.getOID()));
@@ -169,7 +163,6 @@
*/
public static ASN1Element encodeControls(ArrayList<LDAPControl> controls)
{
-
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(controls.size());
for (LDAPControl c : controls)
@@ -195,7 +188,6 @@
public static LDAPControl decode(ASN1Element element)
throws LDAPException
{
-
if (element == null)
{
int msgID = MSGID_LDAP_CONTROL_DECODE_NULL;
@@ -362,7 +354,6 @@
public static ArrayList<LDAPControl> decodeControls(ASN1Element element)
throws LDAPException
{
-
if (element == null)
{
int msgID = MSGID_LDAP_CONTROL_DECODE_CONTROLS_NULL;
@@ -403,7 +394,6 @@
*/
public String getOID()
{
-
return control.getOID();
}
@@ -417,7 +407,6 @@
*/
public boolean isCritical()
{
-
return control.isCritical();
}
@@ -430,7 +419,6 @@
*/
public ASN1OctetString getValue()
{
-
return control.getValue();
}
@@ -443,7 +431,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -459,7 +446,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPControl(oid=");
buffer.append(control.getOID());
buffer.append(", criticality=");
@@ -486,7 +472,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
index 041cab4..83fef46 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
@@ -107,7 +107,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -120,7 +119,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
index 8156afb..f14ba07 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
@@ -128,7 +128,6 @@
ASN1OctetString subFinalElement, String matchingRuleID,
boolean dnAttributes)
{
-
this.filterType = filterType;
this.filterComponents = filterComponents;
this.notComponent = notComponent;
@@ -150,7 +149,6 @@
*/
public LDAPFilter(SearchFilter filter)
{
-
this.filterType = filter.getFilterType();
switch (filterType)
@@ -301,7 +299,6 @@
public static LDAPFilter createANDFilter(ArrayList<LDAPFilter>
filterComponents)
{
-
return new LDAPFilter(FilterType.AND, filterComponents, null, null, null,
null, null, null, null, false);
}
@@ -318,7 +315,6 @@
public static LDAPFilter createORFilter(ArrayList<LDAPFilter>
filterComponents)
{
-
return new LDAPFilter(FilterType.OR, filterComponents, null, null, null,
null, null, null, null, false);
}
@@ -334,7 +330,6 @@
*/
public static LDAPFilter createNOTFilter(LDAPFilter notComponent)
{
-
return new LDAPFilter(FilterType.NOT, null, notComponent, null, null, null,
null, null, null, false);
}
@@ -352,7 +347,6 @@
public static LDAPFilter createEqualityFilter(String attributeType,
ASN1OctetString assertionValue)
{
-
return new LDAPFilter(FilterType.EQUALITY, null, null, attributeType,
assertionValue, null, null, null, null, false);
}
@@ -375,7 +369,6 @@
ArrayList<ASN1OctetString> subAnyElements,
ASN1OctetString subFinalElement)
{
-
return new LDAPFilter(FilterType.SUBSTRING, null, null, attributeType, null,
subInitialElement, subAnyElements, subFinalElement,
null, false);
@@ -396,7 +389,6 @@
public static LDAPFilter createGreaterOrEqualFilter(String attributeType,
ASN1OctetString assertionValue)
{
-
return new LDAPFilter(FilterType.GREATER_OR_EQUAL, null, null,
attributeType, assertionValue, null, null, null, null,
false);
@@ -415,7 +407,6 @@
public static LDAPFilter createLessOrEqualFilter(String attributeType,
ASN1OctetString assertionValue)
{
-
return new LDAPFilter(FilterType.LESS_OR_EQUAL, null, null, attributeType,
assertionValue, null, null, null, null, false);
}
@@ -431,7 +422,6 @@
*/
public static LDAPFilter createPresenceFilter(String attributeType)
{
-
return new LDAPFilter(FilterType.PRESENT, null, null, attributeType, null,
null, null, null, null, false);
}
@@ -449,7 +439,6 @@
public static LDAPFilter createApproximateFilter(String attributeType,
ASN1OctetString assertionValue)
{
-
return new LDAPFilter(FilterType.APPROXIMATE_MATCH, null, null,
attributeType, assertionValue, null, null, null, null,
false);
@@ -473,7 +462,6 @@
ASN1OctetString assertionValue,
boolean dnAttributes)
{
-
return new LDAPFilter(FilterType.EXTENSIBLE_MATCH, null, null,
attributeType, assertionValue, null, null, null,
matchingRuleID, dnAttributes);
@@ -495,8 +483,6 @@
public static LDAPFilter decode(String filterString)
throws LDAPException
{
-
-
if (filterString == null)
{
int msgID = MSGID_LDAP_FILTER_STRING_NULL;
@@ -552,8 +538,6 @@
int endPos)
throws LDAPException
{
-
-
// Make sure that the length is sufficient for a valid search filter.
int length = endPos - startPos;
if (length <= 0)
@@ -878,8 +862,6 @@
int startPos, int endPos)
throws LDAPException
{
-
-
// Create a list to hold the returned components.
ArrayList<LDAPFilter> filterComponents = new ArrayList<LDAPFilter>();
@@ -986,8 +968,6 @@
int endPos)
throws LDAPException
{
-
-
// Get a binary representation of the value.
byte[] valueBytes = getBytes(filterString.substring(equalPos+1, endPos));
@@ -1571,8 +1551,6 @@
int endPos)
throws LDAPException
{
-
-
String attributeType = null;
boolean dnAttributes = false;
String matchingRuleID = null;
@@ -1823,7 +1801,6 @@
*/
public FilterType getFilterType()
{
-
return filterType;
}
@@ -1838,7 +1815,6 @@
*/
public ArrayList<LDAPFilter> getFilterComponents()
{
-
return filterComponents;
}
@@ -1853,7 +1829,6 @@
*/
public void setFilterComponents(ArrayList<LDAPFilter> filterComponents)
{
-
this.filterComponents = filterComponents;
}
@@ -1867,7 +1842,6 @@
*/
public LDAPFilter getNOTComponent()
{
-
return notComponent;
}
@@ -1881,7 +1855,6 @@
*/
public void setNOTComponent(LDAPFilter notComponent)
{
-
this.notComponent = notComponent;
}
@@ -1896,7 +1869,6 @@
*/
public String getAttributeType()
{
-
return attributeType;
}
@@ -1910,7 +1882,6 @@
*/
public void setAttributeType(String attributeType)
{
-
this.attributeType = attributeType;
}
@@ -1926,7 +1897,6 @@
*/
public ASN1OctetString getAssertionValue()
{
-
return assertionValue;
}
@@ -1940,7 +1910,6 @@
*/
public void setAssertionValue(ASN1OctetString assertionValue)
{
-
this.assertionValue = assertionValue;
}
@@ -1956,7 +1925,6 @@
*/
public ASN1OctetString getSubInitialElement()
{
-
return subInitialElement;
}
@@ -1971,7 +1939,6 @@
*/
public void setSubInitialElement(ASN1OctetString subInitialElement)
{
-
this.subInitialElement = subInitialElement;
}
@@ -1987,7 +1954,6 @@
*/
public ArrayList<ASN1OctetString> getSubAnyElements()
{
-
return subAnyElements;
}
@@ -2002,7 +1968,6 @@
*/
public void setSubAnyElements(ArrayList<ASN1OctetString> subAnyElements)
{
-
this.subAnyElements = subAnyElements;
}
@@ -2018,7 +1983,6 @@
*/
public ASN1OctetString getSubFinalElement()
{
-
return subFinalElement;
}
@@ -2032,7 +1996,6 @@
*/
public void setSubFinalElement(ASN1OctetString subFinalElement)
{
-
this.subFinalElement = subFinalElement;
}
@@ -2048,7 +2011,6 @@
*/
public String getMatchingRuleID()
{
-
return matchingRuleID;
}
@@ -2063,7 +2025,6 @@
*/
public void setMatchingRuleID(String matchingRuleID)
{
-
this.matchingRuleID = matchingRuleID;
}
@@ -2079,7 +2040,6 @@
*/
public boolean getDNAttributes()
{
-
return dnAttributes;
}
@@ -2094,7 +2054,6 @@
*/
public void setDNAttributes(boolean dnAttributes)
{
-
this.dnAttributes = dnAttributes;
}
@@ -2107,7 +2066,6 @@
*/
public ASN1Element encode()
{
-
switch (filterType)
{
case AND:
@@ -2207,7 +2165,6 @@
public static LDAPFilter decode(ASN1Element element)
throws LDAPException
{
-
if (element == null)
{
int msgID = MSGID_LDAP_FILTER_DECODE_NULL;
@@ -2262,8 +2219,6 @@
private static LDAPFilter decodeCompoundFilter(ASN1Element element)
throws LDAPException
{
-
-
FilterType filterType;
switch (element.getType())
{
@@ -2347,8 +2302,6 @@
private static LDAPFilter decodeNotFilter(ASN1Element element)
throws LDAPException
{
-
-
ASN1Element notFilterElement;
try
{
@@ -2410,8 +2363,6 @@
private static LDAPFilter decodeTypeAndValueFilter(ASN1Element element)
throws LDAPException
{
-
-
FilterType filterType;
switch (element.getType())
{
@@ -2519,8 +2470,6 @@
private static LDAPFilter decodeSubstringFilter(ASN1Element element)
throws LDAPException
{
-
-
ArrayList<ASN1Element> elements;
try
{
@@ -2658,8 +2607,6 @@
private static LDAPFilter decodePresenceFilter(ASN1Element element)
throws LDAPException
{
-
-
String attributeType;
try
{
@@ -2697,7 +2644,6 @@
private static LDAPFilter decodeExtensibleMatchFilter(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -2781,8 +2727,6 @@
public SearchFilter toSearchFilter()
throws DirectoryException
{
-
-
ArrayList<SearchFilter> subComps;
if (filterComponents == null)
{
@@ -2911,7 +2855,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -2927,7 +2870,6 @@
*/
public void toString(StringBuilder buffer)
{
-
switch (filterType)
{
case AND:
@@ -3053,7 +2995,6 @@
public static void valueToFilterString(StringBuilder buffer,
ASN1OctetString value)
{
-
if (value == null)
{
return;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
index b87180e..3737605 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
@@ -76,7 +76,6 @@
*/
public LDAPMessage(int messageID, ProtocolOp protocolOp)
{
-
this.messageID = messageID;
this.protocolOp = protocolOp;
@@ -96,7 +95,6 @@
public LDAPMessage(int messageID, ProtocolOp protocolOp,
ArrayList<LDAPControl> controls)
{
-
this.messageID = messageID;
this.protocolOp = protocolOp;
@@ -119,7 +117,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
@@ -132,7 +129,6 @@
*/
public void setMessageID(int messageID)
{
-
this.messageID = messageID;
}
@@ -145,7 +141,6 @@
*/
public ProtocolOp getProtocolOp()
{
-
return protocolOp;
}
@@ -158,7 +153,6 @@
*/
public byte getProtocolOpType()
{
-
return protocolOp.getType();
}
@@ -171,7 +165,6 @@
*/
public String getProtocolOpName()
{
-
return protocolOp.getProtocolOpName();
}
@@ -190,7 +183,6 @@
public AbandonRequestProtocolOp getAbandonRequestProtocolOp()
throws ClassCastException
{
-
return (AbandonRequestProtocolOp) protocolOp;
}
@@ -209,7 +201,6 @@
public AddRequestProtocolOp getAddRequestProtocolOp()
throws ClassCastException
{
-
return (AddRequestProtocolOp) protocolOp;
}
@@ -228,7 +219,6 @@
public AddResponseProtocolOp getAddResponseProtocolOp()
throws ClassCastException
{
-
return (AddResponseProtocolOp) protocolOp;
}
@@ -247,7 +237,6 @@
public BindRequestProtocolOp getBindRequestProtocolOp()
throws ClassCastException
{
-
return (BindRequestProtocolOp) protocolOp;
}
@@ -266,7 +255,6 @@
public BindResponseProtocolOp getBindResponseProtocolOp()
throws ClassCastException
{
-
return (BindResponseProtocolOp) protocolOp;
}
@@ -285,7 +273,6 @@
public CompareRequestProtocolOp getCompareRequestProtocolOp()
throws ClassCastException
{
-
return (CompareRequestProtocolOp) protocolOp;
}
@@ -304,7 +291,6 @@
public CompareResponseProtocolOp getCompareResponseProtocolOp()
throws ClassCastException
{
-
return (CompareResponseProtocolOp) protocolOp;
}
@@ -323,7 +309,6 @@
public DeleteRequestProtocolOp getDeleteRequestProtocolOp()
throws ClassCastException
{
-
return (DeleteRequestProtocolOp) protocolOp;
}
@@ -342,7 +327,6 @@
public DeleteResponseProtocolOp getDeleteResponseProtocolOp()
throws ClassCastException
{
-
return (DeleteResponseProtocolOp) protocolOp;
}
@@ -361,7 +345,6 @@
public ExtendedRequestProtocolOp getExtendedRequestProtocolOp()
throws ClassCastException
{
-
return (ExtendedRequestProtocolOp) protocolOp;
}
@@ -380,7 +363,6 @@
public ExtendedResponseProtocolOp getExtendedResponseProtocolOp()
throws ClassCastException
{
-
return (ExtendedResponseProtocolOp) protocolOp;
}
@@ -399,7 +381,6 @@
public ModifyRequestProtocolOp getModifyRequestProtocolOp()
throws ClassCastException
{
-
return (ModifyRequestProtocolOp) protocolOp;
}
@@ -418,7 +399,6 @@
public ModifyResponseProtocolOp getModifyResponseProtocolOp()
throws ClassCastException
{
-
return (ModifyResponseProtocolOp) protocolOp;
}
@@ -437,7 +417,6 @@
public ModifyDNRequestProtocolOp getModifyDNRequestProtocolOp()
throws ClassCastException
{
-
return (ModifyDNRequestProtocolOp) protocolOp;
}
@@ -456,7 +435,6 @@
public ModifyDNResponseProtocolOp getModifyDNResponseProtocolOp()
throws ClassCastException
{
-
return (ModifyDNResponseProtocolOp) protocolOp;
}
@@ -475,7 +453,6 @@
public SearchRequestProtocolOp getSearchRequestProtocolOp()
throws ClassCastException
{
-
return (SearchRequestProtocolOp) protocolOp;
}
@@ -494,7 +471,6 @@
public SearchResultDoneProtocolOp getSearchResultDoneProtocolOp()
throws ClassCastException
{
-
return (SearchResultDoneProtocolOp) protocolOp;
}
@@ -513,7 +489,6 @@
public SearchResultEntryProtocolOp getSearchResultEntryProtocolOp()
throws ClassCastException
{
-
return (SearchResultEntryProtocolOp) protocolOp;
}
@@ -532,7 +507,6 @@
public SearchResultReferenceProtocolOp getSearchResultReferenceProtocolOp()
throws ClassCastException
{
-
return (SearchResultReferenceProtocolOp) protocolOp;
}
@@ -551,7 +525,6 @@
public UnbindRequestProtocolOp getUnbindRequestProtocolOp()
throws ClassCastException
{
-
return (UnbindRequestProtocolOp) protocolOp;
}
@@ -564,7 +537,6 @@
*/
public void setProtocolOp(ProtocolOp protocolOp)
{
-
this.protocolOp = protocolOp;
}
@@ -578,7 +550,6 @@
*/
public ArrayList<LDAPControl> getControls()
{
-
return controls;
}
@@ -591,7 +562,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> messageElements = new ArrayList<ASN1Element>(3);
messageElements.add(new ASN1Integer(messageID));
messageElements.add(protocolOp.encode());
@@ -619,7 +589,6 @@
public static LDAPMessage decode(ASN1Sequence messageSequence)
throws LDAPException
{
-
if (messageSequence == null)
{
int msgID = MSGID_LDAP_MESSAGE_DECODE_NULL;
@@ -710,7 +679,6 @@
*/
public String getProtocolElementName()
{
-
return "LDAP";
}
@@ -723,7 +691,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -740,7 +707,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPMessage(msgID=");
buffer.append(messageID);
buffer.append(", protocolOp=");
@@ -778,7 +744,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
index 7d226f7..867c9fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
@@ -74,7 +74,6 @@
public LDAPModification(ModificationType modificationType,
LDAPAttribute attribute)
{
-
this.modificationType = modificationType;
this.attribute = attribute;
}
@@ -88,7 +87,6 @@
*/
public ModificationType getModificationType()
{
-
return modificationType;
}
@@ -101,7 +99,6 @@
*/
public void setModificationType(ModificationType modificationType)
{
-
this.modificationType = modificationType;
}
@@ -114,7 +111,6 @@
*/
public LDAPAttribute getAttribute()
{
-
return attribute;
}
@@ -127,7 +123,6 @@
*/
public void setAttribute(LDAPAttribute attribute)
{
-
this.attribute = attribute;
}
@@ -140,7 +135,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(new ASN1Enumerated(modificationType.intValue()));
elements.add(attribute.encode());
@@ -163,7 +157,6 @@
public static LDAPModification decode(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -279,7 +272,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -295,7 +287,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("LDAPModification(type=");
buffer.append(String.valueOf(modificationType));
buffer.append(", attr=");
@@ -315,7 +306,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 649ea69..35a2da3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -171,8 +171,6 @@
*/
public void run()
{
-
-
// Operate in a loop until the server shuts down. Each time through the
// loop, check for new requests, then check for new connections.
while (! shutdownRequested)
@@ -334,7 +332,6 @@
*/
public boolean registerClient(LDAPClientConnection clientConnection)
{
-
// FIXME -- Need to check if the maximum client limit has been reached.
@@ -375,7 +372,6 @@
*/
public void deregisterClient(LDAPClientConnection clientConnection)
{
-
SelectionKey[] keyArray = selector.keys().toArray(new SelectionKey[0]);
for (SelectionKey key : keyArray)
{
@@ -416,7 +412,6 @@
*/
public void deregisterAllClients()
{
-
SelectionKey[] keyArray = selector.keys().toArray(new SelectionKey[0]);
for (SelectionKey key : keyArray)
{
@@ -457,7 +452,6 @@
*/
public Collection<LDAPClientConnection> getClientConnections()
{
-
SelectionKey[] keyArray = selector.keys().toArray(new SelectionKey[0]);
ArrayList<LDAPClientConnection> connList =
@@ -479,7 +473,6 @@
*/
public String getShutdownListenerName()
{
-
return handlerName;
}
@@ -493,7 +486,6 @@
*/
public void registerShutdownListener()
{
-
DirectoryServer.registerShutdownListener(this);
}
@@ -508,7 +500,6 @@
*/
public void processServerShutdown(String reason)
{
-
shutdownRequested = true;
Collection<LDAPClientConnection> clientConnections = getClientConnections();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
index 1295ad5..db29756 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -210,7 +210,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException
{
-
// Throw an exception, because this monitor is not intended to be
// dynamically loaded from the configuration. Rather, it should be
// explicitly created and registered by the LDAP connection handler or an
@@ -230,7 +229,6 @@
*/
public String getMonitorInstanceName()
{
-
return instanceName;
}
@@ -247,8 +245,6 @@
*/
public long getUpdateInterval()
{
-
-
// This monitor should not run periodically.
return -1;
}
@@ -264,7 +260,6 @@
*/
public void updateMonitorData()
{
-
// No implementation is required since this does not do periodic updates.
}
@@ -280,7 +275,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
-
ArrayList<Attribute> attrs = new ArrayList<Attribute>(29);
long tmpAbandonRequests;
@@ -502,8 +496,6 @@
*/
public void clearStatistics()
{
-
-
// Quickly grab the locks and store consistent copies of the information.
// Note that when grabbing multiple locks, it is essential that they are all
// acquired in the same order to prevent deadlocks.
@@ -626,7 +618,6 @@
*/
public void updateConnect()
{
-
connectLock.lock();
try
@@ -660,7 +651,6 @@
*/
public void updateDisconnect()
{
-
disconnectLock.lock();
try
@@ -696,7 +686,6 @@
*/
public void updateBytesRead(int bytesRead)
{
-
readLock.lock();
try
@@ -732,7 +721,6 @@
*/
public void updateMessageRead(LDAPMessage message)
{
-
readLock.lock();
try
@@ -804,7 +792,6 @@
*/
public void updateMessageWritten(LDAPMessage message, int bytesWritten)
{
-
writeLock.lock();
try
@@ -887,7 +874,6 @@
*/
public void updateAbandonedOperation()
{
-
abandonLock.lock();
try
@@ -926,7 +912,6 @@
*/
private Attribute createAttribute(String name, String value)
{
-
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
@@ -959,7 +944,6 @@
*/
public long getConnectionsEstablished()
{
-
connectLock.lock();
try
@@ -981,7 +965,6 @@
*/
public long getConnectionsClosed()
{
-
disconnectLock.lock();
try
@@ -1003,7 +986,6 @@
*/
public long getBytesRead()
{
-
readLock.lock();
try
@@ -1025,7 +1007,6 @@
*/
public long getBytesWritten()
{
-
writeLock.lock();
try
@@ -1047,7 +1028,6 @@
*/
public long getMessagesRead()
{
-
readLock.lock();
try
@@ -1069,7 +1049,6 @@
*/
public long getMessagesWritten()
{
-
writeLock.lock();
try
@@ -1091,7 +1070,6 @@
*/
public long getOperationsInitiated()
{
-
readLock.lock();
try
@@ -1115,7 +1093,6 @@
*/
public long getOperationsCompleted()
{
-
writeLock.lock();
try
@@ -1137,7 +1114,6 @@
*/
public long getOperationsAbandoned()
{
-
abandonLock.lock();
try
@@ -1159,7 +1135,6 @@
*/
public long getAbandonRequests()
{
-
readLock.lock();
try
@@ -1181,7 +1156,6 @@
*/
public long getAddRequests()
{
-
readLock.lock();
try
@@ -1203,7 +1177,6 @@
*/
public long getAddResponses()
{
-
writeLock.lock();
try
@@ -1225,7 +1198,6 @@
*/
public long getBindRequests()
{
-
readLock.lock();
try
@@ -1247,7 +1219,6 @@
*/
public long getBindResponses()
{
-
writeLock.lock();
try
@@ -1269,7 +1240,6 @@
*/
public long getCompareRequests()
{
-
readLock.lock();
try
@@ -1291,7 +1261,6 @@
*/
public long getCompareResponses()
{
-
writeLock.lock();
try
@@ -1313,7 +1282,6 @@
*/
public long getDeleteRequests()
{
-
readLock.lock();
try
@@ -1335,7 +1303,6 @@
*/
public long getDeleteResponses()
{
-
writeLock.lock();
try
@@ -1357,7 +1324,6 @@
*/
public long getExtendedRequests()
{
-
readLock.lock();
try
@@ -1379,7 +1345,6 @@
*/
public long getExtendedResponses()
{
-
writeLock.lock();
try
@@ -1401,7 +1366,6 @@
*/
public long getModifyRequests()
{
-
readLock.lock();
try
@@ -1423,7 +1387,6 @@
*/
public long getModifyResponses()
{
-
writeLock.lock();
try
@@ -1445,7 +1408,6 @@
*/
public long getModifyDNRequests()
{
-
readLock.lock();
try
@@ -1467,7 +1429,6 @@
*/
public long getModifyDNResponses()
{
-
writeLock.lock();
try
@@ -1489,7 +1450,6 @@
*/
public long getSearchRequests()
{
-
readLock.lock();
try
@@ -1511,7 +1471,6 @@
*/
public long getSearchResultEntries()
{
-
writeLock.lock();
try
@@ -1533,7 +1492,6 @@
*/
public long getSearchResultReferences()
{
-
writeLock.lock();
try
@@ -1555,7 +1513,6 @@
*/
public long getSearchResultsDone()
{
-
writeLock.lock();
try
@@ -1577,7 +1534,6 @@
*/
public long getUnbindRequests()
{
-
readLock.lock();
try
@@ -1600,7 +1556,6 @@
*/
public LDAPStatistics getParent()
{
-
return parent;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index a21fa09..c85ba23 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -80,7 +80,6 @@
public ModifyDNRequestProtocolOp(ASN1OctetString entryDN,
ASN1OctetString newRDN, boolean deleteOldRDN)
{
-
this.entryDN = entryDN;
this.newRDN = newRDN;
this.deleteOldRDN = deleteOldRDN;
@@ -101,7 +100,6 @@
ASN1OctetString newRDN, boolean deleteOldRDN,
ASN1OctetString newSuperior)
{
-
this.entryDN = entryDN;
this.newRDN = newRDN;
this.deleteOldRDN = deleteOldRDN;
@@ -117,7 +115,6 @@
*/
public ASN1OctetString getEntryDN()
{
-
return entryDN;
}
@@ -130,7 +127,6 @@
*/
public void setEntryDN(ASN1OctetString entryDN)
{
-
this.entryDN = entryDN;
}
@@ -143,7 +139,6 @@
*/
public ASN1OctetString getNewRDN()
{
-
return newRDN;
}
@@ -156,7 +151,6 @@
*/
public void setNewRDN(ASN1OctetString newRDN)
{
-
this.newRDN = newRDN;
}
@@ -170,7 +164,6 @@
*/
public boolean deleteOldRDN()
{
-
return deleteOldRDN;
}
@@ -184,7 +177,6 @@
*/
public void setDeleteOldRDN(boolean deleteOldRDN)
{
-
this.deleteOldRDN = deleteOldRDN;
}
@@ -198,7 +190,6 @@
*/
public ASN1OctetString getNewSuperior()
{
-
return newSuperior;
}
@@ -211,7 +202,6 @@
*/
public void setNewSuperior(ASN1OctetString newSuperior)
{
-
this.newSuperior = newSuperior;
}
@@ -224,7 +214,6 @@
*/
public byte getType()
{
-
return OP_TYPE_MODIFY_DN_REQUEST;
}
@@ -237,7 +226,6 @@
*/
public String getProtocolOpName()
{
-
return "Modify DN Request";
}
@@ -251,7 +239,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(entryDN);
elements.add(newRDN);
@@ -283,7 +270,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -404,7 +390,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ModifyDNRequest(dn=");
entryDN.toString(buffer);
buffer.append(", newRDN=");
@@ -433,7 +418,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
index 2db80e4..67f69c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
@@ -81,7 +81,6 @@
*/
public ModifyDNResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public ModifyDNResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public ModifyDNResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_MODIFY_DN_RESPONSE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Modify DN Response";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -318,7 +304,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -458,7 +443,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ModifyDNResponse(resultCode=");
buffer.append(resultCode);
@@ -505,7 +489,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
index 8662784..55a3423 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
@@ -72,7 +72,6 @@
*/
public ModifyRequestProtocolOp(ASN1OctetString dn)
{
-
this.dn = dn;
this.modifications = new ArrayList<LDAPModification>();
}
@@ -89,7 +88,6 @@
public ModifyRequestProtocolOp(ASN1OctetString dn,
ArrayList<LDAPModification> modifications)
{
-
this.dn = dn;
if (modifications == null)
@@ -111,7 +109,6 @@
*/
public ASN1OctetString getDN()
{
-
return dn;
}
@@ -124,7 +121,6 @@
*/
public void setDN(ASN1OctetString dn)
{
-
this.dn = dn;
}
@@ -138,7 +134,6 @@
*/
public ArrayList<LDAPModification> getModifications()
{
-
return modifications;
}
@@ -151,7 +146,6 @@
*/
public byte getType()
{
-
return OP_TYPE_MODIFY_REQUEST;
}
@@ -164,7 +158,6 @@
*/
public String getProtocolOpName()
{
-
return "Modify Request";
}
@@ -178,7 +171,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(dn);
@@ -211,7 +203,6 @@
public static ModifyRequestProtocolOp decodeModifyRequest(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -295,7 +286,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ModifyRequest(dn=");
dn.toString(buffer);
buffer.append(", mods={");
@@ -327,7 +317,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
index 12bef5f..e9f776b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
@@ -81,7 +81,6 @@
*/
public ModifyResponseProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public ModifyResponseProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public ModifyResponseProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_MODIFY_RESPONSE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Modify Response";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -318,7 +304,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -458,7 +443,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ModifyResponse(resultCode=");
buffer.append(resultCode);
@@ -505,7 +489,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
index 685c676..1dda58e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
@@ -87,7 +87,6 @@
public static ProtocolOp decode(ASN1Element element)
throws LDAPException
{
-
if (element == null)
{
int msgID = MSGID_LDAP_PROTOCOL_OP_DECODE_NULL;
@@ -212,7 +211,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index 77a7404..6988c71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -108,8 +108,6 @@
boolean typesOnly, LDAPFilter filter,
LinkedHashSet<String> attributes)
{
-
-
this.baseDN = baseDN;
this.scope = scope;
this.dereferencePolicy = dereferencePolicy;
@@ -137,7 +135,6 @@
*/
public ASN1OctetString getBaseDN()
{
-
return baseDN;
}
@@ -150,7 +147,6 @@
*/
public void setBaseDN(ASN1OctetString baseDN)
{
-
this.baseDN = baseDN;
}
@@ -163,7 +159,6 @@
*/
public SearchScope getScope()
{
-
return scope;
}
@@ -176,7 +171,6 @@
*/
public void setScope(SearchScope scope)
{
-
this.scope = scope;
}
@@ -189,7 +183,6 @@
*/
public DereferencePolicy getDereferencePolicy()
{
-
return dereferencePolicy;
}
@@ -203,7 +196,6 @@
*/
public void setDereferencePolicy(DereferencePolicy dereferencePolicy)
{
-
this.dereferencePolicy = dereferencePolicy;
}
@@ -216,7 +208,6 @@
*/
public int getSizeLimit()
{
-
return sizeLimit;
}
@@ -229,7 +220,6 @@
*/
public void setSizeLimit(int sizeLimit)
{
-
this.sizeLimit = sizeLimit;
}
@@ -242,7 +232,6 @@
*/
public int getTimeLimit()
{
-
return timeLimit;
}
@@ -255,7 +244,6 @@
*/
public void setTimeLimit(int timeLimit)
{
-
this.timeLimit = timeLimit;
}
@@ -268,7 +256,6 @@
*/
public boolean getTypesOnly()
{
-
return typesOnly;
}
@@ -281,7 +268,6 @@
*/
public void setTypesOnly(boolean typesOnly)
{
-
this.typesOnly = typesOnly;
}
@@ -294,7 +280,6 @@
*/
public LDAPFilter getFilter()
{
-
return filter;
}
@@ -307,7 +292,6 @@
*/
public void setFilter(LDAPFilter filter)
{
-
this.filter = filter;
}
@@ -321,7 +305,6 @@
*/
public LinkedHashSet<String> getAttributes()
{
-
return attributes;
}
@@ -335,7 +318,6 @@
*/
public void setAttributes(LinkedHashSet<String> attributes)
{
-
if (attributes == null)
{
this.attributes.clear();
@@ -355,7 +337,6 @@
*/
public byte getType()
{
-
return OP_TYPE_SEARCH_REQUEST;
}
@@ -368,7 +349,6 @@
*/
public String getProtocolOpName()
{
-
return "Search Request";
}
@@ -382,7 +362,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(8);
elements.add(baseDN);
elements.add(new ASN1Enumerated(scope.intValue()));
@@ -419,7 +398,6 @@
public static SearchRequestProtocolOp decodeSearchRequest(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -658,7 +636,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchRequest(baseDN=");
baseDN.toString(buffer);
buffer.append(", scope=");
@@ -702,7 +679,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
index b55e53d..f6888f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
@@ -81,7 +81,6 @@
*/
public SearchResultDoneProtocolOp(int resultCode)
{
-
this.resultCode = resultCode;
errorMessage = null;
@@ -100,7 +99,6 @@
*/
public SearchResultDoneProtocolOp(int resultCode, String errorMessage)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
@@ -121,7 +119,6 @@
public SearchResultDoneProtocolOp(int resultCode, String errorMessage,
DN matchedDN, List<String> referralURLs)
{
-
this.resultCode = resultCode;
this.errorMessage = errorMessage;
this.matchedDN = matchedDN;
@@ -137,7 +134,6 @@
*/
public int getResultCode()
{
-
return resultCode;
}
@@ -150,7 +146,6 @@
*/
public void setResultCode(int resultCode)
{
-
this.resultCode = resultCode;
}
@@ -164,7 +159,6 @@
*/
public String getErrorMessage()
{
-
return errorMessage;
}
@@ -177,7 +171,6 @@
*/
public void setErrorMessage(String errorMessage)
{
-
this.errorMessage = errorMessage;
}
@@ -191,7 +184,6 @@
*/
public DN getMatchedDN()
{
-
return matchedDN;
}
@@ -204,7 +196,6 @@
*/
public void setMatchedDN(DN matchedDN)
{
-
this.matchedDN = matchedDN;
}
@@ -218,7 +209,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -231,7 +221,6 @@
*/
public void setReferralURLs(List<String> referralURLs)
{
-
this.referralURLs = referralURLs;
}
@@ -244,7 +233,6 @@
*/
public byte getType()
{
-
return OP_TYPE_SEARCH_RESULT_DONE;
}
@@ -257,7 +245,6 @@
*/
public String getProtocolOpName()
{
-
return "Search Result Done";
}
@@ -271,7 +258,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);
elements.add(new ASN1Enumerated(resultCode));
@@ -325,7 +311,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -465,7 +450,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchResultDone(resultCode=");
buffer.append(resultCode);
@@ -512,7 +496,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index f3f8b67..79dcfe4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -87,7 +87,6 @@
*/
public SearchResultEntryProtocolOp(DN dn)
{
-
this.dn = dn;
this.attributes = new LinkedList<LDAPAttribute>();
}
@@ -104,7 +103,6 @@
public SearchResultEntryProtocolOp(DN dn,
LinkedList<LDAPAttribute> attributes)
{
-
this.dn = dn;
if (attributes == null)
@@ -128,7 +126,6 @@
*/
public SearchResultEntryProtocolOp(SearchResultEntry searchEntry)
{
-
this.dn = searchEntry.getDN();
attributes = new LinkedList<LDAPAttribute>();
@@ -167,7 +164,6 @@
*/
public DN getDN()
{
-
return dn;
}
@@ -180,7 +176,6 @@
*/
public void setDN(DN dn)
{
-
this.dn = dn;
}
@@ -194,7 +189,6 @@
*/
public LinkedList<LDAPAttribute> getAttributes()
{
-
return attributes;
}
@@ -207,7 +201,6 @@
*/
public byte getType()
{
-
return OP_TYPE_SEARCH_RESULT_ENTRY;
}
@@ -220,7 +213,6 @@
*/
public String getProtocolOpName()
{
-
return "Search Result Entry";
}
@@ -234,7 +226,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
elements.add(new ASN1OctetString(dn.toString()));
@@ -269,7 +260,6 @@
element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -353,7 +343,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchResultEntry(dn=");
dn.toString(buffer);
buffer.append(", attrs={");
@@ -385,7 +374,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
@@ -420,8 +408,6 @@
*/
public void toLDIF(StringBuilder buffer, int wrapColumn)
{
-
-
// Add the DN to the buffer.
String dnString = dn.toString();
int colsRemaining;
@@ -546,7 +532,6 @@
public SearchResultEntry toSearchResultEntry()
throws LDAPException
{
-
HashMap<ObjectClass,String> objectClasses =
new HashMap<ObjectClass,String>();
HashMap<AttributeType,List<Attribute>> userAttributes =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
index d73392c..0a952a0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
@@ -72,7 +72,6 @@
*/
public SearchResultReferenceProtocolOp(List<String> referralURLs)
{
-
if (referralURLs == null)
{
this.referralURLs = new ArrayList<String>();
@@ -94,7 +93,6 @@
*/
public SearchResultReferenceProtocolOp(SearchResultReference searchReference)
{
-
referralURLs = searchReference.getReferralURLs();
if (referralURLs == null)
{
@@ -113,7 +111,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -126,7 +123,6 @@
*/
public byte getType()
{
-
return OP_TYPE_SEARCH_RESULT_REFERENCE;
}
@@ -139,7 +135,6 @@
*/
public String getProtocolOpName()
{
-
return "Search Result Reference";
}
@@ -153,7 +148,6 @@
*/
public ASN1Element encode()
{
-
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(referralURLs.size());
for (String url : referralURLs)
@@ -182,7 +176,6 @@
decodeSearchReference(ASN1Element element)
throws LDAPException
{
-
ArrayList<ASN1Element> elements;
try
{
@@ -235,7 +228,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SearchReference(referralURLs={");
if (! referralURLs.isEmpty())
@@ -265,7 +257,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
index a720ee9..937fc13 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
@@ -66,7 +66,6 @@
*/
public byte getType()
{
-
return OP_TYPE_UNBIND_REQUEST;
}
@@ -79,7 +78,6 @@
*/
public String getProtocolOpName()
{
-
return "Unbind Request";
}
@@ -93,7 +91,6 @@
*/
public ASN1Element encode()
{
-
return new ASN1Null(OP_TYPE_UNBIND_REQUEST);
}
@@ -112,7 +109,6 @@
public static UnbindRequestProtocolOp decodeUnbindRequest(ASN1Element element)
throws LDAPException
{
-
try
{
element.decodeAsNull();
@@ -141,7 +137,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("UnbindRequest()");
}
@@ -157,7 +152,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
for (int i=0; i < indent; i++)
{
buffer.append(' ');
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
index 980be4d..5e59cdc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
@@ -232,7 +232,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// Use the subtree specification code to make this determination.
try {
AbsoluteSubtreeSpecification.valueOf(value.stringValue());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index 81d5ce7..26b6ee2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -102,7 +102,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -141,7 +140,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_ATTRIBUTE_TYPE_NAME;
}
@@ -152,7 +150,6 @@
*/
public String getOID()
{
-
return SYNTAX_ATTRIBUTE_TYPE_OID;
}
@@ -163,7 +160,6 @@
*/
public String getDescription()
{
-
return SYNTAX_ATTRIBUTE_TYPE_DESCRIPTION;
}
@@ -174,7 +170,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -185,7 +180,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -196,7 +190,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -207,7 +200,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -220,8 +212,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeAttributeType method to determine if the value is
// acceptable.
try
@@ -271,8 +261,6 @@
boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -963,8 +951,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -1024,8 +1010,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -1113,8 +1097,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1196,10 +1178,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1351,8 +1329,6 @@
List<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index 0fae838..79ef23a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -88,7 +88,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -102,7 +101,6 @@
*/
public String getName()
{
-
return EMR_AUTH_PASSWORD_NAME;
}
@@ -115,7 +113,6 @@
*/
public String getOID()
{
-
return EMR_AUTH_PASSWORD_OID;
}
@@ -129,7 +126,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return EMR_AUTH_PASSWORD_DESCRIPTION;
}
@@ -144,7 +140,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_AUTH_PASSWORD_OID;
}
@@ -164,8 +159,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
// We will not alter the value in any way, but we'll create a new value
// just in case something else is using the underlying array.
byte[] currentValue = value.value();
@@ -189,7 +182,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
@@ -215,8 +207,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
-
// We must be able to decode the attribute value using the authentication
// password syntax.
StringBuilder[] authPWComponents;
@@ -279,8 +269,6 @@
*/
public int generateHashCode(AttributeValue attributeValue)
{
-
-
// Because of the variable encoding that may be used, we have no way of
// comparing two auth password values by hash code and therefore we'll
// always return the same value so that the valuesMatch method will be
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 9498add..e655182 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_AUTH_PASSWORD_EXACT_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_AUTH_PASSWORD_EXACT_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return EMR_AUTH_PASSWORD_EXACT_DESCRIPTION;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_AUTH_PASSWORD_OID;
}
@@ -163,8 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
try
{
StringBuilder[] authPWComponents =
@@ -217,7 +210,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index 6b693cb..c510d61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -93,7 +93,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_AUTH_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
@@ -113,7 +112,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_AUTH_PASSWORD_NAME;
}
@@ -126,7 +124,6 @@
*/
public String getOID()
{
-
return SYNTAX_AUTH_PASSWORD_OID;
}
@@ -139,7 +136,6 @@
*/
public String getDescription()
{
-
return SYNTAX_AUTH_PASSWORD_DESCRIPTION;
}
@@ -155,7 +151,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -171,7 +166,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -188,7 +182,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
// There is no substring matching rule by default.
return null;
}
@@ -205,7 +198,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -227,7 +219,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
try
{
decodeAuthPassword(value.stringValue());
@@ -257,8 +248,6 @@
public static StringBuilder[] decodeAuthPassword(String authPasswordValue)
throws DirectoryException
{
-
-
// Create placeholders for the values to return.
StringBuilder scheme = new StringBuilder();
StringBuilder authInfo = new StringBuilder();
@@ -510,8 +499,6 @@
*/
public static boolean isEncoded(ByteString value)
{
-
-
// FIXME -- Make this more efficient, and don't use exceptions for flow
// control.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
index 6570e65..96f2fff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
@@ -95,7 +95,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -133,7 +132,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_BINARY_NAME;
}
@@ -146,7 +144,6 @@
*/
public String getOID()
{
-
return SYNTAX_BINARY_OID;
}
@@ -159,7 +156,6 @@
*/
public String getDescription()
{
-
return SYNTAX_BINARY_DESCRIPTION;
}
@@ -175,7 +171,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -191,7 +186,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -207,7 +201,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -223,7 +216,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -245,7 +237,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the binary syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 9318904..8154456 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_BIT_STRING_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_BIT_STRING_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_BIT_STRING_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue().toUpperCase();
int length = valueString.length();
@@ -254,7 +248,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
index 23b1f4d..798b6ff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -91,8 +91,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_BIT_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -112,7 +110,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_BIT_STRING_NAME;
}
@@ -125,7 +122,6 @@
*/
public String getOID()
{
-
return SYNTAX_BIT_STRING_OID;
}
@@ -138,7 +134,6 @@
*/
public String getDescription()
{
-
return SYNTAX_BIT_STRING_DESCRIPTION;
}
@@ -154,7 +149,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -170,7 +164,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// Ordering matches are not allowed by default.
return null;
}
@@ -187,7 +180,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
// Substring matches are not allowed by default.
return null;
}
@@ -204,7 +196,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matches are not allowed by default.
return null;
}
@@ -226,7 +217,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String valueString = value.stringValue().toUpperCase();
int length = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index 19df104..3d959db 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_BOOLEAN_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_BOOLEAN_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_BOOLEAN_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue().toUpperCase();
if (valueString.equals("TRUE") || valueString.equals("YES") ||
valueString.equals("ON") || valueString.equals("1"))
@@ -209,7 +203,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
index 9379d1a..4974760 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -115,8 +115,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_BOOLEAN_OID);
if (defaultEqualityMatchingRule == null)
@@ -136,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_BOOLEAN_NAME;
}
@@ -149,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_BOOLEAN_OID;
}
@@ -162,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_BOOLEAN_DESCRIPTION;
}
@@ -178,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -194,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// Ordering matches are not allowed by default.
return null;
}
@@ -211,7 +204,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
// Substring matches are not allowed by default.
return null;
}
@@ -228,7 +220,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matches are not allowed by default.
return null;
}
@@ -250,7 +241,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String valueString = value.stringValue().toUpperCase();
boolean returnValue = (valueString.equals("TRUE") ||
@@ -283,7 +273,6 @@
*/
public static AttributeValue createBooleanValue(boolean b)
{
-
if (b)
{
return new AttributeValue(new ASN1OctetString("TRUE"),
@@ -311,7 +300,6 @@
public static boolean decodeBooleanValue(ByteString normalizedValue)
throws DirectoryException
{
-
String valueString = normalizedValue.stringValue();
if (valueString.equals("TRUE"))
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index 41067ab..d542e1d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
@@ -80,7 +80,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -94,7 +93,6 @@
*/
public String getName()
{
-
return EMR_CASE_EXACT_NAME;
}
@@ -107,7 +105,6 @@
*/
public String getOID()
{
-
return EMR_CASE_EXACT_OID;
}
@@ -121,7 +118,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -136,7 +132,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -156,7 +151,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(value.stringValue().trim());
@@ -206,7 +200,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index fd24ae9..2260f03 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_CASE_EXACT_IA5_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_CASE_EXACT_IA5_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_IA5_STRING_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(value.stringValue().trim());
@@ -245,7 +239,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 8ed1ac4..3f499ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -90,7 +90,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -104,7 +103,6 @@
*/
public String getName()
{
-
return SMR_CASE_EXACT_IA5_NAME;
}
@@ -117,7 +115,6 @@
*/
public String getOID()
{
-
return SMR_CASE_EXACT_IA5_OID;
}
@@ -131,7 +128,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -146,7 +142,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -166,7 +161,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(value.stringValue().trim());
@@ -250,7 +244,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
// opening or trailing space.
@@ -344,8 +337,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 181f430..f0e6cee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -91,7 +91,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -105,7 +104,6 @@
*/
public String getName()
{
-
return OMR_CASE_EXACT_NAME;
}
@@ -118,7 +116,6 @@
*/
public String getOID()
{
-
return OMR_CASE_EXACT_OID;
}
@@ -132,7 +129,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -147,7 +143,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -167,7 +162,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(value.stringValue().trim());
@@ -220,7 +214,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -241,7 +234,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int minLength = Math.min(b1.length, b2.length);
for (int i=0; i < minLength; i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index b33ffb5..05796d1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
@@ -80,7 +80,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -94,7 +93,6 @@
*/
public String getName()
{
-
return SMR_CASE_EXACT_NAME;
}
@@ -107,7 +105,6 @@
*/
public String getOID()
{
-
return SMR_CASE_EXACT_OID;
}
@@ -121,7 +118,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -136,7 +132,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -156,7 +151,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
buffer.append(value.stringValue().trim());
@@ -208,7 +202,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
// opening or trailing space.
@@ -270,8 +263,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index c2a78f5..cf815f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -79,7 +79,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -93,7 +92,6 @@
*/
public String getName()
{
-
return EMR_CASE_IGNORE_NAME;
}
@@ -106,7 +104,6 @@
*/
public String getOID()
{
-
return EMR_CASE_IGNORE_OID;
}
@@ -120,7 +117,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -135,7 +131,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -155,7 +150,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
@@ -379,7 +373,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
byte[] b1 = value1.value();
byte[] b2 = value2.value();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index 8b25b8f..b53f793 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -88,7 +88,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -102,7 +101,6 @@
*/
public String getName()
{
-
return EMR_CASE_IGNORE_IA5_NAME;
}
@@ -115,7 +113,6 @@
*/
public String getOID()
{
-
return EMR_CASE_IGNORE_IA5_OID;
}
@@ -129,7 +126,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -144,7 +140,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_IA5_STRING_OID;
}
@@ -164,7 +159,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -246,7 +240,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index 56bf153..5861e10 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -88,7 +88,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -102,7 +101,6 @@
*/
public String getName()
{
-
return SMR_CASE_IGNORE_IA5_NAME;
}
@@ -115,7 +113,6 @@
*/
public String getOID()
{
-
return SMR_CASE_IGNORE_IA5_OID;
}
@@ -129,7 +126,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -144,7 +140,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -164,7 +159,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -248,7 +242,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
// opening or trailing space.
@@ -342,8 +335,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index 881152e..2b593ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
@@ -81,7 +81,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -95,7 +94,6 @@
*/
public String getName()
{
-
return EMR_CASE_IGNORE_LIST_NAME;
}
@@ -108,7 +106,6 @@
*/
public String getOID()
{
-
return EMR_CASE_IGNORE_LIST_OID;
}
@@ -122,7 +119,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -137,7 +133,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_POSTAL_ADDRESS_OID;
}
@@ -157,7 +152,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -220,7 +214,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index 4f50ff0..1c013bd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
@@ -81,7 +81,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -95,7 +94,6 @@
*/
public String getName()
{
-
return SMR_CASE_IGNORE_LIST_NAME;
}
@@ -108,7 +106,6 @@
*/
public String getOID()
{
-
return SMR_CASE_IGNORE_LIST_OID;
}
@@ -122,7 +119,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -137,7 +133,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -157,7 +152,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -222,7 +216,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
// opening or trailing space.
@@ -284,8 +277,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index b3cfe98..e364646 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -89,7 +89,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -103,7 +102,6 @@
*/
public String getName()
{
-
return OMR_CASE_IGNORE_NAME;
}
@@ -116,7 +114,6 @@
*/
public String getOID()
{
-
return OMR_CASE_IGNORE_OID;
}
@@ -130,7 +127,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -145,7 +141,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -165,7 +160,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -218,7 +212,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(),value2.value());
}
@@ -239,7 +232,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int minLength = Math.min(b1.length, b2.length);
for (int i=0; i < minLength; i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index 6273978..fe102b2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
@@ -81,7 +81,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -95,7 +94,6 @@
*/
public String getName()
{
-
return SMR_CASE_IGNORE_NAME;
}
@@ -108,7 +106,6 @@
*/
public String getOID()
{
-
return SMR_CASE_IGNORE_OID;
}
@@ -122,7 +119,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -137,7 +133,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -157,7 +152,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -209,7 +203,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
// opening or trailing space.
@@ -271,8 +264,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
index 6527358..7c2feef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_CERTLIST_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_CERTLIST_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_CERTLIST_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -247,7 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the certificate list syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
index a52a6cf..d4b21de 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_CERTPAIR_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_CERTPAIR_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_CERTPAIR_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -247,7 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the certificate pair syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
index 3c489e4..b612367 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -96,7 +96,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -134,7 +133,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_CERTIFICATE_NAME;
}
@@ -147,7 +145,6 @@
*/
public String getOID()
{
-
return SYNTAX_CERTIFICATE_OID;
}
@@ -160,7 +157,6 @@
*/
public String getDescription()
{
-
return SYNTAX_CERTIFICATE_DESCRIPTION;
}
@@ -176,7 +172,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -192,7 +187,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -208,7 +202,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -224,7 +217,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -246,7 +238,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the certificate syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
index eff7e95..c79793f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -102,7 +102,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -149,7 +148,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_COUNTRY_STRING_NAME;
}
@@ -162,7 +160,6 @@
*/
public String getOID()
{
-
return SYNTAX_COUNTRY_STRING_OID;
}
@@ -175,7 +172,6 @@
*/
public String getDescription()
{
-
return SYNTAX_COUNTRY_STRING_DESCRIPTION;
}
@@ -191,7 +187,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -207,7 +202,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -223,7 +217,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -239,7 +232,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -260,7 +252,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String stringValue = toLowerCase(value.stringValue());
if (stringValue.length() != 2)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index 5ffd0f2..f4b9399 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -103,7 +103,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -142,7 +141,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_DIT_CONTENT_RULE_NAME;
}
@@ -153,7 +151,6 @@
*/
public String getOID()
{
-
return SYNTAX_DIT_CONTENT_RULE_OID;
}
@@ -164,7 +161,6 @@
*/
public String getDescription()
{
-
return SYNTAX_DIT_CONTENT_RULE_DESCRIPTION;
}
@@ -175,7 +171,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -186,7 +181,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -197,7 +191,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -208,7 +201,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -221,8 +213,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeDITContentRule method to determine if the value is
// acceptable.
try
@@ -271,8 +261,6 @@
Schema schema, boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -993,8 +981,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -1054,8 +1040,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -1143,8 +1127,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1226,10 +1208,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1383,8 +1361,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index 630882d..6360999 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -101,7 +101,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -140,7 +139,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_DIT_STRUCTURE_RULE_NAME;
}
@@ -151,7 +149,6 @@
*/
public String getOID()
{
-
return SYNTAX_DIT_STRUCTURE_RULE_OID;
}
@@ -162,7 +159,6 @@
*/
public String getDescription()
{
-
return SYNTAX_DIT_STRUCTURE_RULE_DESCRIPTION;
}
@@ -173,7 +169,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -184,7 +179,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -195,7 +189,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -206,7 +199,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -219,8 +211,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeDITStructureRule method to determine if the value is
// acceptable.
try
@@ -270,8 +260,6 @@
boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -736,8 +724,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -797,8 +783,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -886,8 +870,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -969,10 +951,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1125,8 +1103,6 @@
List<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 019a353..4870484 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -140,7 +140,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
allowedValues = new HashSet<String>(ALLOWED_VALUES.length);
for (String s : ALLOWED_VALUES)
{
@@ -193,7 +192,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_DELIVERY_METHOD_NAME;
}
@@ -206,7 +204,6 @@
*/
public String getOID()
{
-
return SYNTAX_DELIVERY_METHOD_OID;
}
@@ -219,7 +216,6 @@
*/
public String getDescription()
{
-
return SYNTAX_DELIVERY_METHOD_DESCRIPTION;
}
@@ -235,7 +231,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -251,7 +246,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -267,7 +261,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -283,7 +276,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -304,7 +296,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String stringValue = toLowerCase(value.stringValue());
StringTokenizer tokenizer = new StringTokenizer(stringValue, " $");
if (! tokenizer.hasMoreTokens())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index f7ce30a..5db0a6e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_DIRECTORY_STRING_FIRST_COMPONENT_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_DIRECTORY_STRING_FIRST_COMPONENT_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -213,8 +207,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
-
// For this purpose, the first value will be considered the attribute value,
// and the second the assertion value. The attribute value must start with
// an open parenthesis, followed by one or more spaces.
@@ -281,7 +273,6 @@
* @return The hash code generated for the provided attribute value.*/
public int generateHashCode(AttributeValue attributeValue)
{
-
// In this case, we'll always return the same value because the matching
// isn't based on the entire value.
return 1;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index 1a0f60b..65adb13 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -144,8 +144,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -234,7 +232,6 @@
*/
public void finalizeSyntax()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -247,7 +244,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_DIRECTORY_STRING_NAME;
}
@@ -260,7 +256,6 @@
*/
public String getOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -273,7 +268,6 @@
*/
public String getDescription()
{
-
return SYNTAX_DIRECTORY_STRING_DESCRIPTION;
}
@@ -289,7 +283,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -305,7 +298,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -321,7 +313,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -337,7 +328,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -358,7 +348,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
if (allowZeroLengthValues || (value.value().length > 0))
{
return true;
@@ -385,7 +374,6 @@
*/
public boolean allowZeroLengthValues()
{
-
return allowZeroLengthValues;
}
@@ -400,7 +388,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -415,7 +402,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
LinkedList<ConfigAttribute> configAttrs = new LinkedList<ConfigAttribute>();
int msgID = MSGID_ATTR_SYNTAX_DIRECTORYSTRING_DESCRIPTION_ALLOW_ZEROLENGTH;
@@ -445,8 +431,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configValid = true;
@@ -500,8 +484,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index bd7908e..a79048f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
@@ -90,7 +90,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -104,7 +103,6 @@
*/
public String getName()
{
-
return EMR_DN_NAME;
}
@@ -117,7 +115,6 @@
*/
public String getOID()
{
-
return EMR_DN_OID;
}
@@ -131,7 +128,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -146,7 +142,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DN_OID;
}
@@ -166,8 +161,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
// Since the normalization for DNs is so complex, it will be handled
// elsewhere.
DN dn;
@@ -229,7 +222,6 @@
*/
private ByteString bestEffortNormalize(String lowerString)
{
-
int length = lowerString.length();
StringBuilder buffer = new StringBuilder(length);
@@ -305,7 +297,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index 8f920b2..50f877e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -116,7 +116,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_DN_OID);
if (defaultEqualityMatchingRule == null)
@@ -145,7 +144,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_DN_NAME;
}
@@ -158,7 +156,6 @@
*/
public String getOID()
{
-
return SYNTAX_DN_OID;
}
@@ -171,7 +168,6 @@
*/
public String getDescription()
{
-
return SYNTAX_DN_DESCRIPTION;
}
@@ -187,7 +183,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -203,7 +198,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -220,7 +214,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -236,7 +229,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -258,7 +250,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// Use the DN code to make this determination.
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index a73d7b0..0450527 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -98,7 +98,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -112,7 +111,6 @@
*/
public String getName()
{
-
return AMR_DOUBLE_METAPHONE_NAME;
}
@@ -125,7 +123,6 @@
*/
public String getOID()
{
-
return AMR_DOUBLE_METAPHONE_OID;
}
@@ -139,7 +136,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return AMR_DOUBLE_METAPHONE_DESCRIPTION;
}
@@ -154,7 +150,6 @@
*/
public String getSyntaxOID()
{
-
// Approximate matching is really only appropriate for DirectoryString
// values.
return SYNTAX_DIRECTORY_STRING_OID;
@@ -176,7 +171,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int length = valueString.length();
if (length == 0)
@@ -1177,7 +1171,6 @@
*/
public boolean approximatelyMatch(ByteString value1, ByteString value2)
{
-
// If the values have been normalized, then we just need to compare their
// byte arrays.
return Arrays.equals(value1.value(), value2.value());
@@ -1202,7 +1195,6 @@
private boolean hasSubstring(String value, int start,
String substring)
{
-
try
{
// This can happen since a lot of the rules "look behind" and
@@ -1252,7 +1244,6 @@
*/
private boolean isVowel(char c)
{
-
switch (c)
{
case 'A':
@@ -1280,7 +1271,6 @@
*/
private boolean isSlavoGermanic(String s)
{
-
return (s.contains("W") || s.contains("K") || s.contains("CZ") ||
s.contains("WITZ"));
}
@@ -1298,7 +1288,6 @@
*/
private boolean isGermanic(String s)
{
-
return (s.startsWith("VAN ") || s.startsWith("VON ") ||
s.startsWith("SCH"));
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index 9221ab0..1a98150 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -98,7 +98,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -136,7 +135,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_ENHANCED_GUIDE_NAME;
}
@@ -149,7 +147,6 @@
*/
public String getOID()
{
-
return SYNTAX_ENHANCED_GUIDE_OID;
}
@@ -162,7 +159,6 @@
*/
public String getDescription()
{
-
return SYNTAX_ENHANCED_GUIDE_DESCRIPTION;
}
@@ -178,7 +174,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -194,7 +189,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -210,7 +204,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -226,7 +219,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -248,8 +240,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get a lowercase string version of the provided value.
String valueStr = toLowerCase(value.stringValue());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
index df117f1..66353e7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -129,7 +129,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -167,7 +166,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_FAXNUMBER_NAME;
}
@@ -180,7 +178,6 @@
*/
public String getOID()
{
-
return SYNTAX_FAXNUMBER_OID;
}
@@ -193,7 +190,6 @@
*/
public String getDescription()
{
-
return SYNTAX_FAXNUMBER_DESCRIPTION;
}
@@ -209,7 +205,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -225,7 +220,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -241,7 +235,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -257,7 +250,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -279,8 +271,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get a lowercase string representation of the value and find its length.
String valueString = toLowerCase(value.stringValue());
int valueLength = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
index 00be016..9280b22 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
@@ -96,7 +96,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -134,7 +133,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_FAX_NAME;
}
@@ -147,7 +145,6 @@
*/
public String getOID()
{
-
return SYNTAX_FAX_OID;
}
@@ -160,7 +157,6 @@
*/
public String getDescription()
{
-
return SYNTAX_FAX_DESCRIPTION;
}
@@ -176,7 +172,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -192,7 +187,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -208,7 +202,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -224,7 +217,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -246,7 +238,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the fax syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index 75ece4a..ee10b85 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -138,7 +138,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -152,7 +151,6 @@
*/
public String getName()
{
-
return EMR_GENERALIZED_TIME_NAME;
}
@@ -165,7 +163,6 @@
*/
public String getOID()
{
-
return EMR_GENERALIZED_TIME_OID;
}
@@ -179,7 +176,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -194,7 +190,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_GENERALIZED_TIME_OID;
}
@@ -214,8 +209,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
String valueString = value.stringValue().toUpperCase();
int length = valueString.length();
@@ -553,8 +546,6 @@
int second, int millisecond)
throws DirectoryException
{
-
-
// First, check to see if we are at the end of the string. If so, then
// that could either result in an exception or assuming that we should just
// use the local time zone.
@@ -881,7 +872,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index d81624f..484f598 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -147,7 +147,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -161,7 +160,6 @@
*/
public String getName()
{
-
return OMR_GENERALIZED_TIME_NAME;
}
@@ -174,7 +172,6 @@
*/
public String getOID()
{
-
return OMR_GENERALIZED_TIME_OID;
}
@@ -188,7 +185,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -203,7 +199,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_GENERALIZED_TIME_OID;
}
@@ -223,8 +218,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
String valueString = value.stringValue().toUpperCase();
int length = valueString.length();
@@ -562,8 +555,6 @@
int second, int millisecond)
throws DirectoryException
{
-
-
// First, check to see if we are at the end of the string. If so, then
// that could either result in an exception or assuming that we should just
// use the local time zone.
@@ -893,7 +884,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -914,7 +904,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int minLength = Math.min(b1.length, b2.length);
for (int i=0; i < minLength; i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index 08aaf99..084efcf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -142,7 +142,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
@@ -180,7 +179,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_GENERALIZED_TIME_NAME;
}
@@ -193,7 +191,6 @@
*/
public String getOID()
{
-
return SYNTAX_GENERALIZED_TIME_OID;
}
@@ -206,7 +203,6 @@
*/
public String getDescription()
{
-
return SYNTAX_GENERALIZED_TIME_DESCRIPTION;
}
@@ -222,7 +218,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -238,7 +233,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -254,7 +248,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -270,7 +263,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matching will not be allowed by default.
return null;
}
@@ -292,8 +284,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get the value as a string and verify that it is at least long enough for
// "YYYYMMDDhhZ", which is the shortest allowed value.
String valueString = value.stringValue().toUpperCase();
@@ -891,8 +881,6 @@
private boolean hasValidOffset(String value, int startPos,
StringBuilder invalidReason)
{
-
-
int offsetLength = value.length() - startPos;
if (offsetLength < 2)
{
@@ -1017,7 +1005,6 @@
*/
public static String format(Date d)
{
-
dateFormatLock.lock();
try
@@ -1041,7 +1028,6 @@
*/
public static String format(long t)
{
-
dateFormatLock.lock();
try
@@ -1067,7 +1053,6 @@
*/
public static AttributeValue createGeneralizedTimeValue(long time)
{
-
String valueString;
dateFormatLock.lock();
@@ -1112,7 +1097,6 @@
public static long decodeGeneralizedTimeValue(ByteString normalizedValue)
throws DirectoryException
{
-
String valueString = normalizedValue.stringValue();
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
index 479e971..29dc4b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_GUIDE_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_GUIDE_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_GUIDE_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -247,8 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get a lowercase string version of the provided value.
String valueStr = toLowerCase(value.stringValue());
@@ -301,8 +291,6 @@
public static boolean criteriaIsValid(String criteria, String valueStr,
StringBuilder invalidReason)
{
-
-
// See if the criteria starts with a '!'. If so, then just evaluate
// everything after that as a criteria.
char c = criteria.charAt(0);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
index e2edfe8..45f55a9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -100,7 +100,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -147,7 +146,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_IA5_STRING_NAME;
}
@@ -160,7 +158,6 @@
*/
public String getOID()
{
-
return SYNTAX_IA5_STRING_OID;
}
@@ -173,7 +170,6 @@
*/
public String getDescription()
{
-
return SYNTAX_IA5_STRING_DESCRIPTION;
}
@@ -189,7 +185,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -205,7 +200,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -221,7 +215,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -237,7 +230,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -258,8 +250,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We will allow any value that does not contain any non-ASCII characters.
// Empty values are acceptable as well.
for (byte b : value.value())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index 167f584..e4e9f6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_INTEGER_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_INTEGER_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_INTEGER_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
byte[] valueBytes = value.value();
int length = valueBytes.length;
@@ -388,7 +382,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index f219a19..9e261bd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
@@ -90,7 +90,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -104,7 +103,6 @@
*/
public String getName()
{
-
return EMR_INTEGER_FIRST_COMPONENT_NAME;
}
@@ -117,7 +115,6 @@
*/
public String getOID()
{
-
return EMR_INTEGER_FIRST_COMPONENT_OID;
}
@@ -131,7 +128,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -146,7 +142,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_INTEGER_OID;
}
@@ -166,7 +161,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -216,8 +210,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
-
try
{
int intValue1 = extractIntValue(value1.stringValue());
@@ -254,7 +246,6 @@
*/
public int generateHashCode(AttributeValue attributeValue)
{
-
// In this case, we'll always return the same value because the matching
// isn't based on the entire value.
return 1;
@@ -276,8 +267,6 @@
private static int extractIntValue(String valueString)
throws DirectoryException
{
-
-
int valueLength = valueString.length();
if ((valueLength == 0) || (valueString.charAt(0) != '('))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 8d90cda..9cca677 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -96,7 +96,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -110,7 +109,6 @@
*/
public String getName()
{
-
return OMR_INTEGER_NAME;
}
@@ -123,7 +121,6 @@
*/
public String getOID()
{
-
return OMR_INTEGER_OID;
}
@@ -137,7 +134,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -152,7 +148,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_INTEGER_OID;
}
@@ -172,7 +167,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
byte[] valueBytes = value.value();
int length = valueBytes.length;
@@ -400,7 +394,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -421,7 +414,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int b1Length = b1.length;
int b2Length = b2.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
index ecd12af..d802fda 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -128,7 +128,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_INTEGER_OID);
if (defaultEqualityMatchingRule == null)
@@ -166,7 +165,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_INTEGER_NAME;
}
@@ -179,7 +177,6 @@
*/
public String getOID()
{
-
return SYNTAX_INTEGER_OID;
}
@@ -192,7 +189,6 @@
*/
public String getDescription()
{
-
return SYNTAX_INTEGER_DESCRIPTION;
}
@@ -208,7 +204,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -224,7 +219,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -240,7 +234,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -256,7 +249,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -278,7 +270,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String valueString = value.stringValue();
int length = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
index 61c671b..ccc5dd3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -96,7 +96,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -134,7 +133,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_JPEG_NAME;
}
@@ -147,7 +145,6 @@
*/
public String getOID()
{
-
return SYNTAX_JPEG_OID;
}
@@ -160,7 +157,6 @@
*/
public String getDescription()
{
-
return SYNTAX_JPEG_DESCRIPTION;
}
@@ -176,7 +172,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -192,7 +187,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -208,7 +202,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -224,7 +217,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -246,7 +238,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the JPEG syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
index 42f47be..1f5a7cb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
@@ -63,7 +63,6 @@
*/
public String getName()
{
-
return EMR_KEYWORD_NAME;
}
@@ -76,7 +75,6 @@
*/
public String getOID()
{
-
return EMR_KEYWORD_OID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 4ae980c..39a45ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -102,7 +102,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -140,7 +139,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_LDAP_SYNTAX_NAME;
}
@@ -153,7 +151,6 @@
*/
public String getOID()
{
-
return SYNTAX_LDAP_SYNTAX_OID;
}
@@ -166,7 +163,6 @@
*/
public String getDescription()
{
-
return SYNTAX_LDAP_SYNTAX_DESCRIPTION;
}
@@ -182,7 +178,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -198,7 +193,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -214,7 +208,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -230,7 +223,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -252,8 +244,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -524,8 +514,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -585,8 +573,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 3f1caba..e04ebb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -105,7 +105,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -143,7 +142,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_MATCHING_RULE_NAME;
}
@@ -156,7 +154,6 @@
*/
public String getOID()
{
-
return SYNTAX_MATCHING_RULE_OID;
}
@@ -169,7 +166,6 @@
*/
public String getDescription()
{
-
return SYNTAX_MATCHING_RULE_DESCRIPTION;
}
@@ -185,7 +181,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -201,7 +196,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -217,7 +211,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -233,7 +226,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -255,8 +247,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -671,8 +661,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -732,8 +720,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -821,8 +807,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -904,10 +888,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1060,8 +1040,6 @@
CopyOnWriteArrayList<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index a509fa3..ccd604c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -102,7 +102,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -141,7 +140,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_MATCHING_RULE_USE_NAME;
}
@@ -152,7 +150,6 @@
*/
public String getOID()
{
-
return SYNTAX_MATCHING_RULE_USE_OID;
}
@@ -163,7 +160,6 @@
*/
public String getDescription()
{
-
return SYNTAX_MATCHING_RULE_USE_DESCRIPTION;
}
@@ -174,7 +170,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -185,7 +180,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -196,7 +190,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -207,7 +200,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -220,8 +212,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeMatchingRuleUse method to determine if the value is
// acceptable.
try
@@ -271,8 +261,6 @@
boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -675,8 +663,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -736,8 +722,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -825,8 +809,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -908,10 +890,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1063,8 +1041,6 @@
List<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 78a4beb..32a80c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -98,7 +98,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_UNIQUE_MEMBER_OID);
if (defaultEqualityMatchingRule == null)
@@ -127,7 +126,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
}
@@ -140,7 +138,6 @@
*/
public String getOID()
{
-
return SYNTAX_NAME_AND_OPTIONAL_UID_OID;
}
@@ -153,7 +150,6 @@
*/
public String getDescription()
{
-
return SYNTAX_NAME_AND_OPTIONAL_UID_DESCRIPTION;
}
@@ -169,7 +165,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -185,7 +180,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -202,7 +196,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -218,7 +211,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -240,7 +232,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String valueString = value.stringValue().trim();
int valueLength = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
index 0c87f11..4f1a0ff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -103,7 +103,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -142,7 +141,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_NAME_FORM_NAME;
}
@@ -153,7 +151,6 @@
*/
public String getOID()
{
-
return SYNTAX_NAME_FORM_OID;
}
@@ -164,7 +161,6 @@
*/
public String getDescription()
{
-
return SYNTAX_NAME_FORM_DESCRIPTION;
}
@@ -175,7 +171,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -186,7 +181,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -197,7 +191,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -208,7 +201,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -221,8 +213,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeNameForm method to determine if the value is
// acceptable.
try
@@ -271,8 +261,6 @@
boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -792,8 +780,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -853,8 +839,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -942,8 +926,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1025,10 +1007,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1181,8 +1159,6 @@
List<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index d96a219..03ff9c4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -89,7 +89,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -103,7 +102,6 @@
*/
public String getName()
{
-
return EMR_NUMERIC_STRING_NAME;
}
@@ -116,7 +114,6 @@
*/
public String getOID()
{
-
return EMR_NUMERIC_STRING_OID;
}
@@ -130,7 +127,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -145,7 +141,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_NUMERIC_STRING_OID;
}
@@ -165,7 +160,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int valueLength = valueString.length();
StringBuilder valueBuffer = new StringBuilder(valueLength);
@@ -217,7 +211,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index bb94638..8f16d62 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -96,7 +96,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -110,7 +109,6 @@
*/
public String getName()
{
-
return OMR_NUMERIC_STRING_NAME;
}
@@ -123,7 +121,6 @@
*/
public String getOID()
{
-
return OMR_NUMERIC_STRING_OID;
}
@@ -137,7 +134,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -152,7 +148,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_NUMERIC_STRING_OID;
}
@@ -172,7 +167,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int valueLength = valueString.length();
StringBuilder valueBuffer = new StringBuilder(valueLength);
@@ -227,7 +221,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -248,7 +241,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int minLength = Math.min(b1.length, b2.length);
for (int i=0; i < minLength; i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index 68134c0..b2c56c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -88,7 +88,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -102,7 +101,6 @@
*/
public String getName()
{
-
return SMR_NUMERIC_STRING_NAME;
}
@@ -115,7 +113,6 @@
*/
public String getOID()
{
-
return SMR_NUMERIC_STRING_OID;
}
@@ -129,7 +126,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -144,7 +140,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -164,7 +159,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int valueLength = valueString.length();
StringBuilder valueBuffer = new StringBuilder(valueLength);
@@ -218,7 +212,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
String valueString = substring.stringValue();
int valueLength = valueString.length();
StringBuilder valueBuffer = new StringBuilder(valueLength);
@@ -279,8 +272,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
index 88ff296..6b7be31 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_NUMERIC_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_NUMERIC_STRING_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_NUMERIC_STRING_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_NUMERIC_STRING_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -247,7 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String valueString = value.stringValue();
int length = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
index f79cc4b..4e69943 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
@@ -93,7 +93,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OID_OID);
if (defaultEqualityMatchingRule == null)
@@ -122,7 +121,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_OID_NAME;
}
@@ -135,7 +133,6 @@
*/
public String getOID()
{
-
return SYNTAX_OID_OID;
}
@@ -148,7 +145,6 @@
*/
public String getDescription()
{
-
return SYNTAX_OID_DESCRIPTION;
}
@@ -164,7 +160,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -180,7 +175,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -197,7 +191,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -213,7 +206,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -235,7 +227,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
String lowerValue = toLowerCase(value.stringValue());
return isValidSchemaElement(lowerValue, 0, lowerValue.length(),
invalidReason);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
index cc303b3..e04f03f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -105,7 +105,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -144,7 +143,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_OBJECTCLASS_NAME;
}
@@ -155,7 +153,6 @@
*/
public String getOID()
{
-
return SYNTAX_OBJECTCLASS_OID;
}
@@ -166,7 +163,6 @@
*/
public String getDescription()
{
-
return SYNTAX_OBJECTCLASS_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -188,7 +183,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -199,7 +193,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -210,7 +203,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -223,8 +215,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We'll use the decodeObjectClass method to determine if the value is
// acceptable.
try
@@ -273,8 +263,6 @@
boolean allowUnknownElements)
throws DirectoryException
{
-
-
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
String valueStr = value.stringValue();
@@ -869,8 +857,6 @@
int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -930,8 +916,6 @@
StringBuilder valueBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = valueStr.length();
@@ -1019,8 +1003,6 @@
StringBuilder lowerBuffer, int startPos)
throws DirectoryException
{
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1102,10 +1084,6 @@
int startPos)
throws DirectoryException
{
-
-
-
-
// Skip over any spaces at the beginning of the value.
char c = '\u0000';
int length = lowerStr.length();
@@ -1258,8 +1236,6 @@
List<String> valueList, int startPos)
throws DirectoryException
{
-
-
// Skip over any leading spaces.
int length = valueStr.length();
char c = valueStr.charAt(startPos++);
@@ -1377,7 +1353,6 @@
*/
private static boolean superiorChainIncludesTop(ObjectClass superiorClass)
{
-
if (superiorClass == null)
{
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index a1ffea6..44bfce2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -93,7 +93,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -107,7 +106,6 @@
*/
public String getName()
{
-
return EMR_OID_NAME;
}
@@ -120,7 +118,6 @@
*/
public String getOID()
{
-
return EMR_OID_OID;
}
@@ -134,7 +131,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -149,7 +145,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_OID_OID;
}
@@ -169,7 +164,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
String lowerValue = buffer.toString();
@@ -269,8 +263,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
-
// First, compare the normalized values to see if they are the same.
if (Arrays.equals(value1.value(), value2.value()))
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index db5256d..ecfd05d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
@@ -90,7 +90,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -104,7 +103,6 @@
*/
public String getName()
{
-
return EMR_OID_FIRST_COMPONENT_NAME;
}
@@ -117,7 +115,6 @@
*/
public String getOID()
{
-
return EMR_OID_FIRST_COMPONENT_OID;
}
@@ -131,7 +128,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -146,7 +142,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_OID_OID;
}
@@ -166,7 +161,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -216,8 +210,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
-
// For this purpose, the first value will be considered the attribute value,
// and the second the assertion value. The attribute value must start with
// an open parenthesis, followed by one or more spaces.
@@ -374,7 +366,6 @@
* @return The hash code generated for the provided attribute value.*/
public int generateHashCode(AttributeValue attributeValue)
{
-
// In this case, we'll always return the same value because the matching
// isn't based on the entire value.
return 1;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index 83bc08a..7e90a2d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
@@ -81,7 +81,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -95,7 +94,6 @@
*/
public String getName()
{
-
return EMR_OCTET_STRING_NAME;
}
@@ -108,7 +106,6 @@
*/
public String getOID()
{
-
return EMR_OCTET_STRING_OID;
}
@@ -122,7 +119,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -137,7 +133,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_OCTET_STRING_OID;
}
@@ -157,7 +152,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
return new ASN1OctetString(value.value());
}
@@ -175,7 +169,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 53e2e97..d15b423 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -90,7 +90,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -104,7 +103,6 @@
*/
public String getName()
{
-
return OMR_OCTET_STRING_NAME;
}
@@ -117,7 +115,6 @@
*/
public String getOID()
{
-
return OMR_OCTET_STRING_OID;
}
@@ -131,7 +128,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -146,7 +142,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_OCTET_STRING_OID;
}
@@ -166,7 +161,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
return new ASN1OctetString(value.value());
}
@@ -187,7 +181,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -208,7 +201,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
return StaticUtils.compare(b1, b2);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 5724c71..25d5889 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
@@ -82,7 +82,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -96,7 +95,6 @@
*/
public String getName()
{
-
return SMR_OCTET_STRING_NAME;
}
@@ -109,7 +107,6 @@
*/
public String getOID()
{
-
return SMR_OCTET_STRING_OID;
}
@@ -123,7 +120,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -138,7 +134,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -158,7 +153,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
return new ASN1OctetString(value.value());
}
@@ -178,7 +172,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
// This is exactly the same as normalizing a full value.
return new ASN1OctetString(substring.value());
}
@@ -206,8 +199,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
index 6329762..c04f382 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -96,7 +96,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -134,7 +133,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_OCTET_STRING_NAME;
}
@@ -147,7 +145,6 @@
*/
public String getOID()
{
-
return SYNTAX_OCTET_STRING_OID;
}
@@ -160,7 +157,6 @@
*/
public String getDescription()
{
-
return SYNTAX_OCTET_STRING_DESCRIPTION;
}
@@ -176,7 +172,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -192,7 +187,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -208,7 +202,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -224,7 +217,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -246,7 +238,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the octet string syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 5778ce2..490dafe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -94,7 +94,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_LIST_OID);
if (defaultEqualityMatchingRule == null)
@@ -123,7 +122,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_OTHER_MAILBOX_NAME;
}
@@ -136,7 +134,6 @@
*/
public String getOID()
{
-
return SYNTAX_OTHER_MAILBOX_OID;
}
@@ -149,7 +146,6 @@
*/
public String getDescription()
{
-
return SYNTAX_OTHER_MAILBOX_DESCRIPTION;
}
@@ -165,7 +161,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -181,7 +176,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// Ordering matching is not allowed by default.
return null;
}
@@ -198,7 +192,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -214,7 +207,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matching is not allowed by default.
return null;
}
@@ -236,8 +228,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Check to see if the provided value was null. If so, then that's not
// acceptable.
if (value == null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
index 735fa0a..3f4318b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -95,7 +95,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -124,7 +123,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_POSTAL_ADDRESS_NAME;
}
@@ -137,7 +135,6 @@
*/
public String getOID()
{
-
return SYNTAX_POSTAL_ADDRESS_OID;
}
@@ -150,7 +147,6 @@
*/
public String getDescription()
{
-
return SYNTAX_POSTAL_ADDRESS_DESCRIPTION;
}
@@ -166,7 +162,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -182,7 +177,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// Ordering matching will not be allowed by default.
return null;
}
@@ -199,7 +193,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -215,7 +208,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matching will not be allowed by default.
return null;
}
@@ -237,7 +229,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// We'll allow any value.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index 53102d0..de284ce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
@@ -82,7 +82,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -96,7 +95,6 @@
*/
public String getName()
{
-
return EMR_PRESENTATION_ADDRESS_NAME;
}
@@ -109,7 +107,6 @@
*/
public String getOID()
{
-
return EMR_PRESENTATION_ADDRESS_OID;
}
@@ -123,7 +120,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -138,7 +134,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_PRESENTATION_ADDRESS_OID;
}
@@ -158,7 +153,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -208,7 +202,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index 050b8ed..8005148 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -99,7 +99,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -146,7 +145,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_PRESENTATION_ADDRESS_NAME;
}
@@ -159,7 +157,6 @@
*/
public String getOID()
{
-
return SYNTAX_PRESENTATION_ADDRESS_OID;
}
@@ -172,7 +169,6 @@
*/
public String getDescription()
{
-
return SYNTAX_PRESENTATION_ADDRESS_DESCRIPTION;
}
@@ -188,7 +184,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -204,7 +199,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -220,7 +214,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -236,7 +229,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -257,7 +249,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// We will accept any value for this syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
index 908b2d9..4029ce7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
@@ -53,7 +53,6 @@
*/
public static boolean isPrintableCharacter(char c)
{
-
switch (c)
{
case 'a':
@@ -148,7 +147,6 @@
*/
public static boolean isPrintableString(String s)
{
-
if (s == null)
{
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 4b13003..bd5ae96 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -101,7 +101,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -148,7 +147,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_PRINTABLE_STRING_NAME;
}
@@ -161,7 +159,6 @@
*/
public String getOID()
{
-
return SYNTAX_PRINTABLE_STRING_OID;
}
@@ -174,7 +171,6 @@
*/
public String getDescription()
{
-
return SYNTAX_PRINTABLE_STRING_DESCRIPTION;
}
@@ -190,7 +186,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -206,7 +201,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -222,7 +216,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -238,7 +231,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -259,8 +251,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Check to see if the provided value was null. If so, then that's not
// acceptable.
if (value == null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index 9071239..a68bc07 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
@@ -83,7 +83,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -97,7 +96,6 @@
*/
public String getName()
{
-
return EMR_PROTOCOL_INFORMATION_NAME;
}
@@ -110,7 +108,6 @@
*/
public String getOID()
{
-
return EMR_PROTOCOL_INFORMATION_OID;
}
@@ -124,7 +121,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -139,7 +135,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_PROTOCOL_INFORMATION_OID;
}
@@ -159,7 +154,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -209,7 +203,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 89ebc2a..41e8666 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -99,7 +99,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultApproximateMatchingRule =
DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
@@ -146,7 +145,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_PROTOCOL_INFORMATION_NAME;
}
@@ -159,7 +157,6 @@
*/
public String getOID()
{
-
return SYNTAX_PROTOCOL_INFORMATION_OID;
}
@@ -172,7 +169,6 @@
*/
public String getDescription()
{
-
return SYNTAX_PROTOCOL_INFORMATION_DESCRIPTION;
}
@@ -188,7 +184,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -204,7 +199,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -220,7 +214,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -236,7 +229,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return defaultApproximateMatchingRule;
}
@@ -257,7 +249,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// We will accept any value for this syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index 1ea9e92..3e7b20a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_SUBSTRING_ASSERTION_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_SUBSTRING_ASSERTION_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matching will not be allowed by default.
return null;
}
@@ -247,8 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get the string representation of the value and check its length. A
// zero-length value is acceptable. A one-length value is acceptable as
// long as it is not an asterisk. For all other lengths, just ensure that
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 38f9709..4c55891 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -97,7 +97,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
@@ -135,7 +134,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_SUPPORTED_ALGORITHM_NAME;
}
@@ -148,7 +146,6 @@
*/
public String getOID()
{
-
return SYNTAX_SUPPORTED_ALGORITHM_OID;
}
@@ -161,7 +158,6 @@
*/
public String getDescription()
{
-
return SYNTAX_SUPPORTED_ALGORITHM_DESCRIPTION;
}
@@ -177,7 +173,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -193,7 +188,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -209,7 +203,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -225,7 +218,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -247,7 +239,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
// All values will be acceptable for the supported algorithm syntax.
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index d2a4b3c..cb03c86 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
@@ -82,7 +82,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -96,7 +95,6 @@
*/
public String getName()
{
-
return EMR_TELEPHONE_NAME;
}
@@ -109,7 +107,6 @@
*/
public String getOID()
{
-
return EMR_TELEPHONE_OID;
}
@@ -123,7 +120,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -138,7 +134,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_TELEPHONE_OID;
}
@@ -158,7 +153,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int valueLength = valueString.length();
StringBuilder buffer = new StringBuilder(valueLength);
@@ -193,7 +187,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index 6323066..41c2c80 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
@@ -84,7 +84,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -98,7 +97,6 @@
*/
public String getName()
{
-
return SMR_TELEPHONE_NAME;
}
@@ -111,7 +109,6 @@
*/
public String getOID()
{
-
return SMR_TELEPHONE_OID;
}
@@ -125,7 +122,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -140,7 +136,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_SUBSTRING_ASSERTION_OID;
}
@@ -160,7 +155,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
String valueString = value.stringValue();
int valueLength = valueString.length();
StringBuilder buffer = new StringBuilder(valueLength);
@@ -197,8 +191,6 @@
public ByteString normalizeSubstring(ByteString substring)
throws DirectoryException
{
-
-
// In this case, the logic used to normalize a substring is identical to the
// logic used to normalize a full value.
return normalizeValue(substring);
@@ -227,8 +219,6 @@
List<ByteString> subAnyElements,
ByteString subFinal)
{
-
-
byte[] valueBytes = value.value();
int valueLength = valueBytes.length;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index bc250d3..9ec1ba5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -118,7 +118,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_TELEPHONE_OID);
if (defaultEqualityMatchingRule == null)
@@ -185,7 +184,6 @@
*/
public void finalizeSyntax()
{
-
DirectoryServer.deregisterConfigurableComponent(this);
}
@@ -198,7 +196,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_TELEPHONE_NAME;
}
@@ -211,7 +208,6 @@
*/
public String getOID()
{
-
return SYNTAX_TELEPHONE_OID;
}
@@ -224,7 +220,6 @@
*/
public String getDescription()
{
-
return SYNTAX_TELEPHONE_DESCRIPTION;
}
@@ -240,7 +235,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -256,7 +250,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -273,7 +266,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -289,7 +281,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -311,8 +302,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// No matter what, the value can't be empty or null.
String valueStr;
if ((value == null) ||
@@ -403,7 +392,6 @@
*/
private boolean isSeparator(char c)
{
-
switch (c)
{
case ' ':
@@ -425,7 +413,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
-
return configEntryDN;
}
@@ -440,8 +427,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
-
-
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
int msgID = MSGID_ATTR_SYNTAX_TELEPHONE_DESCRIPTION_STRICT_MODE;
@@ -471,8 +456,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
-
-
boolean configIsAcceptable = true;
@@ -529,8 +512,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
-
-
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
ArrayList<String> messages = new ArrayList<String>();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 1cbf736..724143e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -127,7 +127,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -165,7 +164,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_TELETEX_TERM_ID_NAME;
}
@@ -178,7 +176,6 @@
*/
public String getOID()
{
-
return SYNTAX_TELETEX_TERM_ID_OID;
}
@@ -191,7 +188,6 @@
*/
public String getDescription()
{
-
return SYNTAX_TELETEX_TERM_ID_DESCRIPTION;
}
@@ -207,7 +203,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -223,7 +218,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -239,7 +233,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -255,7 +248,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -277,8 +269,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get a lowercase string representation of the value and find its length.
String valueString = value.stringValue();
int valueLength = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 58a4bf1..03105f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -96,7 +96,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
@@ -134,7 +133,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_TELEX_NAME;
}
@@ -147,7 +145,6 @@
*/
public String getOID()
{
-
return SYNTAX_TELEX_OID;
}
@@ -160,7 +157,6 @@
*/
public String getDescription()
{
-
return SYNTAX_TELEX_DESCRIPTION;
}
@@ -176,7 +172,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -192,7 +187,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -208,7 +202,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -224,7 +217,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -246,8 +238,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get a string representation of the value and find its length.
String valueString = value.stringValue();
int valueLength = valueString.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
index d2aa8b1..95e38ac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -143,7 +143,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
@@ -181,7 +180,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_UTC_TIME_NAME;
}
@@ -194,7 +192,6 @@
*/
public String getOID()
{
-
return SYNTAX_UTC_TIME_OID;
}
@@ -207,7 +204,6 @@
*/
public String getDescription()
{
-
return SYNTAX_UTC_TIME_DESCRIPTION;
}
@@ -223,7 +219,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -239,7 +234,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -255,7 +249,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return defaultSubstringMatchingRule;
}
@@ -271,7 +264,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// Approximate matching will not be allowed by default.
return null;
}
@@ -293,8 +285,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// Get the value as a string and verify that it is at least long enough for
// "YYYYMMDDhhmmZ", which is the shortest allowed value.
String valueString = value.stringValue().toUpperCase();
@@ -755,8 +745,6 @@
private boolean hasValidOffset(String value, int startPos,
StringBuilder invalidReason)
{
-
-
int offsetLength = value.length() - startPos;
if (offsetLength < 2)
{
@@ -882,7 +870,6 @@
*/
public static AttributeValue createUTCTimeValue(Date d)
{
-
String valueString;
dateFormatLock.lock();
@@ -928,7 +915,6 @@
public static Date decodeUTCTimeValue(ByteString normalizedValue)
throws DirectoryException
{
-
String valueString = normalizedValue.stringValue();
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 06fcef5..43dfb29 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_UUID_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_UUID_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_UUID_OID;
}
@@ -163,7 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
byte[] valueBytes = value.value();
if (valueBytes.length != 36)
{
@@ -293,7 +287,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index bb00722..7814baf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -95,7 +95,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -109,7 +108,6 @@
*/
public String getName()
{
-
return OMR_UUID_NAME;
}
@@ -122,7 +120,6 @@
*/
public String getOID()
{
-
return OMR_UUID_OID;
}
@@ -136,7 +133,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -151,7 +147,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_UUID_OID;
}
@@ -171,7 +166,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
byte[] valueBytes = value.value();
if (valueBytes.length != 36)
{
@@ -304,7 +298,6 @@
*/
public int compareValues(ByteString value1, ByteString value2)
{
-
return compare(value1.value(), value2.value());
}
@@ -325,7 +318,6 @@
*/
public int compare(byte[] b1, byte[] b2)
{
-
int minLength = Math.min(b1.length, b2.length);
for (int i=0; i < minLength; i++)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
index 4d3472e..ca0953f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -92,7 +92,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_UUID_OID);
if (defaultEqualityMatchingRule == null)
@@ -121,7 +120,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_UUID_NAME;
}
@@ -134,7 +132,6 @@
*/
public String getOID()
{
-
return SYNTAX_UUID_OID;
}
@@ -147,7 +144,6 @@
*/
public String getDescription()
{
-
return SYNTAX_UUID_DESCRIPTION;
}
@@ -163,7 +159,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -179,7 +174,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return defaultOrderingMatchingRule;
}
@@ -195,7 +189,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
// There is no substring matching rule by default.
return null;
}
@@ -212,7 +205,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -234,8 +226,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We will only accept values that look like valid UUIDs. This means that
// all values must be in the form HHHHHHHH-HHHH-HHHH-HHHH-HHHHHHHHHHHH,
// where "H" represents a hexadecimal digit. First, make sure that the
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 78db730..a27b1db 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -94,7 +94,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -108,7 +107,6 @@
*/
public String getName()
{
-
return EMR_UNIQUE_MEMBER_NAME;
}
@@ -121,7 +119,6 @@
*/
public String getOID()
{
-
return EMR_UNIQUE_MEMBER_OID;
}
@@ -135,7 +132,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -150,7 +146,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_NAME_AND_OPTIONAL_UID_OID;
}
@@ -170,8 +165,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
String valueString = value.stringValue().trim();
int valueLength = valueString.length();
@@ -292,7 +285,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 7a5dc0b..746125b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -87,7 +87,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -101,7 +100,6 @@
*/
public String getName()
{
-
return EMR_USER_PASSWORD_NAME;
}
@@ -114,7 +112,6 @@
*/
public String getOID()
{
-
return EMR_USER_PASSWORD_OID;
}
@@ -128,7 +125,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return EMR_USER_PASSWORD_DESCRIPTION;
}
@@ -143,7 +139,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_USER_PASSWORD_OID;
}
@@ -163,8 +158,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
// We will not alter the value in any way, but we'll create a new value
// just in case something else is using the underlying array.
byte[] currentValue = value.value();
@@ -188,7 +181,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
@@ -214,8 +206,6 @@
public ConditionResult valuesMatch(ByteString attributeValue,
ByteString assertionValue)
{
-
-
// We must be able to decode the attribute value using the user password
// syntax.
String[] userPWComponents;
@@ -276,8 +266,6 @@
*/
public int generateHashCode(AttributeValue attributeValue)
{
-
-
// Because of the variable encoding that may be used, we have no way of
// comparing two user password values by hash code and therefore we'll
// always return the same value so that the valuesMatch method will be
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index f66e9e2..80fcbd1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
@@ -81,7 +81,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -95,7 +94,6 @@
*/
public String getName()
{
-
return EMR_USER_PASSWORD_EXACT_NAME;
}
@@ -108,7 +106,6 @@
*/
public String getOID()
{
-
return EMR_USER_PASSWORD_EXACT_OID;
}
@@ -122,7 +119,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return EMR_USER_PASSWORD_EXACT_DESCRIPTION;
}
@@ -137,7 +133,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_USER_PASSWORD_OID;
}
@@ -157,8 +152,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
-
// The normalized form of this matching rule is exactly equal to the
// non-normalized form, except that the scheme needs to be converted to
// lowercase (if there is one).
@@ -274,7 +267,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
// Since the values are already normalized, we just need to compare the
// associated byte arrays.
return Arrays.equals(value1.value(), value2.value());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
index dc79b8f..83c7427 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -101,7 +101,6 @@
public void initializeSyntax(ConfigEntry configEntry)
throws ConfigException
{
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_USER_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
@@ -121,7 +120,6 @@
*/
public String getSyntaxName()
{
-
return SYNTAX_USER_PASSWORD_NAME;
}
@@ -134,7 +132,6 @@
*/
public String getOID()
{
-
return SYNTAX_USER_PASSWORD_OID;
}
@@ -147,7 +144,6 @@
*/
public String getDescription()
{
-
return SYNTAX_USER_PASSWORD_DESCRIPTION;
}
@@ -163,7 +159,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return defaultEqualityMatchingRule;
}
@@ -179,7 +174,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
// There is no ordering matching rule by default.
return null;
}
@@ -196,7 +190,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
// There is no substring matching rule by default.
return null;
}
@@ -213,7 +206,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
// There is no approximate matching rule by default.
return null;
}
@@ -235,8 +227,6 @@
public boolean valueIsAcceptable(ByteString value,
StringBuilder invalidReason)
{
-
-
// We have to accept any value here because in many cases the value will not
// have been encoded by the time this method is called.
return true;
@@ -259,8 +249,6 @@
public static String[] decodeUserPassword(String userPasswordValue)
throws DirectoryException
{
-
-
// Make sure that there actually is a value to decode.
if ((userPasswordValue == null) || (userPasswordValue.length() == 0))
{
@@ -321,8 +309,6 @@
*/
public static boolean isEncoded(ByteString value)
{
-
-
// If the value is null or empty, then it's not.
byte[] valueBytes;
if ((value == null) || ((valueBytes = value.value()).length == 0))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index ece9647..be71b80 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
@@ -96,7 +96,6 @@
public void initializeMatchingRule(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
-
// No initialization is required.
}
@@ -110,7 +109,6 @@
*/
public String getName()
{
-
return EMR_WORD_NAME;
}
@@ -123,7 +121,6 @@
*/
public String getOID()
{
-
return EMR_WORD_OID;
}
@@ -137,7 +134,6 @@
*/
public String getDescription()
{
-
// There is no standard description for this matching rule.
return null;
}
@@ -152,7 +148,6 @@
*/
public String getSyntaxOID()
{
-
return SYNTAX_DIRECTORY_STRING_OID;
}
@@ -172,7 +167,6 @@
public ByteString normalizeValue(ByteString value)
throws DirectoryException
{
-
StringBuilder buffer = new StringBuilder();
toLowerCase(value.value(), buffer, true);
@@ -222,8 +216,6 @@
*/
public boolean areEqual(ByteString value1, ByteString value2)
{
-
-
// For this purpose, the first value will be considered the attribute value,
// and the second the assertion value. See if the second value is contained
// in the first. If not, then it isn't a match.
@@ -307,7 +299,6 @@
* @return The hash code generated for the provided attribute value.*/
public int generateHashCode(AttributeValue attributeValue)
{
-
// In this case, we'll always return the same value because the matching
// isn't based on the entire value.
return 1;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
index 22d701d..c600300 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
@@ -249,7 +249,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
-
// TODO Auto-generated method stub
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 95c4412..0996049 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -1093,7 +1093,6 @@
@Override
public void run()
{
-
/* synchroThreads
* create the threads that will wait for incoming changes
* TODO : should use a pool of threads shared between all the servers
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index a83f09c..2b9d75c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -83,8 +83,6 @@
public void initializeTask()
throws DirectoryException
{
-
-
// If the client connection is available, then make sure the associated
// client has the UPDATE_SCHEMA privilege.
Operation operation = getOperation();
@@ -189,8 +187,6 @@
*/
protected TaskState runTask()
{
-
-
// Obtain a write lock on the server schema so that we can be sure nothing
// else tries to write to it at the same time.
DN schemaDN = DirectoryServer.getSchemaDN();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
index 00a93de..ec6687f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
@@ -100,8 +100,6 @@
*/
@Override public void initializeTask() throws DirectoryException
{
-
-
// If the client connection is available, then make sure the associated
// client has the BACKEND_BACKUP privilege.
Operation operation = getOperation();
@@ -534,7 +532,6 @@
*/
protected TaskState runTask()
{
-
if (!argumentsAreValid())
{
return TaskState.STOPPED_BY_ERROR;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
index 4367907..c20bf00 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
@@ -86,8 +86,6 @@
*/
@Override public void initializeTask() throws DirectoryException
{
-
-
// If the client connection is available, then make sure the associated
// client has the LDIF_EXPORT privilege.
Operation operation = getOperation();
@@ -197,7 +195,6 @@
*/
protected TaskState runTask()
{
-
// See if there were any user-defined sets of include/exclude attributes or
// filters. If so, then process them.
HashSet<AttributeType> excludeAttributes;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
index b351d02..a6f383f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -94,8 +94,6 @@
*/
@Override public void initializeTask() throws DirectoryException
{
-
-
// If the client connection is available, then make sure the associated
// client has the LDIF_IMPORT privilege.
Operation operation = getOperation();
@@ -217,7 +215,6 @@
*/
protected TaskState runTask()
{
-
// See if there were any user-defined sets of include/exclude attributes or
// filters. If so, then process them.
HashSet<AttributeType> excludeAttributes =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
index 19c5203..98e6f39 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
@@ -84,7 +84,6 @@
*/
public void run()
{
-
DirectoryServer.restart(CLASS_NAME, shutdownMessage);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
index 63bd3ee..7663e84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
@@ -81,8 +81,6 @@
*/
@Override public void initializeTask() throws DirectoryException
{
-
-
// If the client connection is available, then make sure the associated
// client has the BACKEND_RESTORE privilege.
Operation operation = getOperation();
@@ -200,7 +198,6 @@
*/
protected TaskState runTask()
{
-
// Open the backup directory and make sure it is valid.
BackupDirectory backupDir;
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
index ef90196..ae21261 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
@@ -83,8 +83,6 @@
public void initializeTask()
throws DirectoryException
{
-
-
// See if the entry contains a shutdown message. If so, then use it.
// Otherwise, use a default message.
Entry taskEntry = getTaskEntry();
@@ -170,8 +168,6 @@
*/
public TaskState runTask()
{
-
-
// This is a unique case in that the shutdown cannot finish until this task
// is finished, but this task can't really be finished until the shutdown is
// complete. To work around this catch-22, we'll spawn a separate thread
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
index 5db489e..3f4cc55 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
@@ -78,7 +78,6 @@
*/
public void run()
{
-
DirectoryServer.shutDown(CLASS_NAME, shutdownMessage);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java b/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
index 3abe4d0..da915bc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
@@ -69,7 +69,6 @@
*/
private PromptTrustManager()
{
-
// No implementation is required.
}
@@ -86,7 +85,6 @@
*/
public static TrustManager[] getTrustManagers()
{
-
return trustManagerArray;
}
@@ -106,7 +104,6 @@
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
-
int msgID = MSGID_PROMPTTM_REJECTING_CLIENT_CERT;
String message = getMessage(msgID);
throw new CertificateException(message);
@@ -127,7 +124,6 @@
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException
{
-
if ((chain == null) || (chain.length == 0))
{
System.out.println(getMessage(MSGID_PROMPTTM_NO_SERVER_CERT_CHAIN));
@@ -197,7 +193,6 @@
*/
public X509Certificate[] getAcceptedIssuers()
{
-
return new X509Certificate[0];
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
index 3400d0a..8751eb3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
@@ -67,7 +67,6 @@
AccountStatusNotificationType notificationType,
DN userDN, int messageID, String message)
{
-
this.notificationType = notificationType;
this.userDN = userDN;
this.messageID = messageID;
@@ -85,7 +84,6 @@
*/
public AccountStatusNotificationType getNotificationType()
{
-
return notificationType;
}
@@ -100,7 +98,6 @@
*/
public DN getUserDN()
{
-
return userDN;
}
@@ -115,7 +112,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
@@ -130,7 +126,6 @@
*/
public String getMessage()
{
-
return message;
}
@@ -145,7 +140,6 @@
*/
public String toString()
{
-
return "AccountStatusNotification(type=" +
notificationType.getNotificationTypeName() + ",dn=" +
userDN + ",id=" + messageID + ",message=" + message + ")";
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
index f4ed4b1..93f1be6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
@@ -80,7 +80,6 @@
*/
public Attribute(AttributeType attributeType)
{
-
this.attributeType = attributeType;
this.name = attributeType.getPrimaryName();
this.options = new LinkedHashSet<String>(0);
@@ -98,7 +97,6 @@
*/
public Attribute(AttributeType attributeType, String name)
{
-
this.attributeType = attributeType;
this.name = name;
this.options = new LinkedHashSet<String>(0);
@@ -118,7 +116,6 @@
public Attribute(AttributeType attributeType, String name,
LinkedHashSet<AttributeValue> values)
{
-
this.attributeType = attributeType;
this.name = name;
this.options = new LinkedHashSet<String>(0);
@@ -170,7 +167,6 @@
LinkedHashSet<String> options,
LinkedHashSet<AttributeValue> values)
{
-
this.attributeType = attributeType;
this.name = name;
@@ -202,7 +198,6 @@
*/
public AttributeType getAttributeType()
{
-
return attributeType;
}
@@ -215,7 +210,6 @@
*/
public String getName()
{
-
return name;
}
@@ -228,7 +222,6 @@
*/
public LinkedHashSet<String> getOptions()
{
-
return options;
}
@@ -244,7 +237,6 @@
*/
public boolean hasOption(String option)
{
-
return options.contains(option);
}
@@ -258,7 +250,6 @@
*/
public boolean hasOptions()
{
-
return ((options != null) && (! options.isEmpty()));
}
@@ -277,7 +268,6 @@
*/
public boolean hasOptions(Collection<String> options)
{
-
if (options == null)
{
return true;
@@ -309,7 +299,6 @@
*/
public boolean optionsEqual(Set<String> options)
{
-
if (options == null)
{
return this.options == null || this.options.isEmpty();
@@ -346,7 +335,6 @@
*/
public LinkedHashSet<AttributeValue> getValues()
{
-
return values;
}
@@ -359,7 +347,6 @@
*/
public void setValues(LinkedHashSet<AttributeValue> values)
{
-
if (values == null)
{
this.values = new LinkedHashSet<AttributeValue>();
@@ -380,7 +367,6 @@
*/
public boolean hasValue()
{
-
return (! values.isEmpty());
}
@@ -396,7 +382,6 @@
*/
public boolean hasValue(AttributeValue value)
{
-
return values.contains(value);
}
@@ -415,7 +400,6 @@
*/
public boolean hasAllValues(Collection<AttributeValue> values)
{
-
for (AttributeValue value : values)
{
if (! this.values.contains(value))
@@ -443,7 +427,6 @@
*/
public boolean hasAnyValue(Collection<AttributeValue> values)
{
-
for (AttributeValue value : values)
{
if (this.values.contains(value))
@@ -477,8 +460,6 @@
List<ByteString> subAny,
ByteString subFinal)
{
-
-
SubstringMatchingRule matchingRule =
attributeType.getSubstringMatchingRule();
if (matchingRule == null)
@@ -615,8 +596,6 @@
*/
public ConditionResult greaterThanOrEqualTo(AttributeValue value)
{
-
-
OrderingMatchingRule matchingRule =
attributeType.getOrderingMatchingRule();
if (matchingRule == null)
@@ -686,8 +665,6 @@
*/
public ConditionResult lessThanOrEqualTo(AttributeValue value)
{
-
-
OrderingMatchingRule matchingRule =
attributeType.getOrderingMatchingRule();
if (matchingRule == null)
@@ -757,8 +734,6 @@
*/
public ConditionResult approximatelyEqualTo(AttributeValue value)
{
-
-
ApproximateMatchingRule matchingRule =
attributeType.getApproximateMatchingRule();
if (matchingRule == null)
@@ -822,7 +797,6 @@
*/
public Attribute duplicate()
{
-
return duplicate(false);
}
@@ -839,7 +813,6 @@
*/
public Attribute duplicate(boolean omitValues)
{
-
LinkedHashSet<String> optionsCopy =
new LinkedHashSet<String>(options.size());
for (String s : options)
@@ -879,7 +852,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -920,7 +892,6 @@
*/
public int hashCode()
{
-
int hashCode = attributeType.hashCode();
for (AttributeValue value : values)
{
@@ -939,7 +910,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -956,7 +926,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("Attribute(");
buffer.append(name);
buffer.append(", {");
@@ -985,7 +954,6 @@
*/
public String toLDIF()
{
-
StringBuilder buffer = new StringBuilder();
toLDIF(buffer);
return buffer.toString();
@@ -1002,7 +970,6 @@
*/
public void toLDIF(StringBuilder buffer)
{
-
for (AttributeValue value : values)
{
buffer.append(name);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
index 03759cf..6788a9f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
@@ -365,7 +365,6 @@
*/
public String getDefinition()
{
-
return definition;
}
@@ -410,7 +409,6 @@
*/
public AttributeType getSuperiorType()
{
-
return superiorType;
}
@@ -433,7 +431,6 @@
*/
boolean mayHaveSubordinateTypes()
{
-
return mayHaveSubordinateTypes;
}
@@ -447,7 +444,6 @@
*/
void setMayHaveSubordinateTypes()
{
-
mayHaveSubordinateTypes = true;
}
@@ -460,7 +456,6 @@
*/
public AttributeSyntax getSyntax()
{
-
return syntax;
}
@@ -475,7 +470,6 @@
*/
public String getSyntaxOID()
{
-
return syntax.getOID();
}
@@ -490,7 +484,6 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
-
return approximateMatchingRule;
}
@@ -505,7 +498,6 @@
*/
public EqualityMatchingRule getEqualityMatchingRule()
{
-
return equalityMatchingRule;
}
@@ -520,7 +512,6 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
-
return orderingMatchingRule;
}
@@ -535,7 +526,6 @@
*/
public SubstringMatchingRule getSubstringMatchingRule()
{
-
return substringMatchingRule;
}
@@ -548,7 +538,6 @@
*/
public AttributeUsage getUsage()
{
-
return attributeUsage;
}
@@ -565,7 +554,6 @@
*/
public boolean isOperational()
{
-
return attributeUsage.isOperational();
}
@@ -579,7 +567,6 @@
*/
public boolean isCollective()
{
-
return isCollective;
}
@@ -594,7 +581,6 @@
*/
public boolean isNoUserModification()
{
-
return isNoUserModification;
}
@@ -608,7 +594,6 @@
*/
public boolean isSingleValue()
{
-
return isSingleValue;
}
@@ -624,7 +609,6 @@
*/
public boolean isObjectClassType()
{
-
return isObjectClassType;
}
@@ -646,7 +630,6 @@
public ByteString normalize(ByteString value)
throws DirectoryException
{
-
if (equalityMatchingRule == null)
{
int msgID = MSGID_ATTR_TYPE_NORMALIZE_NO_MR;
@@ -676,7 +659,6 @@
*/
public int generateHashCode(AttributeValue value)
{
-
try
{
if (equalityMatchingRule == null)
@@ -726,7 +708,6 @@
*/
protected void toStringContent(StringBuilder buffer)
{
-
if (superiorType != null)
{
buffer.append(" SUP ");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
index da72fc2..75b5811 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
@@ -75,7 +75,6 @@
*/
public AttributeValue(AttributeType attributeType, ByteString value)
{
-
ensureNotNull(attributeType, value);
this.attributeType = attributeType;
@@ -96,7 +95,6 @@
*/
public AttributeValue(AttributeType attributeType, String value)
{
-
ensureNotNull(attributeType, value);
this.attributeType = attributeType;
@@ -119,7 +117,6 @@
*/
public AttributeValue(ByteString value, ByteString normalizedValue)
{
-
ensureNotNull(value, normalizedValue);
this.value = value;
@@ -137,7 +134,6 @@
*/
public ByteString getValue()
{
-
return value;
}
@@ -150,7 +146,6 @@
*/
public byte[] getValueBytes()
{
-
return value.value();
}
@@ -165,7 +160,6 @@
*/
public String getStringValue()
{
-
return value.stringValue();
}
@@ -184,7 +178,6 @@
public ByteString getNormalizedValue()
throws DirectoryException
{
-
if (normalizedValue == null)
{
normalizedValue = attributeType.normalize(value);
@@ -210,7 +203,6 @@
public byte[] getNormalizedValueBytes()
throws DirectoryException
{
-
return getNormalizedValue().value();
}
@@ -231,7 +223,6 @@
public String getNormalizedStringValue()
throws DirectoryException
{
-
if (normalizedValue == null)
{
normalizedValue = attributeType.normalize(value);
@@ -251,7 +242,6 @@
*/
public String getDNStringValue()
{
-
return getDNValue(getStringValue());
}
@@ -272,7 +262,6 @@
public String getNormalizedDNStringValue()
throws DirectoryException
{
-
return getDNValue(getNormalizedStringValue());
}
@@ -289,7 +278,6 @@
*/
private static String getDNValue(String value)
{
-
if ((value == null) || (value.length() == 0))
{
return "";
@@ -365,7 +353,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -441,7 +428,6 @@
*/
public int hashCode()
{
-
try
{
if (attributeType == null)
@@ -480,7 +466,6 @@
*/
public String toString()
{
-
if (value == null)
{
return "null";
@@ -502,7 +487,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(value.toString());
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
index 6103c03..f4803a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
@@ -84,7 +84,6 @@
*/
public AuthenticationInfo()
{
-
isAuthenticated = false;
isRoot = false;
mustChangePassword = false;
@@ -109,7 +108,6 @@
*/
public AuthenticationInfo(Entry authenticationEntry, boolean isRoot)
{
-
this.authenticationEntry = authenticationEntry;
this.isRoot = isRoot;
@@ -141,7 +139,6 @@
public AuthenticationInfo(Entry authenticationEntry,
ByteString simplePassword, boolean isRoot)
{
-
ensureNotNull(authenticationEntry, simplePassword);
this.authenticationEntry = authenticationEntry;
@@ -176,7 +173,6 @@
public AuthenticationInfo(Entry authenticationEntry,
String saslMechanism, boolean isRoot)
{
-
ensureNotNull(authenticationEntry, saslMechanism);
this.authenticationEntry = authenticationEntry;
@@ -220,7 +216,6 @@
Entry authorizationEntry,
String saslMechanism, boolean isRoot)
{
-
ensureNotNull(authenticationEntry, saslMechanism);
this.authenticationEntry = authenticationEntry;
@@ -249,7 +244,6 @@
*/
public boolean isAuthenticated()
{
-
return isAuthenticated;
}
@@ -261,7 +255,6 @@
*/
public void setUnauthenticated()
{
-
isAuthenticated = false;
isRoot = false;
mustChangePassword = false;
@@ -283,7 +276,6 @@
*/
public boolean isRoot()
{
-
return isRoot;
}
@@ -299,7 +291,6 @@
*/
public boolean mustChangePassword()
{
-
return mustChangePassword;
}
@@ -316,7 +307,6 @@
*/
public void setMustChangePassword(boolean mustChangePassword)
{
-
this.mustChangePassword = mustChangePassword;
}
@@ -335,7 +325,6 @@
public boolean hasAuthenticationType(AuthenticationType
authenticationType)
{
-
return authenticationTypes.contains(authenticationType);
}
@@ -355,7 +344,6 @@
public boolean hasAnyAuthenticationType(
Collection<AuthenticationType> types)
{
-
for (AuthenticationType t : types)
{
if (authenticationTypes.contains(t))
@@ -377,7 +365,6 @@
*/
public Set<AuthenticationType> getAuthenticationTypes()
{
-
return authenticationTypes;
}
@@ -395,7 +382,6 @@
public void addAuthenticationType(AuthenticationType
authenticationType)
{
-
authenticationTypes.add(authenticationType);
}
@@ -411,7 +397,6 @@
*/
public Entry getAuthenticationEntry()
{
-
return authenticationEntry;
}
@@ -425,7 +410,6 @@
*/
public DN getAuthenticationDN()
{
-
if (authenticationEntry == null)
{
return null;
@@ -449,7 +433,6 @@
*/
public Entry getAuthorizationEntry()
{
-
return authorizationEntry;
}
@@ -466,7 +449,6 @@
*/
public DN getAuthorizationDN()
{
-
if (authorizationEntry == null)
{
return null;
@@ -489,7 +471,6 @@
*/
public ByteString getSimplePassword()
{
-
return simplePassword;
}
@@ -508,7 +489,6 @@
*/
public boolean hasSASLMechanism(String saslMechanism)
{
-
return saslMechanisms.contains(saslMechanism);
}
@@ -527,7 +507,6 @@
*/
public boolean hasAnySASLMechanism(Collection<String> mechanisms)
{
-
for (String s : mechanisms)
{
if (saslMechanisms.contains(s))
@@ -551,7 +530,6 @@
*/
public Set<String> getSASLMechanisms()
{
-
return saslMechanisms;
}
@@ -569,7 +547,6 @@
*/
public void addSASLMechanism(String saslMechanism)
{
-
saslMechanisms.add(saslMechanism);
}
@@ -584,7 +561,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
@@ -602,7 +578,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("AuthenticationInfo(isAuthenticated=");
buffer.append(isAuthenticated);
buffer.append(",isRoot=");
@@ -701,7 +676,6 @@
public AuthenticationInfo duplicate(Entry newAuthenticationEntry,
Entry newAuthorizationEntry)
{
-
AuthenticationInfo authInfo = new AuthenticationInfo();
authInfo.simplePassword = simplePassword;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
index 0cf8952..4804f61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
@@ -96,7 +96,6 @@
public BackupConfig(BackupDirectory backupDirectory,
String backupID, boolean isIncremental)
{
-
this.backupDirectory = backupDirectory;
this.backupID = backupID;
this.isIncremental = isIncremental;
@@ -113,7 +112,6 @@
*/
public BackupDirectory getBackupDirectory()
{
-
return backupDirectory;
}
@@ -130,7 +128,6 @@
*/
public String getBackupID()
{
-
return backupID;
}
@@ -147,7 +144,6 @@
*/
public boolean isIncremental()
{
-
return isIncremental;
}
@@ -165,7 +161,6 @@
*/
public String getIncrementalBaseID()
{
-
return incrementalBaseID;
}
@@ -181,7 +176,6 @@
*/
public void setIncrementalBaseID(String incrementalBaseID)
{
-
this.incrementalBaseID = incrementalBaseID;
}
@@ -197,7 +191,6 @@
*/
public boolean compressData()
{
-
return compressData;
}
@@ -212,7 +205,6 @@
*/
public void setCompressData(boolean compressData)
{
-
this.compressData = compressData;
}
@@ -228,7 +220,6 @@
*/
public boolean encryptData()
{
-
return encryptData;
}
@@ -243,7 +234,6 @@
*/
public void setEncryptData(boolean encryptData)
{
-
this.encryptData = encryptData;
}
@@ -260,7 +250,6 @@
*/
public boolean hashData()
{
-
return hashData;
}
@@ -275,7 +264,6 @@
*/
public void setHashData(boolean hashData)
{
-
this.hashData = hashData;
}
@@ -293,7 +281,6 @@
*/
public boolean signHash()
{
-
return signHash;
}
@@ -308,7 +295,6 @@
*/
public void setSignHash(boolean signHash)
{
-
this.signHash = signHash;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
index ce8cd85..1241c5e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
@@ -96,7 +96,6 @@
*/
public BackupDirectory(String path, DN configEntryDN)
{
-
this.path = path;
this.configEntryDN = configEntryDN;
@@ -120,7 +119,6 @@
public BackupDirectory(String path, DN configEntryDN,
LinkedHashMap<String,BackupInfo> backups)
{
-
this.path = path;
this.configEntryDN = configEntryDN;
@@ -144,7 +142,6 @@
*/
public String getPath()
{
-
return path;
}
@@ -159,7 +156,6 @@
*/
public DN getConfigEntryDN()
{
-
return configEntryDN;
}
@@ -175,7 +171,6 @@
*/
public LinkedHashMap<String,BackupInfo> getBackups()
{
-
return backups;
}
@@ -192,7 +187,6 @@
*/
public BackupInfo getBackupInfo(String backupID)
{
-
return backups.get(backupID);
}
@@ -208,7 +202,6 @@
*/
public BackupInfo getLatestBackup()
{
-
BackupInfo latestBackup = null;
for (BackupInfo backup : backups.values())
{
@@ -244,7 +237,6 @@
public void addBackup(BackupInfo backupInfo)
throws ConfigException
{
-
String backupID = backupInfo.getBackupID();
if (backups.containsKey(backupID))
{
@@ -273,7 +265,6 @@
public void removeBackup(String backupID)
throws ConfigException
{
-
if (! backups.containsKey(backupID))
{
int msgID = MSGID_BACKUPDIRECTORY_NO_SUCH_BACKUP;
@@ -306,7 +297,6 @@
*/
public String getDescriptorPath()
{
-
return path + File.separator + BACKUP_DIRECTORY_DESCRIPTOR_FILE;
}
@@ -321,8 +311,6 @@
public void writeBackupDirectoryDescriptor()
throws IOException
{
-
-
// First make sure that the target directory exists. If it
// doesn't, then try to create it.
File dir = new File(path);
@@ -489,8 +477,6 @@
readBackupDirectoryDescriptor(String path)
throws IOException, ConfigException
{
-
-
// Make sure that the descriptor file exists.
String descriptorFilePath = path + File.separator +
BACKUP_DIRECTORY_DESCRIPTOR_FILE;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
index e709968..fe7ab42 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
@@ -203,7 +203,6 @@
HashSet<String> dependencies,
HashMap<String,String> backupProperties)
{
-
this.backupDirectory = backupDirectory;
this.backupID = backupID;
this.backupDate = backupDate;
@@ -243,7 +242,6 @@
*/
public BackupDirectory getBackupDirectory()
{
-
return backupDirectory;
}
@@ -256,7 +254,6 @@
*/
public String getBackupID()
{
-
return backupID;
}
@@ -282,7 +279,6 @@
*/
public boolean isIncremental()
{
-
return isIncremental;
}
@@ -296,7 +292,6 @@
*/
public boolean isCompressed()
{
-
return isCompressed;
}
@@ -310,7 +305,6 @@
*/
public boolean isEncrypted()
{
-
return isEncrypted;
}
@@ -325,7 +319,6 @@
*/
public byte[] getUnsignedHash()
{
-
return unsignedHash;
}
@@ -340,7 +333,6 @@
*/
public byte[] getSignedHash()
{
-
return signedHash;
}
@@ -359,7 +351,6 @@
*/
public HashSet<String> getDependencies()
{
-
return dependencies;
}
@@ -378,7 +369,6 @@
*/
public boolean dependsOn(String backupID)
{
-
return dependencies.contains(backupID);
}
@@ -399,7 +389,6 @@
*/
public HashMap<String,String> getBackupProperties()
{
-
return backupProperties;
}
@@ -416,7 +405,6 @@
*/
public String getBackupProperty(String name)
{
-
return backupProperties.get(name);
}
@@ -432,7 +420,6 @@
*/
public LinkedList<String> encode()
{
-
LinkedList<String> list = new LinkedList<String>();
SimpleDateFormat dateFormat =
new SimpleDateFormat(DATE_FORMAT_UTC_TIME);
@@ -508,7 +495,6 @@
LinkedList<String> encodedInfo)
throws ConfigException
{
-
String backupID = null;
Date backupDate = null;
boolean isIncremental = false;
@@ -653,7 +639,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -670,7 +655,6 @@
*/
public void toString(StringBuilder buffer)
{
-
LinkedList<String> lines = encode();
for (String line : lines)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java b/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
index 43c1052..11820af 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
@@ -49,7 +49,6 @@
*/
public static ByteString create()
{
-
return new ASN1OctetString();
}
@@ -67,7 +66,6 @@
*/
public static ByteString create(byte[] value)
{
-
return new ASN1OctetString(value);
}
@@ -85,7 +83,6 @@
*/
public static ByteString create(String value)
{
-
return new ASN1OctetString(value);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java b/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
index fd995cd..52352ec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
@@ -62,7 +62,6 @@
*/
public CacheEntry(Entry entry, Backend backend, long entryID)
{
-
this.entry = entry;
this.backend = backend;
this.entryID = entryID;
@@ -77,7 +76,6 @@
*/
public Entry getEntry()
{
-
return entry;
}
@@ -90,7 +88,6 @@
*/
public void setEntry(Entry entry)
{
-
this.entry = entry;
}
@@ -103,7 +100,6 @@
*/
public Backend getBackend()
{
-
return backend;
}
@@ -116,7 +112,6 @@
*/
public void setBackend(Backend backend)
{
-
this.backend = backend;
}
@@ -129,7 +124,6 @@
*/
public long getEntryID()
{
-
return entryID;
}
@@ -142,7 +136,6 @@
*/
public void setEntryID(long entryID)
{
-
this.entryID = entryID;
}
@@ -155,7 +148,6 @@
*/
public DN getDN()
{
-
return entry.getDN();
}
@@ -169,7 +161,6 @@
*/
public int hashCode()
{
-
return (int) entryID;
}
@@ -187,7 +178,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java b/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
index afe3149..9c320c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
@@ -64,7 +64,6 @@
public CancelRequest(boolean notifyOriginalRequestor,
String cancelReason)
{
-
this.notifyOriginalRequestor = notifyOriginalRequestor;
this.cancelReason = cancelReason;
this.responseMessage = new StringBuilder();
@@ -90,7 +89,6 @@
String cancelReason,
StringBuilder responseMessage)
{
-
this.notifyOriginalRequestor = notifyOriginalRequestor;
this.cancelReason = cancelReason;
this.responseMessage = responseMessage;
@@ -108,7 +106,6 @@
*/
public final boolean notifyOriginalRequestor()
{
-
return notifyOriginalRequestor;
}
@@ -123,7 +120,6 @@
*/
public final String getCancelReason()
{
-
return cancelReason;
}
@@ -140,7 +136,6 @@
*/
public final StringBuilder getResponseMessage()
{
-
return responseMessage;
}
@@ -155,7 +150,6 @@
*/
public final void addResponseMessage(String message)
{
-
responseMessage.append(message);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java b/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
index e7a523a..6a8b5bc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
@@ -108,7 +108,6 @@
*/
public final CancelResult getCancelResult()
{
-
return cancelResult;
}
@@ -124,7 +123,6 @@
*/
public final int getMessageID()
{
-
return messageID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
index 41986e3..64209a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
@@ -72,7 +72,6 @@
public ConfigChangeResult(ResultCode resultCode,
boolean adminActionRequired)
{
-
this.resultCode = resultCode;
this.adminActionRequired = adminActionRequired;
this.messages = new ArrayList<String>();
@@ -97,7 +96,6 @@
boolean adminActionRequired,
ArrayList<String> messages)
{
-
this.resultCode = resultCode;
this.adminActionRequired = adminActionRequired;
this.messages = messages;
@@ -112,7 +110,6 @@
*/
public ResultCode getResultCode()
{
-
return resultCode;
}
@@ -126,7 +123,6 @@
*/
public void setResultCode(ResultCode resultCode)
{
-
this.resultCode = resultCode;
}
@@ -142,7 +138,6 @@
*/
public boolean adminActionRequired()
{
-
return adminActionRequired;
}
@@ -159,7 +154,6 @@
*/
public void setAdminActionRequired(boolean adminActionRequired)
{
-
this.adminActionRequired = adminActionRequired;
}
@@ -175,7 +169,6 @@
*/
public List<String> getMessages()
{
-
return messages;
}
@@ -190,7 +183,6 @@
*/
public void addMessage(String message)
{
-
messages.add(message);
}
@@ -203,7 +195,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -220,7 +211,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("ConfigChangeResult(result=");
buffer.append(resultCode.toString());
buffer.append(", adminActionRequired=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Control.java b/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
index 2ab7835..e37dff4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
@@ -63,7 +63,6 @@
*/
public Control(String oid, boolean isCritical)
{
-
this.oid = oid;
this.isCritical = isCritical;
this.value = null;
@@ -83,7 +82,6 @@
public Control(String oid, boolean isCritical,
ASN1OctetString value)
{
-
this.oid = oid;
this.isCritical = isCritical;
this.value = value;
@@ -98,7 +96,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -111,7 +108,6 @@
*/
public void setOID(String oid)
{
-
this.oid = oid;
}
@@ -126,7 +122,6 @@
*/
public boolean isCritical()
{
-
return isCritical;
}
@@ -142,7 +137,6 @@
*/
public void setCritical(boolean isCritical)
{
-
this.isCritical = isCritical;
}
@@ -156,7 +150,6 @@
*/
public ASN1OctetString getValue()
{
-
return value;
}
@@ -170,7 +163,6 @@
*/
public boolean hasValue()
{
-
return (value != null);
}
@@ -183,7 +175,6 @@
*/
public void setValue(ASN1OctetString value)
{
-
this.value = value;
}
@@ -196,7 +187,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -213,7 +203,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("Control(oid=");
buffer.append(oid);
buffer.append(",isCritical=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
index af6b081..7b1da3b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -101,7 +101,6 @@
public CryptoManager()
throws ConfigException, InitializationException
{
-
// FIXME -- Get the defaults from the configuration rather than
// hard-coding them.
preferredDigestAlgorithm = "SHA-1";
@@ -179,7 +178,6 @@
*/
public SecureRandom getSecureRandom()
{
-
// FIXME -- Is this threadsafe? Can we share a single instance
// among all threads?
return new SecureRandom();
@@ -194,7 +192,6 @@
*/
public String getPreferredMessageDigestAlgorithm()
{
-
return preferredDigestAlgorithm;
}
@@ -214,7 +211,6 @@
public MessageDigest getPreferredMessageDigest()
throws NoSuchAlgorithmException
{
-
return MessageDigest.getInstance(preferredDigestAlgorithm);
}
@@ -237,7 +233,6 @@
public MessageDigest getMessageDigest(String digestAlgorithm)
throws NoSuchAlgorithmException
{
-
return MessageDigest.getInstance(digestAlgorithm);
}
@@ -258,7 +253,6 @@
public byte[] digest(byte[] data)
throws NoSuchAlgorithmException
{
-
return MessageDigest.getInstance(preferredDigestAlgorithm).
digest(data);
}
@@ -282,7 +276,6 @@
public byte[] digest(String digestAlgorithm, byte[] data)
throws NoSuchAlgorithmException
{
-
return MessageDigest.getInstance(digestAlgorithm).digest(data);
}
@@ -309,7 +302,6 @@
public byte[] digest(InputStream inputStream)
throws IOException, NoSuchAlgorithmException
{
-
MessageDigest digest =
MessageDigest.getInstance(preferredDigestAlgorithm);
@@ -354,7 +346,6 @@
InputStream inputStream)
throws IOException, NoSuchAlgorithmException
{
-
MessageDigest digest = MessageDigest.getInstance(digestAlgorithm);
byte[] buffer = new byte[8192];
@@ -381,7 +372,6 @@
*/
public String getPreferredMACAlgorithm()
{
-
return preferredMACAlgorithm;
}
@@ -403,7 +393,6 @@
public Mac getPreferredMACProvider()
throws NoSuchAlgorithmException, InvalidKeyException
{
-
Mac mac = Mac.getInstance(preferredMACAlgorithm);
mac.init(secretKey);
@@ -430,7 +419,6 @@
public Mac getMACProvider(String macAlgorithm)
throws NoSuchAlgorithmException, InvalidKeyException
{
-
Mac mac = Mac.getInstance(macAlgorithm);
mac.init(secretKey);
@@ -454,7 +442,6 @@
public byte[] mac(byte[] data)
throws NoSuchAlgorithmException
{
-
return Mac.getInstance(preferredMACAlgorithm).doFinal(data);
}
@@ -476,7 +463,6 @@
public byte[] mac(String macAlgorithm, byte[] data)
throws NoSuchAlgorithmException
{
-
return Mac.getInstance(macAlgorithm).doFinal(data);
}
@@ -503,7 +489,6 @@
public byte[] mac(InputStream inputStream)
throws IOException, NoSuchAlgorithmException
{
-
Mac mac = Mac.getInstance(preferredMACAlgorithm);
byte[] buffer = new byte[8192];
@@ -545,7 +530,6 @@
public byte[] mac(String macAlgorithm, InputStream inputStream)
throws IOException, NoSuchAlgorithmException
{
-
Mac mac = Mac.getInstance(macAlgorithm);
byte[] buffer = new byte[8192];
@@ -572,7 +556,6 @@
*/
public String getPreferredCipherAlgorithm()
{
-
return preferredCipher;
}
@@ -609,7 +592,6 @@
InvalidKeyException,
InvalidAlgorithmParameterException
{
-
Cipher cipher = Cipher.getInstance(preferredCipher);
// FIXME -- This needs to be more secure.
@@ -654,7 +636,6 @@
InvalidKeyException,
InvalidAlgorithmParameterException
{
-
Cipher cipher = Cipher.getInstance(cipherAlgorithm);
// FIXME -- This needs to be more secure.
@@ -683,7 +664,6 @@
public byte[] encrypt(byte[] data)
throws GeneralSecurityException
{
-
Cipher cipher = Cipher.getInstance(preferredCipher);
// FIXME -- This needs to be more secure.
@@ -711,7 +691,6 @@
public byte[] decrypt(byte[] data)
throws GeneralSecurityException
{
-
Cipher cipher = Cipher.getInstance(preferredCipher);
// FIXME -- This needs to be more secure.
@@ -741,7 +720,6 @@
public byte[] encrypt(String cipherAlgorithm, byte[] data)
throws GeneralSecurityException
{
-
Cipher cipher = Cipher.getInstance(cipherAlgorithm);
// FIXME -- This needs to be more secure.
@@ -771,7 +749,6 @@
public byte[] decrypt(String cipherAlgorithm, byte[] data)
throws GeneralSecurityException
{
-
Cipher cipher = Cipher.getInstance(cipherAlgorithm);
// FIXME -- This needs to be more secure.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java b/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
index 00f6fb5..94ffd4d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
@@ -131,7 +131,6 @@
boolean isObsolete,
Map<String,List<String>> extraProperties)
{
-
ensureNotNull(definition, structuralClass);
this.definition = definition;
@@ -212,7 +211,6 @@
*/
public String getDefinition()
{
-
return definition;
}
@@ -255,7 +253,6 @@
*/
public ObjectClass getStructuralClass()
{
-
return structuralClass;
}
@@ -272,7 +269,6 @@
*/
public Map<String,String> getNames()
{
-
return names;
}
@@ -287,7 +283,6 @@
*/
public String getName()
{
-
if (names.isEmpty())
{
return null;
@@ -313,7 +308,6 @@
*/
public boolean hasName(String lowerName)
{
-
return names.containsKey(lowerName);
}
@@ -329,7 +323,6 @@
*/
public String getSchemaFile()
{
-
List<String> values =
extraProperties.get(SCHEMA_PROPERTY_FILENAME);
if ((values == null) || values.isEmpty())
@@ -351,7 +344,6 @@
*/
public void setSchemaFile(String schemaFile)
{
-
setExtraProperty(SCHEMA_PROPERTY_FILENAME, schemaFile);
}
@@ -365,7 +357,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -380,7 +371,6 @@
*/
public Set<ObjectClass> getAuxiliaryClasses()
{
-
return auxiliaryClasses;
}
@@ -399,7 +389,6 @@
*/
public boolean isAllowedAuxiliaryClass(ObjectClass auxiliaryClass)
{
-
return auxiliaryClasses.contains(auxiliaryClass);
}
@@ -414,7 +403,6 @@
*/
public Set<AttributeType> getRequiredAttributes()
{
-
return requiredAttributes;
}
@@ -432,7 +420,6 @@
*/
public boolean isRequired(AttributeType attributeType)
{
-
return requiredAttributes.contains(attributeType);
}
@@ -447,7 +434,6 @@
*/
public Set<AttributeType> getOptionalAttributes()
{
-
return optionalAttributes;
}
@@ -465,7 +451,6 @@
*/
public boolean isOptional(AttributeType attributeType)
{
-
return optionalAttributes.contains(attributeType);
}
@@ -484,7 +469,6 @@
*/
public boolean isRequiredOrOptional(AttributeType attributeType)
{
-
return (requiredAttributes.contains(attributeType) ||
optionalAttributes.contains(attributeType));
}
@@ -510,7 +494,6 @@
public boolean isRequiredOrOptional(AttributeType attributeType,
boolean acceptEmpty)
{
-
if (acceptEmpty &&
(requiredAttributes.isEmpty() ||
optionalAttributes.isEmpty()))
@@ -533,7 +516,6 @@
*/
public Set<AttributeType> getProhibitedAttributes()
{
-
return prohibitedAttributes;
}
@@ -552,7 +534,6 @@
*/
public boolean isProhibited(AttributeType attributeType)
{
-
return prohibitedAttributes.contains(attributeType);
}
@@ -566,7 +547,6 @@
*/
public boolean isObsolete()
{
-
return isObsolete;
}
@@ -583,7 +563,6 @@
*/
public Map<String,List<String>> getExtraProperties()
{
-
return extraProperties;
}
@@ -602,7 +581,6 @@
*/
public List<String> getExtraProperty(String propertyName)
{
-
return extraProperties.get(propertyName);
}
@@ -619,7 +597,6 @@
*/
public void setExtraProperty(String name, String value)
{
-
ensureNotNull(name);
if (value == null)
@@ -648,7 +625,6 @@
*/
public void setExtraProperty(String name, List<String> values)
{
-
ensureNotNull(name);
if ((values == null) || values.isEmpty())
@@ -680,7 +656,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -724,7 +699,6 @@
*/
public int hashCode()
{
-
return structuralClass.hashCode();
}
@@ -739,7 +713,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer, true);
return buffer.toString();
@@ -761,7 +734,6 @@
public void toString(StringBuilder buffer,
boolean includeFileElement)
{
-
buffer.append("( ");
buffer.append(structuralClass.getOID());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java b/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
index b947110..10778c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
@@ -111,7 +111,6 @@
Set<DITStructureRule> superiorRules,
Map<String,List<String>> extraProperties)
{
-
ensureNotNull(definition);
this.definition = definition;
@@ -162,7 +161,6 @@
*/
public String getDefinition()
{
-
return definition;
}
@@ -209,7 +207,6 @@
*/
public Map<String,String> getNames()
{
-
return names;
}
@@ -226,7 +223,6 @@
*/
public boolean hasName(String lowerName)
{
-
return names.containsKey(lowerName);
}
@@ -239,7 +235,6 @@
*/
public int getRuleID()
{
-
return ruleID;
}
@@ -254,7 +249,6 @@
*/
public String getNameOrRuleID()
{
-
if (names.isEmpty())
{
return String.valueOf(ruleID);
@@ -277,7 +271,6 @@
*/
public String getSchemaFile()
{
-
List<String> values =
extraProperties.get(SCHEMA_PROPERTY_FILENAME);
if ((values == null) || values.isEmpty())
@@ -299,7 +292,6 @@
*/
public void setSchemaFile(String schemaFile)
{
-
setExtraProperty(SCHEMA_PROPERTY_FILENAME, schemaFile);
}
@@ -312,7 +304,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -325,7 +316,6 @@
*/
public NameForm getNameForm()
{
-
return nameForm;
}
@@ -340,7 +330,6 @@
*/
public ObjectClass getStructuralClass()
{
-
return nameForm.getStructuralClass();
}
@@ -353,7 +342,6 @@
*/
public Set<DITStructureRule> getSuperiorRules()
{
-
return superiorRules;
}
@@ -368,7 +356,6 @@
*/
public boolean hasSuperiorRules()
{
-
return ((superiorRules != null) && (! superiorRules.isEmpty()));
}
@@ -382,7 +369,6 @@
*/
public boolean isObsolete()
{
-
return isObsolete;
}
@@ -399,7 +385,6 @@
*/
public Map<String,List<String>> getExtraProperties()
{
-
return extraProperties;
}
@@ -418,7 +403,6 @@
*/
public List<String> getExtraProperty(String propertyName)
{
-
return extraProperties.get(propertyName);
}
@@ -435,7 +419,6 @@
*/
public void setExtraProperty(String name, String value)
{
-
ensureNotNull(name);
if (value == null)
@@ -464,7 +447,6 @@
*/
public void setExtraProperty(String name, List<String> values)
{
-
ensureNotNull(name);
if ((values == null) || values.isEmpty())
@@ -492,7 +474,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -516,7 +497,6 @@
*/
public int hashCode()
{
-
return ruleID;
}
@@ -531,7 +511,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer, true);
return buffer.toString();
@@ -553,7 +532,6 @@
public void toString(StringBuilder buffer,
boolean includeFileElement)
{
-
buffer.append("( ");
buffer.append(ruleID);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DN.java b/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
index 519cda7..c50c6e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
@@ -119,7 +119,6 @@
*/
public DN(RDN[] rdnComponents)
{
-
if (rdnComponents == null)
{
this.rdnComponents = new RDN[0];
@@ -145,7 +144,6 @@
*/
public DN(ArrayList<RDN> rdnComponents)
{
-
if ((rdnComponents == null) || rdnComponents.isEmpty())
{
this.rdnComponents = new RDN[0];
@@ -170,7 +168,6 @@
*/
public static DN nullDN()
{
-
return NULL_DN;
}
@@ -186,7 +183,6 @@
*/
public boolean isNullDN()
{
-
return (numComponents == 0);
}
@@ -199,7 +195,6 @@
*/
public int getNumComponents()
{
-
return numComponents;
}
@@ -215,7 +210,6 @@
*/
public RDN getRDN()
{
-
if (numComponents == 0)
{
return null;
@@ -239,7 +233,6 @@
*/
public RDN getRDN(int pos)
{
-
return rdnComponents[pos];
}
@@ -257,7 +250,6 @@
*/
public DN getParent()
{
-
if (numComponents <= 1)
{
return null;
@@ -286,7 +278,6 @@
*/
public DN getParentDNInSuffix()
{
-
if ((numComponents <= 1) ||
DirectoryServer.isNamingContext(this))
{
@@ -312,7 +303,6 @@
*/
public DN concat(RDN rdn)
{
-
RDN[] newComponents = new RDN[rdnComponents.length+1];
newComponents[0] = rdn;
System.arraycopy(rdnComponents, 0, newComponents, 1,
@@ -335,7 +325,6 @@
*/
public DN concat(RDN[] rdnComponents)
{
-
RDN[] newComponents =
new RDN[rdnComponents.length+this.rdnComponents.length];
System.arraycopy(rdnComponents, 0, newComponents, 0,
@@ -362,7 +351,6 @@
*/
public DN concat(DN relativeBaseDN)
{
-
RDN[] newComponents =
new RDN[rdnComponents.length+
relativeBaseDN.rdnComponents.length];
@@ -390,7 +378,6 @@
*/
public boolean isDescendantOf(DN dn)
{
-
int offset = numComponents - dn.numComponents;
if (offset < 0)
{
@@ -422,7 +409,6 @@
*/
public boolean isAncestorOf(DN dn)
{
-
int offset = dn.numComponents - numComponents;
if (offset < 0)
{
@@ -456,8 +442,6 @@
public static DN decode(ByteString dnString)
throws DirectoryException
{
-
-
// A null or empty DN is acceptable.
if (dnString == null)
{
@@ -860,8 +844,6 @@
public static DN decode(String dnString)
throws DirectoryException
{
-
-
// A null or empty DN is acceptable.
if (dnString == null)
{
@@ -1259,7 +1241,6 @@
boolean allowExceptions)
throws DirectoryException
{
-
int length = dnBytes.length;
@@ -1678,7 +1659,6 @@
boolean allowExceptions)
throws DirectoryException
{
-
int length = dnString.length();
@@ -2088,8 +2068,6 @@
ByteString attributeValue)
throws DirectoryException
{
-
-
// All leading spaces have already been stripped so we can start
// reading the value. However, it may be empty so check for that.
int length = dnBytes.length;
@@ -2361,8 +2339,6 @@
ByteString attributeValue)
throws DirectoryException
{
-
-
// All leading spaces have already been stripped so we can start
// reading the value. However, it may be empty so check for that.
int length = dnString.length();
@@ -2725,7 +2701,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -2766,7 +2741,6 @@
*/
public int hashCode()
{
-
return normalizedDN.hashCode();
}
@@ -2779,7 +2753,6 @@
*/
public String toString()
{
-
if (dnString == null)
{
if (numComponents == 0)
@@ -2815,7 +2788,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(toString());
}
@@ -2828,7 +2800,6 @@
*/
public String toNormalizedString()
{
-
if (normalizedDN == null)
{
if (numComponents == 0)
@@ -2864,7 +2835,6 @@
*/
public void toNormalizedString(StringBuilder buffer)
{
-
buffer.append(toNormalizedString());
}
@@ -2885,7 +2855,6 @@
*/
public int compareTo(DN dn)
{
-
if (equals(dn))
{
return 0;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
index 5ccefec..da055d5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
@@ -74,7 +74,6 @@
*/
public static final CryptoManager getCryptoManager()
{
-
return DirectoryServer.getCryptoManager();
}
@@ -89,7 +88,6 @@
*/
public static final OperatingSystem getOperatingSystem()
{
-
return DirectoryServer.getOperatingSystem();
}
@@ -104,7 +102,6 @@
*/
public static final ConfigHandler getConfigHandler()
{
-
return DirectoryServer.getConfigHandler();
}
@@ -125,7 +122,6 @@
public static final ConfigEntry getConfigEntry(DN entryDN)
throws ConfigException
{
-
return DirectoryServer.getConfigEntry(entryDN);
}
@@ -140,7 +136,6 @@
*/
public static final String getServerRoot()
{
-
return DirectoryServer.getServerRoot();
}
@@ -155,7 +150,6 @@
*/
public static final long getStartTime()
{
-
return DirectoryServer.getStartTime();
}
@@ -170,7 +164,6 @@
*/
public static final String getStartTimeUTC()
{
-
return DirectoryServer.getStartTimeUTC();
}
@@ -183,7 +176,6 @@
*/
public static final Schema getSchema()
{
-
return DirectoryServer.getSchema();
}
@@ -202,7 +194,6 @@
*/
public static Map<String,MatchingRule> getMatchingRules()
{
-
return DirectoryServer.getMatchingRules();
}
@@ -219,7 +210,6 @@
*/
public static final MatchingRule getMatchingRule(String lowerName)
{
-
return DirectoryServer.getMatchingRule(lowerName);
}
@@ -239,7 +229,6 @@
public static final ApproximateMatchingRule
getApproximateMatchingRule(String lowerName)
{
-
return DirectoryServer.getApproximateMatchingRule(lowerName);
}
@@ -259,7 +248,6 @@
public static final EqualityMatchingRule
getEqualityMatchingRule(String lowerName)
{
-
return DirectoryServer.getEqualityMatchingRule(lowerName);
}
@@ -279,7 +267,6 @@
public static final OrderingMatchingRule
getOrderingMatchingRule(String lowerName)
{
-
return DirectoryServer.getOrderingMatchingRule(lowerName);
}
@@ -299,7 +286,6 @@
public static final SubstringMatchingRule
getSubstringMatchingRule(String lowerName)
{
-
return DirectoryServer.getSubstringMatchingRule(lowerName);
}
@@ -318,7 +304,6 @@
*/
public static final Map<String,ObjectClass> getObjectClasses()
{
-
return DirectoryServer.getObjectClasses();
}
@@ -343,7 +328,6 @@
public static final ObjectClass
getObjectClass(String lowerName, boolean returnDefault)
{
-
return DirectoryServer.getObjectClass(lowerName, returnDefault);
}
@@ -358,7 +342,6 @@
*/
public static final ObjectClass getTopObjectClass()
{
-
return DirectoryServer.getTopObjectClass();
}
@@ -377,7 +360,6 @@
*/
public static final Map<String,AttributeType> getAttributeTypes()
{
-
return DirectoryServer.getAttributeTypes();
}
@@ -402,7 +384,6 @@
public static final AttributeType
getAttributeType(String lowerName, boolean returnDefault)
{
-
return DirectoryServer.getAttributeType(lowerName, returnDefault);
}
@@ -415,7 +396,6 @@
*/
public static final AttributeType getObjectClassAttributeType()
{
-
return DirectoryServer.getObjectClassAttributeType();
}
@@ -433,7 +413,6 @@
public static final Map<String,AttributeSyntax>
getAttributeSyntaxes()
{
-
return DirectoryServer.getAttributeSyntaxes();
}
@@ -455,7 +434,6 @@
public static final AttributeSyntax
getAttributeSyntax(String oid, boolean allowDefault)
{
-
return DirectoryServer.getAttributeSyntax(oid, allowDefault);
}
@@ -470,7 +448,6 @@
*/
public static final AttributeSyntax getDefaultAttributeSyntax()
{
-
return DirectoryServer.getDefaultAttributeSyntax();
}
@@ -487,7 +464,6 @@
*/
public static final AttributeSyntax getDefaultBinarySyntax()
{
-
return DirectoryServer.getDefaultBinarySyntax();
}
@@ -504,7 +480,6 @@
*/
public static final AttributeSyntax getDefaultBooleanSyntax()
{
-
return DirectoryServer.getDefaultBooleanSyntax();
}
@@ -521,7 +496,6 @@
*/
public static final AttributeSyntax getDefaultDNSyntax()
{
-
return DirectoryServer.getDefaultDNSyntax();
}
@@ -538,7 +512,6 @@
*/
public static final AttributeSyntax getDefaultIntegerSyntax()
{
-
return DirectoryServer.getDefaultIntegerSyntax();
}
@@ -555,7 +528,6 @@
*/
public static final AttributeSyntax getDefaultStringSyntax()
{
-
return DirectoryServer.getDefaultStringSyntax();
}
@@ -573,7 +545,6 @@
public static final Map<MatchingRule,MatchingRuleUse>
getMatchingRuleUses()
{
-
return DirectoryServer.getMatchingRuleUses();
}
@@ -592,7 +563,6 @@
public static final MatchingRuleUse
getMatchingRuleUse(MatchingRule matchingRule)
{
-
return DirectoryServer.getMatchingRuleUse(matchingRule);
}
@@ -610,7 +580,6 @@
public static final Map<ObjectClass,DITContentRule>
getDITContentRules()
{
-
return DirectoryServer.getDITContentRules();
}
@@ -629,7 +598,6 @@
public static final DITContentRule
getDITContentRule(ObjectClass objectClass)
{
-
return DirectoryServer.getDITContentRule(objectClass);
}
@@ -647,7 +615,6 @@
public static final Map<NameForm,DITStructureRule>
getDITStructureRules()
{
-
return DirectoryServer.getDITStructureRules();
}
@@ -665,7 +632,6 @@
*/
public static final DITStructureRule getDITStructureRule(int ruleID)
{
-
return DirectoryServer.getDITStructureRule(ruleID);
}
@@ -684,7 +650,6 @@
public static final DITStructureRule
getDITStructureRule(NameForm nameForm)
{
-
return DirectoryServer.getDITStructureRule(nameForm);
}
@@ -700,7 +665,6 @@
*/
public static final Map<ObjectClass,NameForm> getNameForms()
{
-
return DirectoryServer.getNameForms();
}
@@ -718,7 +682,6 @@
*/
public static final NameForm getNameForm(ObjectClass objectClass)
{
-
return DirectoryServer.getNameForm(objectClass);
}
@@ -736,7 +699,6 @@
*/
public static final NameForm getNameForm(String lowerName)
{
-
return DirectoryServer.getNameForm(lowerName);
}
@@ -751,7 +713,6 @@
public static final void registerConfigurableComponent(
ConfigurableComponent component)
{
-
DirectoryServer.registerConfigurableComponent(component);
}
@@ -766,7 +727,6 @@
public static final void deregisterConfigurableComponent(
ConfigurableComponent component)
{
-
DirectoryServer.deregisterConfigurableComponent(component);
}
@@ -781,7 +741,6 @@
public static final void registerInvokableComponent(
InvokableComponent component)
{
-
DirectoryServer.registerInvokableComponent(component);
}
@@ -796,7 +755,6 @@
public static final void deregisterInvokableComponent(
InvokableComponent component)
{
-
DirectoryServer.deregisterInvokableComponent(component);
}
@@ -810,7 +768,6 @@
public static final void registerAlertGenerator(
AlertGenerator alertGenerator)
{
-
DirectoryServer.registerAlertGenerator(alertGenerator);
}
@@ -825,7 +782,6 @@
public static final void deregisterAlertGenerator(
AlertGenerator alertGenerator)
{
-
DirectoryServer.deregisterAlertGenerator(alertGenerator);
}
@@ -847,7 +803,6 @@
String alertType, int alertID,
String alertMessage)
{
-
DirectoryServer.sendAlertNotification(generator, alertType,
alertID, alertMessage);
}
@@ -863,7 +818,6 @@
*/
public static final ResultCode getServerErrorResultCode()
{
-
return DirectoryServer.getServerErrorResultCode();
}
@@ -886,7 +840,6 @@
public static final Entry getEntry(DN entryDN)
throws DirectoryException
{
-
return DirectoryServer.getEntry(entryDN);
}
@@ -909,7 +862,6 @@
public static final boolean entryExists(DN entryDN)
throws DirectoryException
{
-
return DirectoryServer.entryExists(entryDN);
}
@@ -924,7 +876,6 @@
*/
public static final Set<String> getSupportedControls()
{
-
return DirectoryServer.getSupportedControls();
}
@@ -943,7 +894,6 @@
*/
public static final boolean isSupportedControl(String controlOID)
{
-
return DirectoryServer.isSupportedControl(controlOID);
}
@@ -959,7 +909,6 @@
*/
public static final void registerSupportedControl(String controlOID)
{
-
DirectoryServer.registerSupportedControl(controlOID);
}
@@ -976,7 +925,6 @@
public static final void
deregisterSupportedControl(String controlOID)
{
-
DirectoryServer.deregisterSupportedControl(controlOID);
}
@@ -991,7 +939,6 @@
*/
public static final Set<String> getSupportedFeatures()
{
-
return DirectoryServer.getSupportedFeatures();
}
@@ -1010,7 +957,6 @@
*/
public static final boolean isSupportedFeature(String featureOID)
{
-
return DirectoryServer.isSupportedFeature(featureOID);
}
@@ -1026,7 +972,6 @@
*/
public static final void registerSupportedFeature(String featureOID)
{
-
DirectoryServer.registerSupportedFeature(featureOID);
}
@@ -1043,7 +988,6 @@
public static final void
deregisterSupportedFeature(String featureOID)
{
-
DirectoryServer.deregisterSupportedFeature(featureOID);
}
@@ -1062,7 +1006,6 @@
public static final Map<String,ExtendedOperationHandler>
getSupportedExtensions()
{
-
return DirectoryServer.getSupportedExtensions();
}
@@ -1080,7 +1023,6 @@
public static final ExtendedOperationHandler
getExtendedOperationHandler(String oid)
{
-
return DirectoryServer.getExtendedOperationHandler(oid);
}
@@ -1097,7 +1039,6 @@
public static final void registerSupportedExtension(String oid,
ExtendedOperationHandler handler)
{
-
DirectoryServer.registerSupportedExtension(oid, handler);
}
@@ -1111,7 +1052,6 @@
*/
public static final void deregisterSupportedExtension(String oid)
{
-
DirectoryServer.deregisterSupportedExtension(oid);
}
@@ -1129,7 +1069,6 @@
public static final Map<String,SASLMechanismHandler>
getSupportedSASLMechanisms()
{
-
return DirectoryServer.getSupportedSASLMechanisms();
}
@@ -1146,7 +1085,6 @@
public static final SASLMechanismHandler
getSASLMechanismHandler(String name)
{
-
return DirectoryServer.getSASLMechanismHandler(name);
}
@@ -1164,7 +1102,6 @@
registerSASLMechanismHandler(String name,
SASLMechanismHandler handler)
{
-
DirectoryServer.registerSASLMechanismHandler(name, handler);
}
@@ -1178,7 +1115,6 @@
*/
public static final void deregisterSASLMechanismHandler(String name)
{
-
DirectoryServer.deregisterSASLMechanismHandler(name);
}
@@ -1196,7 +1132,6 @@
registerChangeNotificationListener(
ChangeNotificationListener changeListener)
{
-
DirectoryServer.registerChangeNotificationListener(
changeListener);
}
@@ -1214,7 +1149,6 @@
public static final void deregisterChangeNotificationListener(
ChangeNotificationListener changeListener)
{
-
DirectoryServer.deregisterChangeNotificationListener(
changeListener);
}
@@ -1231,7 +1165,6 @@
public static final void
registerShutdownListener(ServerShutdownListener listener)
{
-
DirectoryServer.registerShutdownListener(listener);
}
@@ -1247,7 +1180,6 @@
public static final void
deregisterShutdownListener(ServerShutdownListener listener)
{
-
DirectoryServer.deregisterShutdownListener(listener);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
index 26576b8..09a4d3a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
@@ -190,7 +190,6 @@
*/
public final ResultCode getResultCode()
{
-
return resultCode;
}
@@ -203,7 +202,6 @@
*/
public final String getErrorMessage()
{
-
return errorMessage;
}
@@ -218,7 +216,6 @@
*/
public final int getErrorMessageID()
{
-
return errorMessageID;
}
@@ -232,7 +229,6 @@
*/
public final DN getMatchedDN()
{
-
return matchedDN;
}
@@ -246,7 +242,6 @@
*/
public final List<String> getReferralURLs()
{
-
return referralURLs;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
index ed411e7..c8ba666 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
@@ -137,8 +137,6 @@
Map<AttributeType,List<Attribute>>
operationalAttributes)
{
-
-
attachment = null;
schema = DirectoryServer.getSchema();
@@ -191,7 +189,6 @@
*/
public DN getDN()
{
-
return dn;
}
@@ -204,7 +201,6 @@
*/
public void setDN(DN dn)
{
-
if (dn == null)
{
this.dn = DN.nullDN();
@@ -228,7 +224,6 @@
*/
public Map<ObjectClass,String> getObjectClasses()
{
-
return objectClasses;
}
@@ -245,7 +240,6 @@
*/
public boolean hasObjectClass(ObjectClass objectClass)
{
-
return objectClasses.containsKey(objectClass);
}
@@ -261,7 +255,6 @@
*/
public ObjectClass getStructuralObjectClass()
{
-
ObjectClass structuralClass = null;
for (ObjectClass oc : objectClasses.keySet())
@@ -301,7 +294,6 @@
Collection<AttributeValue> objectClassNames)
throws DirectoryException
{
-
attachment = null;
// Iterate through all the provided objectclass names and make
@@ -360,7 +352,6 @@
public void addObjectClass(AttributeValue objectClassName)
throws DirectoryException
{
-
attachment = null;
String name = objectClassName.getStringValue();
@@ -406,7 +397,6 @@
public void addObjectClass(ObjectClass oc)
throws DirectoryException
{
-
attachment = null;
if (objectClasses.containsKey(oc))
@@ -439,7 +429,6 @@
Collection<AttributeValue> objectClassNames)
throws DirectoryException
{
-
attachment = null;
@@ -521,7 +510,6 @@
*/
public List<Attribute> getAttributes()
{
-
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
for (List<Attribute> list : userAttributes.values())
@@ -555,7 +543,6 @@
*/
public Map<AttributeType,List<Attribute>> getUserAttributes()
{
-
return userAttributes;
}
@@ -571,7 +558,6 @@
*/
public Map<AttributeType,List<Attribute>> getOperationalAttributes()
{
-
return operationalAttributes;
}
@@ -587,7 +573,6 @@
*/
public Attribute getObjectClassAttribute()
{
-
if ((objectClasses == null) || objectClasses.isEmpty())
{
return null;
@@ -619,7 +604,6 @@
*/
public boolean hasAttribute(AttributeType attributeType)
{
-
if (userAttributes.containsKey(attributeType) ||
operationalAttributes.containsKey(attributeType))
{
@@ -659,7 +643,6 @@
public boolean hasAttribute(AttributeType attributeType,
Set<String> attributeOptions)
{
-
List<Attribute> attributes;
if (attributeType.mayHaveSubordinateTypes())
{
@@ -743,7 +726,6 @@
*/
public List<Attribute> getAttribute(AttributeType attributeType)
{
-
if (attributeType.mayHaveSubordinateTypes())
{
List<Attribute> attributes = new LinkedList<Attribute>();
@@ -840,7 +822,6 @@
*/
public List<Attribute> getAttribute(String lowerName)
{
-
for (AttributeType attr : userAttributes.keySet())
{
if (attr.hasNameOrOID(lowerName))
@@ -888,7 +869,6 @@
public List<Attribute> getAttribute(AttributeType attributeType,
Set<String> options)
{
-
List<Attribute> attributes = new LinkedList<Attribute>();
if (attributeType.mayHaveSubordinateTypes())
{
@@ -998,7 +978,6 @@
public List<Attribute> getAttribute(String lowerName,
Set<String> options)
{
-
for (AttributeType attr : userAttributes.keySet())
{
if (attr.hasNameOrOID(lowerName))
@@ -1058,7 +1037,6 @@
public final <T> T getAttributeValue(AttributeType attributeType,
AttributeValueDecoder<T> decoder) throws DirectoryException
{
-
List<Attribute> attributes = getAttribute(attributeType);
AttributeValueIterable values =
new AttributeValueIterable(attributes);
@@ -1106,7 +1084,6 @@
Collection<T> collection)
throws DirectoryException
{
-
List<Attribute> attributes = getAttribute(attributeType);
AttributeValueIterable values =
new AttributeValueIterable(attributes);
@@ -1132,7 +1109,6 @@
*/
public boolean hasUserAttribute(AttributeType attributeType)
{
-
if (userAttributes.containsKey(attributeType))
{
return true;
@@ -1168,7 +1144,6 @@
*/
public List<Attribute> getUserAttribute(AttributeType attributeType)
{
-
if (attributeType.mayHaveSubordinateTypes())
{
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
@@ -1222,7 +1197,6 @@
public List<Attribute> getUserAttribute(AttributeType attributeType,
Set<String> options)
{
-
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
List<Attribute> attrs = userAttributes.get(attributeType);
if (attrs != null)
@@ -1277,7 +1251,6 @@
public List<Attribute> duplicateUserAttribute(
AttributeType attributeType)
{
-
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
List<Attribute> attrs = userAttributes.get(attributeType);
@@ -1334,7 +1307,6 @@
Set<String> options,
boolean omitValues)
{
-
if (attrList == null)
{
return null;
@@ -1384,7 +1356,6 @@
Set<String> options,
boolean omitValues)
{
-
List<Attribute> currentList = getUserAttribute(attributeType);
return duplicateAttribute(currentList, options, omitValues);
}
@@ -1413,7 +1384,6 @@
Set<String> options,
boolean omitValues)
{
-
List<Attribute> currentList =
getOperationalAttribute(attributeType);
return duplicateAttribute(currentList, options, omitValues);
@@ -1432,7 +1402,6 @@
*/
public boolean hasOperationalAttribute(AttributeType attributeType)
{
-
if (operationalAttributes.containsKey(attributeType))
{
return true;
@@ -1469,7 +1438,6 @@
public List<Attribute> getOperationalAttribute(
AttributeType attributeType)
{
-
if (attributeType.mayHaveSubordinateTypes())
{
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
@@ -1525,7 +1493,6 @@
AttributeType attributeType,
Set<String> options)
{
-
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
List<Attribute> attrs = operationalAttributes.get(attributeType);
if (attrs != null)
@@ -1581,7 +1548,6 @@
public List<Attribute> duplicateOperationalAttribute(
AttributeType attributeType)
{
-
LinkedList<Attribute> attributes = new LinkedList<Attribute>();
List<Attribute> attrs = operationalAttributes.get(attributeType);
@@ -1633,8 +1599,6 @@
public void putAttribute(AttributeType attributeType,
List<Attribute> attributeList)
{
-
-
attachment = null;
@@ -1681,7 +1645,6 @@
public void addAttribute(Attribute attribute,
List<AttributeValue> duplicateValues)
{
-
attachment = null;
List<Attribute> attrList =
@@ -1756,7 +1719,6 @@
*/
public boolean removeAttribute(AttributeType attributeType)
{
-
attachment = null;
if (attributeType.isObjectClassType())
@@ -1794,7 +1756,6 @@
public boolean removeAttribute(AttributeType attributeType,
Set<String> options)
{
-
attachment = null;
if ((options == null) || options.isEmpty())
@@ -1864,8 +1825,6 @@
public boolean removeAttribute(Attribute attribute,
List<AttributeValue> missingValues)
{
-
-
attachment = null;
@@ -2022,7 +1981,6 @@
*/
public boolean allowsAttribute(AttributeType attributeType)
{
-
for (ObjectClass o : objectClasses.keySet())
{
if (o.isRequiredOrOptional(attributeType))
@@ -2049,7 +2007,6 @@
*/
public boolean requiresAttribute(AttributeType attributeType)
{
-
for (ObjectClass o : objectClasses.keySet())
{
if (o.isRequired(attributeType))
@@ -2077,7 +2034,6 @@
public boolean hasValue(AttributeType attributeType,
Set<String> options, AttributeValue value)
{
-
List<Attribute> attrList = getAttribute(attributeType);
if ((attrList == null) || attrList.isEmpty())
{
@@ -2112,7 +2068,6 @@
public void applyModification(Modification mod)
throws DirectoryException
{
-
Attribute a = mod.getAttribute();
AttributeType t = a.getAttributeType();
@@ -2325,7 +2280,6 @@
public void applyModifications(List<Modification> mods)
throws DirectoryException
{
-
for (Modification m : mods)
{
applyModification(m);
@@ -2390,8 +2344,6 @@
boolean validateStructureRules,
StringBuilder invalidReason)
{
-
-
// Get the structural objectclass for the entry. If there isn't
// one, or if there's more than one, then see if that's OK.
AcceptRejectWarn structuralPolicy =
@@ -3118,7 +3070,6 @@
*/
public Object getAttachment()
{
-
return attachment;
}
@@ -3134,7 +3085,6 @@
*/
public void setAttachment(Object attachment)
{
-
this.attachment = attachment;
}
@@ -3149,7 +3099,6 @@
*/
public Entry duplicate()
{
-
HashMap<ObjectClass,String> objectClassesCopy =
new HashMap<ObjectClass,String>(objectClasses);
@@ -3184,7 +3133,6 @@
public Entry duplicateWithoutOperationalAttributes(
boolean typesOnly)
{
-
HashMap<ObjectClass,String> objectClassesCopy;
if (typesOnly)
{
@@ -3265,7 +3213,6 @@
*/
public Entry duplicateWithoutAttributes()
{
-
HashMap<ObjectClass,String> objectClassesCopy =
new HashMap<ObjectClass,String>(objectClasses.size());
@@ -3293,7 +3240,6 @@
*/
public boolean isReferral()
{
-
ObjectClass referralOC =
DirectoryServer.getObjectClass(OC_REFERRAL);
if (referralOC == null)
@@ -3355,7 +3301,6 @@
*/
public LinkedHashSet<String> getReferralURLs()
{
-
AttributeType referralType =
DirectoryServer.getAttributeType(ATTR_REFERRAL_URL);
if (referralType == null)
@@ -3405,7 +3350,6 @@
*/
public boolean isAlias()
{
-
ObjectClass aliasOC = DirectoryServer.getObjectClass(OC_ALIAS);
if (aliasOC == null)
{
@@ -3470,7 +3414,6 @@
public DN getAliasedDN()
throws DirectoryException
{
-
AttributeType aliasType =
DirectoryServer.getAttributeType(ATTR_REFERRAL_URL);
if (aliasType == null)
@@ -3534,7 +3477,6 @@
*/
public boolean isLDAPSubentry()
{
-
ObjectClass ldapSubentryOC =
DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC);
if (ldapSubentryOC == null)
@@ -3580,7 +3522,6 @@
*/
public boolean matchesBaseAndScope(DN baseDN, SearchScope scope)
{
-
switch (scope)
{
case BASE_OBJECT:
@@ -3616,7 +3557,6 @@
*/
public List<StringBuilder> toLDIF()
{
-
LinkedList<StringBuilder> ldifLines =
new LinkedList<StringBuilder>();
@@ -3708,8 +3648,6 @@
public boolean toLDIF(LDIFExportConfig exportConfig)
throws IOException, LDIFException
{
-
-
// See if this entry should be included in the export at all.
try
{
@@ -3934,7 +3872,6 @@
*/
public String getProtocolElementName()
{
-
return "Entry";
}
@@ -3947,7 +3884,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -3964,7 +3900,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("Entry(dn=\"");
dn.toString(buffer);
@@ -4025,7 +3960,6 @@
*/
public void toString(StringBuilder buffer, int indent)
{
-
StringBuilder indentBuf = new StringBuilder(indent);
for (int i=0 ; i < indent; i++)
{
@@ -4049,7 +3983,6 @@
*/
public String toSingleLineString()
{
-
StringBuilder buffer = new StringBuilder();
toSingleLineString(buffer);
return buffer.toString();
@@ -4066,7 +3999,6 @@
*/
public void toSingleLineString(StringBuilder buffer)
{
-
buffer.append("Entry(dn=\"");
dn.toString(buffer);
buffer.append("\",objectClasses={");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java b/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
index 9a2816d..ef5af84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
@@ -52,7 +52,6 @@
*/
public HostPort(int port)
{
-
this.host = null;
this.port = port;
}
@@ -69,7 +68,6 @@
*/
public HostPort(String host, int port)
{
-
this.host = host;
this.port = port;
}
@@ -84,7 +82,6 @@
*/
public String getHost()
{
-
return host;
}
@@ -97,7 +94,6 @@
*/
public int getPort()
{
-
return port;
}
@@ -112,7 +108,6 @@
*/
public String toString()
{
-
if (host == null)
{
return ":" + port;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java b/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
index fc5c74d..1788022 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
@@ -101,7 +101,6 @@
*/
public final int getMessageID()
{
-
return messageID;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java b/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
index 945ae46..f52bd9b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
@@ -78,7 +78,6 @@
ASN1OctetString value,
List<Control> controls)
{
-
this.operation = operation;
this.oid = oid;
this.value = value;
@@ -104,7 +103,6 @@
*/
public Operation getOperation()
{
-
return operation;
}
@@ -118,7 +116,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -131,7 +128,6 @@
*/
public void setOID(String oid)
{
-
this.oid = oid;
}
@@ -145,7 +141,6 @@
*/
public ASN1OctetString getValue()
{
-
return value;
}
@@ -158,7 +153,6 @@
*/
public void setValue(ASN1OctetString value)
{
-
this.value = value;
}
@@ -173,7 +167,6 @@
*/
public List<Control> getControls()
{
-
return controls;
}
@@ -186,7 +179,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -203,7 +195,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("IntermediateResponse(operation=");
operation.toString(buffer);
buffer.append(",oid=");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java b/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
index a885533..781a066 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
@@ -97,7 +97,6 @@
boolean retrievesComponentInfo,
boolean updatesComponentInfo)
{
-
this.name = name;
this.description = description;
this.returnType = returnType;
@@ -123,7 +122,6 @@
*/
public String getName()
{
-
return name;
}
@@ -136,7 +134,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -149,7 +146,6 @@
*/
public ConfigAttribute[] getArguments()
{
-
return arguments;
}
@@ -162,7 +158,6 @@
*/
public String getReturnType()
{
-
return returnType;
}
@@ -178,7 +173,6 @@
*/
public boolean retrievesComponentInfo()
{
-
return retrievesComponentInfo;
}
@@ -194,7 +188,6 @@
*/
public boolean updatesComponentInfo()
{
-
return updatesComponentInfo;
}
@@ -209,8 +202,6 @@
*/
public MBeanOperationInfo toOperationInfo()
{
-
-
MBeanParameterInfo[] signature =
new MBeanParameterInfo[arguments.length];
for (int i=0; i < arguments.length; i++)
@@ -263,7 +254,6 @@
public boolean hasSignature(String methodName,
String[] argumentTypes)
{
-
if (! methodName.equals(name))
{
return false;
@@ -308,7 +298,6 @@
Object[] parameters)
throws MBeanException
{
-
try
{
ConfigAttribute[] methodArguments =
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
index 79c2cd2..136b0df 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
@@ -146,8 +146,6 @@
SearchScope scope, String rawFilter,
LinkedList<String> extensions)
{
-
-
this.host = toLowerCase(host);
baseDN = null;
@@ -238,8 +236,6 @@
LinkedHashSet<String> attributes, SearchScope scope,
SearchFilter filter, LinkedList<String> extensions)
{
-
-
this.host = toLowerCase(host);
@@ -332,8 +328,6 @@
public static LDAPURL decode(String url, boolean fullyDecode)
throws DirectoryException
{
-
-
// Find the "://" component, which will separate the scheme from
// the host.
String scheme;
@@ -694,8 +688,6 @@
private static String urlDecode(String s)
throws DirectoryException
{
-
-
if (s == null)
{
return "";
@@ -892,8 +884,6 @@
*/
private static String urlEncode(String s, boolean isExtension)
{
-
-
if (s == null)
{
return "";
@@ -996,8 +986,6 @@
*/
private static void hexEncode(char c, StringBuilder buffer)
{
-
-
if ((c & (byte) 0xFF) == c)
{
// It's a single byte.
@@ -1027,7 +1015,6 @@
*/
public String getScheme()
{
-
return scheme;
}
@@ -1040,7 +1027,6 @@
*/
public void setScheme(String scheme)
{
-
if (scheme == null)
{
this.scheme = DEFAULT_SCHEME;
@@ -1061,7 +1047,6 @@
*/
public String getHost()
{
-
return host;
}
@@ -1074,7 +1059,6 @@
*/
public void setHost(String host)
{
-
this.host = host;
}
@@ -1087,7 +1071,6 @@
*/
public int getPort()
{
-
return port;
}
@@ -1100,7 +1083,6 @@
*/
public void setPort(int port)
{
-
if ((port <= 0) || (port > 65535))
{
this.port = DEFAULT_PORT;
@@ -1122,7 +1104,6 @@
*/
public String getRawBaseDN()
{
-
return rawBaseDN;
}
@@ -1136,7 +1117,6 @@
*/
public void setRawBaseDN(String rawBaseDN)
{
-
this.rawBaseDN = rawBaseDN;
this.baseDN = null;
}
@@ -1154,7 +1134,6 @@
public DN getBaseDN()
throws DirectoryException
{
-
if (baseDN == null)
{
if ((rawBaseDN == null) || (rawBaseDN.length() == 0))
@@ -1177,8 +1156,6 @@
*/
public void setBaseDN(DN baseDN)
{
-
-
if (baseDN == null)
{
this.baseDN = null;
@@ -1201,7 +1178,6 @@
*/
public LinkedHashSet<String> getAttributes()
{
-
return attributes;
}
@@ -1216,7 +1192,6 @@
*/
public SearchScope getScope()
{
-
return scope;
}
@@ -1229,7 +1204,6 @@
*/
public void setScope(SearchScope scope)
{
-
if (scope == null)
{
this.scope = DEFAULT_SEARCH_SCOPE;
@@ -1251,7 +1225,6 @@
*/
public String getRawFilter()
{
-
return rawFilter;
}
@@ -1265,7 +1238,6 @@
*/
public void setRawFilter(String rawFilter)
{
-
this.rawFilter = rawFilter;
this.filter = null;
}
@@ -1283,7 +1255,6 @@
public SearchFilter getFilter()
throws DirectoryException
{
-
if (filter == null)
{
if (rawFilter == null)
@@ -1308,8 +1279,6 @@
*/
public void setFilter(SearchFilter filter)
{
-
-
if (filter == null)
{
this.rawFilter = null;
@@ -1332,7 +1301,6 @@
*/
public LinkedList<String> getExtensions()
{
-
return extensions;
}
@@ -1348,7 +1316,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -1521,7 +1488,6 @@
*/
public int hashCode()
{
-
int hashCode = 0;
hashCode += scheme.hashCode();
@@ -1591,7 +1557,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer, false);
return buffer.toString();
@@ -1612,7 +1577,6 @@
*/
public void toString(StringBuilder buffer, boolean baseOnly)
{
-
urlEncode(scheme, false, buffer);
buffer.append("://");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
index 5b7bf21..57d27bb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
@@ -136,7 +136,6 @@
public LDIFExportConfig(String ldifFile,
ExistingFileBehavior existingFileBehavior)
{
-
this.ldifFile = ldifFile;
this.existingFileBehavior = existingFileBehavior;
ldifOutputStream = null;
@@ -170,7 +169,6 @@
*/
public LDIFExportConfig(OutputStream ldifOutputStream)
{
-
this.ldifOutputStream = ldifOutputStream;
ldifFile = null;
existingFileBehavior = ExistingFileBehavior.FAIL;
@@ -208,7 +206,6 @@
public BufferedWriter getWriter()
throws IOException
{
-
if (writer == null)
{
if (ldifOutputStream == null)
@@ -277,7 +274,6 @@
*/
public boolean invokeExportPlugins()
{
-
return invokeExportPlugins;
}
@@ -293,7 +289,6 @@
*/
public void setInvokeExportPlugins(boolean invokeExportPlugins)
{
-
this.invokeExportPlugins = invokeExportPlugins;
}
@@ -308,7 +303,6 @@
*/
public boolean compressData()
{
-
return compressData;
}
@@ -324,7 +318,6 @@
*/
public void setCompressData(boolean compressData)
{
-
this.compressData = compressData;
}
@@ -339,7 +332,6 @@
*/
public boolean encryptData()
{
-
return encryptData;
}
@@ -355,7 +347,6 @@
*/
public void setEncryptData(boolean encryptData)
{
-
this.encryptData = encryptData;
}
@@ -370,7 +361,6 @@
*/
public boolean hashData()
{
-
return hashData;
}
@@ -386,7 +376,6 @@
*/
public void setHashData(boolean hashData)
{
-
this.hashData = hashData;
}
@@ -401,7 +390,6 @@
*/
public boolean signHash()
{
-
return signHash;
}
@@ -420,7 +408,6 @@
*/
public void setSignHash(boolean signHash)
{
-
this.signHash = signHash;
}
@@ -437,7 +424,6 @@
*/
public boolean typesOnly()
{
-
return typesOnly;
}
@@ -454,7 +440,6 @@
*/
public void setTypesOnly(boolean typesOnly)
{
-
this.typesOnly = typesOnly;
}
@@ -469,7 +454,6 @@
*/
public int getWrapColumn()
{
-
return wrapColumn;
}
@@ -485,7 +469,6 @@
*/
public void setWrapColumn(int wrapColumn)
{
-
this.wrapColumn = wrapColumn;
}
@@ -501,7 +484,6 @@
*/
public List<DN> getExcludeBranches()
{
-
return excludeBranches;
}
@@ -516,7 +498,6 @@
*/
public void setExcludeBranches(List<DN> excludeBranches)
{
-
if (excludeBranches == null)
{
this.excludeBranches = new ArrayList<DN>(0);
@@ -539,7 +520,6 @@
*/
public List<DN> getIncludeBranches()
{
-
return includeBranches;
}
@@ -554,7 +534,6 @@
*/
public void setIncludeBranches(List<DN> includeBranches)
{
-
if (includeBranches == null)
{
this.includeBranches = new ArrayList<DN>(0);
@@ -577,7 +556,6 @@
*/
public boolean includeObjectClasses()
{
-
return includeObjectClasses;
}
@@ -592,7 +570,6 @@
*/
public boolean includeOperationalAttributes()
{
-
return includeOperationalAttributes;
}
@@ -610,7 +587,6 @@
public void setIncludeOperationalAttributes(
boolean includeOperationalAttributes)
{
-
this.includeOperationalAttributes = includeOperationalAttributes;
}
@@ -626,7 +602,6 @@
*/
public Set<AttributeType> getExcludeAttributes()
{
-
return excludeAttributes;
}
@@ -643,7 +618,6 @@
public void setExcludeAttributes(
Set<AttributeType> excludeAttributes)
{
-
if (excludeAttributes == null)
{
this.excludeAttributes = new HashSet<AttributeType>(0);
@@ -666,7 +640,6 @@
*/
public Set<AttributeType> getIncludeAttributes()
{
-
return includeAttributes;
}
@@ -683,7 +656,6 @@
public void setIncludeAttributes(
Set<AttributeType> includeAttributes)
{
-
if (includeAttributes == null)
{
this.includeAttributes = new HashSet<AttributeType>(0);
@@ -709,7 +681,6 @@
*/
public boolean includeAttribute(AttributeType attributeType)
{
-
if ((! excludeAttributes.isEmpty()) &&
excludeAttributes.contains(attributeType))
{
@@ -736,7 +707,6 @@
*/
public List<SearchFilter> getExcludeFilters()
{
-
return excludeFilters;
}
@@ -752,7 +722,6 @@
*/
public void setExcludeFilters(List<SearchFilter> excludeFilters)
{
-
if (excludeFilters == null)
{
this.excludeFilters = new ArrayList<SearchFilter>(0);
@@ -775,7 +744,6 @@
*/
public List<SearchFilter> getIncludeFilters()
{
-
return includeFilters;
}
@@ -791,7 +759,6 @@
*/
public void setIncludeFilters(List<SearchFilter> includeFilters)
{
-
if (includeFilters == null)
{
this.includeFilters = new ArrayList<SearchFilter>(0);
@@ -821,7 +788,6 @@
public boolean includeEntry(Entry entry)
throws DirectoryException
{
-
DN dn = entry.getDN();
if (! excludeBranches.isEmpty())
{
@@ -881,8 +847,6 @@
*/
public void close()
{
-
-
// FIXME -- Need to add code to generate a signed hash of the LDIF
// content.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
index 55e00e3..acb5d3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
@@ -151,7 +151,6 @@
*/
public LDIFImportConfig(String ldifFile)
{
-
ldifFiles = new ArrayList<String>(1);
ldifFiles.add(ldifFile);
ldifFileIterator = ldifFiles.iterator();
@@ -187,7 +186,6 @@
*/
public LDIFImportConfig(List<String> ldifFiles)
{
-
this.ldifFiles = ldifFiles;
ldifFileIterator = ldifFiles.iterator();
@@ -221,7 +219,6 @@
*/
public LDIFImportConfig(InputStream ldifInputStream)
{
-
this.ldifInputStream = ldifInputStream;
bufferSize = DEFAULT_BUFFER_SIZE;
ldifFiles = null;
@@ -252,7 +249,6 @@
*/
public LDIFImportConfig(Reader ldifInputReader)
{
-
ldifInputStream = null;
bufferSize = DEFAULT_BUFFER_SIZE;
ldifFiles = null;
@@ -319,7 +315,6 @@
public BufferedReader getReader()
throws IOException
{
-
if (reader == null)
{
InputStream inputStream;
@@ -366,7 +361,6 @@
public BufferedReader nextReader()
throws IOException
{
-
if ((ldifFileIterator == null) || (! ldifFileIterator.hasNext()))
{
return null;
@@ -406,7 +400,6 @@
*/
public BufferedWriter getRejectWriter()
{
-
return rejectWriter;
}
@@ -432,7 +425,6 @@
ExistingFileBehavior existingFileBehavior)
throws IOException
{
-
if (rejectFile == null)
{
if (rejectWriter != null)
@@ -488,7 +480,6 @@
*/
public void writeRejectedEntries(OutputStream outputStream)
{
-
if (outputStream == null)
{
if (rejectWriter != null)
@@ -519,7 +510,6 @@
*/
public boolean appendToExistingData()
{
-
return appendToExistingData;
}
@@ -535,7 +525,6 @@
*/
public void setAppendToExistingData(boolean appendToExistingData)
{
-
this.appendToExistingData = appendToExistingData;
}
@@ -553,7 +542,6 @@
*/
public boolean replaceExistingEntries()
{
-
return replaceExistingEntries;
}
@@ -571,7 +559,6 @@
public void setReplaceExistingEntries(
boolean replaceExistingEntries)
{
-
this.replaceExistingEntries = replaceExistingEntries;
}
@@ -587,7 +574,6 @@
*/
public boolean invokeImportPlugins()
{
-
return invokeImportPlugins;
}
@@ -604,7 +590,6 @@
*/
public void setInvokeImportPlugins(boolean invokeImportPlugins)
{
-
this.invokeImportPlugins = invokeImportPlugins;
}
@@ -619,7 +604,6 @@
*/
public boolean isCompressed()
{
-
return isCompressed;
}
@@ -635,7 +619,6 @@
*/
public void setCompressed(boolean isCompressed)
{
-
this.isCompressed = isCompressed;
}
@@ -650,7 +633,6 @@
*/
public boolean isEncrypted()
{
-
return isEncrypted;
}
@@ -666,7 +648,6 @@
*/
public void setEncrypted(boolean isEncrypted)
{
-
this.isEncrypted = isEncrypted;
}
@@ -682,7 +663,6 @@
*/
public boolean validateSchema()
{
-
return validateSchema;
}
@@ -697,7 +677,6 @@
*/
public void setValidateSchema(boolean validateSchema)
{
-
this.validateSchema = validateSchema;
}
@@ -713,7 +692,6 @@
*/
public List<DN> getExcludeBranches()
{
-
return excludeBranches;
}
@@ -728,7 +706,6 @@
*/
public void setExcludeBranches(List<DN> excludeBranches)
{
-
if (excludeBranches == null)
{
this.excludeBranches = new ArrayList<DN>(0);
@@ -751,7 +728,6 @@
*/
public List<DN> getIncludeBranches()
{
-
return includeBranches;
}
@@ -766,7 +742,6 @@
*/
public void setIncludeBranches(List<DN> includeBranches)
{
-
if (includeBranches == null)
{
this.includeBranches = new ArrayList<DN>(0);
@@ -792,7 +767,6 @@
*/
public boolean includeEntry(DN dn)
{
-
if (! excludeBranches.isEmpty())
{
for (DN excludeBranch : excludeBranches)
@@ -832,7 +806,6 @@
*/
public boolean includeObjectClasses()
{
-
return includeObjectClasses;
}
@@ -848,7 +821,6 @@
*/
public void setIncludeObjectClasses(boolean includeObjectClasses)
{
-
this.includeObjectClasses = includeObjectClasses;
}
@@ -864,7 +836,6 @@
*/
public Set<AttributeType> getExcludeAttributes()
{
-
return excludeAttributes;
}
@@ -881,7 +852,6 @@
public void setExcludeAttributes(
Set<AttributeType> excludeAttributes)
{
-
if (excludeAttributes == null)
{
this.excludeAttributes = new HashSet<AttributeType>(0);
@@ -904,7 +874,6 @@
*/
public Set<AttributeType> getIncludeAttributes()
{
-
return includeAttributes;
}
@@ -921,7 +890,6 @@
public void setIncludeAttributes(
Set<AttributeType> includeAttributes)
{
-
if (includeAttributes == null)
{
this.includeAttributes = new HashSet<AttributeType>(0);
@@ -947,7 +915,6 @@
*/
public boolean includeAttribute(AttributeType attributeType)
{
-
if ((! excludeAttributes.isEmpty()) &&
excludeAttributes.contains(attributeType))
{
@@ -974,7 +941,6 @@
*/
public List<SearchFilter> getExcludeFilters()
{
-
return excludeFilters;
}
@@ -990,7 +956,6 @@
*/
public void setExcludeFilters(List<SearchFilter> excludeFilters)
{
-
if (excludeFilters == null)
{
this.excludeFilters = new ArrayList<SearchFilter>(0);
@@ -1013,7 +978,6 @@
*/
public List<SearchFilter> getIncludeFilters()
{
-
return includeFilters;
}
@@ -1029,7 +993,6 @@
*/
public void setIncludeFilters(List<SearchFilter> includeFilters)
{
-
if (includeFilters == null)
{
this.includeFilters = new ArrayList<SearchFilter>(0);
@@ -1059,7 +1022,6 @@
public boolean includeEntry(Entry entry)
throws DirectoryException
{
-
if (! excludeFilters.isEmpty())
{
for (SearchFilter filter : excludeFilters)
@@ -1098,7 +1060,6 @@
*/
public int getBufferSize()
{
-
return bufferSize;
}
@@ -1113,7 +1074,6 @@
*/
public void setBufferSize(int bufferSize)
{
-
this.bufferSize = bufferSize;
}
@@ -1124,7 +1084,6 @@
*/
public void close()
{
-
try
{
reader.close();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java b/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
index 064a5f6..ddc0238 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
@@ -129,8 +129,6 @@
*/
public static Lock tryLockRead(DN entryDN)
{
-
-
int hashCode = (entryDN.hashCode() & 0x7FFFFFFF);
@@ -256,7 +254,6 @@
*/
public static Lock lockRead(DN entryDN)
{
-
return lockRead(entryDN, DEFAULT_TIMEOUT);
}
@@ -280,8 +277,6 @@
*/
public static Lock lockRead(DN entryDN, long timeout)
{
-
-
int hashCode = (entryDN.hashCode() & 0x7FFFFFFF);
@@ -434,8 +429,6 @@
*/
public static Lock tryLockWrite(DN entryDN)
{
-
-
int hashCode = (entryDN.hashCode() & 0x7FFFFFFF);
@@ -561,7 +554,6 @@
*/
public static Lock lockWrite(DN entryDN)
{
-
return lockWrite(entryDN, DEFAULT_TIMEOUT);
}
@@ -583,8 +575,6 @@
*/
public static Lock lockWrite(DN entryDN, long timeout)
{
-
-
int hashCode = (entryDN.hashCode() & 0x7FFFFFFF);
@@ -731,8 +721,6 @@
*/
public static void unlock(DN entryDN, Lock lock)
{
-
-
// Unlock the entry without grabbing any additional locks.
try
{
@@ -847,7 +835,6 @@
*/
public static ReentrantReadWriteLock destroyLock(DN entryDN)
{
-
return entryLocks.remove(entryDN);
}
@@ -861,7 +848,6 @@
*/
public static int lockTableSize()
{
-
return entryLocks.size();
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java b/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
index 73937c1..505eed8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
@@ -111,7 +111,6 @@
Set<AttributeType> attributes,
Map<String,List<String>> extraProperties)
{
-
ensureNotNull(definition, matchingRule);
this.definition = definition;
@@ -160,7 +159,6 @@
*/
public String getDefinition()
{
-
return definition;
}
@@ -203,7 +201,6 @@
*/
public MatchingRule getMatchingRule()
{
-
return matchingRule;
}
@@ -218,7 +215,6 @@
*/
public Map<String,String> getNames()
{
-
return names;
}
@@ -233,7 +229,6 @@
*/
public String getName()
{
-
if (names.isEmpty())
{
return null;
@@ -257,7 +252,6 @@
*/
public boolean hasName(String lowerName)
{
-
return names.containsKey(lowerName);
}
@@ -273,7 +267,6 @@
*/
public String getSchemaFile()
{
-
List<String> values =
extraProperties.get(SCHEMA_PROPERTY_FILENAME);
if ((values == null) || values.isEmpty())
@@ -295,7 +288,6 @@
*/
public void setSchemaFile(String schemaFile)
{
-
setExtraProperty(SCHEMA_PROPERTY_FILENAME, schemaFile);
}
@@ -309,7 +301,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -323,7 +314,6 @@
*/
public boolean isObsolete()
{
-
return isObsolete;
}
@@ -338,7 +328,6 @@
*/
public Set<AttributeType> getAttributes()
{
-
return attributes;
}
@@ -357,7 +346,6 @@
*/
public boolean appliesToAttribute(AttributeType attributeType)
{
-
return attributes.contains(attributeType);
}
@@ -374,7 +362,6 @@
*/
public Map<String,List<String>> getExtraProperties()
{
-
return extraProperties;
}
@@ -393,7 +380,6 @@
*/
public List<String> getExtraProperty(String propertyName)
{
-
return extraProperties.get(propertyName);
}
@@ -410,7 +396,6 @@
*/
public void setExtraProperty(String name, String value)
{
-
ensureNotNull(name);
if (value == null)
@@ -439,7 +424,6 @@
*/
public void setExtraProperty(String name, List<String> values)
{
-
ensureNotNull(name);
if ((values == null) || values.isEmpty())
@@ -467,7 +451,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -491,7 +474,6 @@
*/
public int hashCode()
{
-
return matchingRule.hashCode();
}
@@ -506,7 +488,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer, true);
return buffer.toString();
@@ -528,7 +509,6 @@
public void toString(StringBuilder buffer,
boolean includeFileElement)
{
-
buffer.append("( ");
buffer.append(matchingRule.getOID());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java b/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
index e1a527b..3d97ac0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
@@ -63,7 +63,6 @@
public DN nextMemberDN()
throws MembershipException
{
-
Entry e = nextMemberEntry();
if (e == null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java b/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
index dec4714..ee838fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
@@ -128,7 +128,6 @@
*/
public final int getErrorMessageID()
{
-
return errorMessageID;
}
@@ -141,7 +140,6 @@
*/
public final String getErrorMessage()
{
-
return errorMessage;
}
@@ -157,7 +155,6 @@
*/
public final boolean continueIterating()
{
-
return continueIterating;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
index b58af4b..5206e28 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
@@ -64,7 +64,6 @@
public Modification(ModificationType modificationType,
Attribute attribute)
{
-
this.modificationType = modificationType;
this.attribute = attribute;
@@ -87,7 +86,6 @@
public Modification(ModificationType modificationType,
Attribute attribute, boolean isInternal)
{
-
this.modificationType = modificationType;
this.attribute = attribute;
this.isInternal = isInternal;
@@ -102,7 +100,6 @@
*/
public ModificationType getModificationType()
{
-
return modificationType;
}
@@ -116,7 +113,6 @@
*/
public void setModificationType(ModificationType modificationType)
{
-
this.modificationType = modificationType;
}
@@ -129,7 +125,6 @@
*/
public Attribute getAttribute()
{
-
return attribute;
}
@@ -142,7 +137,6 @@
*/
public void setAttribute(Attribute attribute)
{
-
this.attribute = attribute;
}
@@ -158,7 +152,6 @@
*/
public boolean isInternal()
{
-
return isInternal;
}
@@ -176,7 +169,6 @@
*/
public void setInternal(boolean isInternal)
{
-
this.isInternal = isInternal;
}
@@ -196,7 +188,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -227,7 +218,6 @@
*/
public int hashCode()
{
-
return attribute.hashCode();
}
@@ -240,7 +230,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -257,7 +246,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("Modification(");
buffer.append(modificationType.toString());
buffer.append(", ");
@@ -275,7 +263,6 @@
*/
public String toLDIF()
{
-
StringBuilder buffer = new StringBuilder();
toLDIF(buffer);
return buffer.toString();
@@ -292,7 +279,6 @@
*/
public void toLDIF(StringBuilder buffer)
{
-
buffer.append(modificationType.toString());
buffer.append(": ");
buffer.append(attribute.getName());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java b/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
index 2ccc00e..cca0765 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
@@ -117,7 +117,6 @@
Set<AttributeType> optionalAttributes,
Map<String,List<String>> extraProperties)
{
-
ensureNotNull(definition, oid, structuralClass);
this.definition = definition;
@@ -176,7 +175,6 @@
*/
public String getDefinition()
{
-
return definition;
}
@@ -220,7 +218,6 @@
*/
public Map<String,String> getNames()
{
-
return names;
}
@@ -238,7 +235,6 @@
*/
public boolean hasName(String lowerName)
{
-
return names.containsKey(lowerName);
}
@@ -251,7 +247,6 @@
*/
public String getOID()
{
-
return oid;
}
@@ -267,7 +262,6 @@
*/
public String getNameOrOID()
{
-
if (names.isEmpty())
{
return oid;
@@ -294,7 +288,6 @@
*/
public boolean hasNameOrOID(String lowerValue)
{
-
if (names.containsKey(lowerValue))
{
return true;
@@ -315,7 +308,6 @@
*/
public String getSchemaFile()
{
-
List<String> values =
extraProperties.get(SCHEMA_PROPERTY_FILENAME);
if ((values == null) || values.isEmpty())
@@ -337,7 +329,6 @@
*/
public void setSchemaFile(String schemaFile)
{
-
setExtraProperty(SCHEMA_PROPERTY_FILENAME, schemaFile);
}
@@ -351,7 +342,6 @@
*/
public String getDescription()
{
-
return description;
}
@@ -366,7 +356,6 @@
*/
public ObjectClass getStructuralClass()
{
-
return structuralClass;
}
@@ -379,7 +368,6 @@
*/
public Set<AttributeType> getRequiredAttributes()
{
-
return requiredAttributes;
}
@@ -397,7 +385,6 @@
*/
public boolean isRequired(AttributeType attributeType)
{
-
return requiredAttributes.contains(attributeType);
}
@@ -410,7 +397,6 @@
*/
public Set<AttributeType> getOptionalAttributes()
{
-
return optionalAttributes;
}
@@ -428,7 +414,6 @@
*/
public boolean isOptional(AttributeType attributeType)
{
-
return optionalAttributes.contains(attributeType);
}
@@ -447,7 +432,6 @@
*/
public boolean isRequiredOrOptional(AttributeType attributeType)
{
-
return (requiredAttributes.contains(attributeType) ||
optionalAttributes.contains(attributeType));
}
@@ -462,7 +446,6 @@
*/
public boolean isObsolete()
{
-
return isObsolete;
}
@@ -479,7 +462,6 @@
*/
public Map<String,List<String>> getExtraProperties()
{
-
return extraProperties;
}
@@ -498,7 +480,6 @@
*/
public List<String> getExtraProperty(String propertyName)
{
-
return extraProperties.get(propertyName);
}
@@ -514,7 +495,6 @@
*/
public void setExtraProperty(String name, String value)
{
-
ensureNotNull(name);
if (value == null)
@@ -542,7 +522,6 @@
*/
public void setExtraProperty(String name, List<String> values)
{
-
ensureNotNull(name);
if ((values == null) || values.isEmpty())
@@ -570,7 +549,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -594,7 +572,6 @@
*/
public int hashCode()
{
-
int oidLength = oid.length();
int hashCode = 0;
for (int i=0; i < oidLength; i++)
@@ -616,7 +593,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer, true);
return buffer.toString();
@@ -638,7 +614,6 @@
public void toString(StringBuilder buffer,
boolean includeFileElement)
{
-
buffer.append("( ");
buffer.append(oid);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java b/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
index d1acc0f..5d569b4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
@@ -73,7 +73,6 @@
public NamedCharacterSet(String name, char[] characters)
throws ConfigException
{
-
this.name = name;
this.characters = characters;
@@ -116,7 +115,6 @@
Random random)
throws ConfigException
{
-
this.name = name;
this.characters = characters;
this.random = random;
@@ -149,7 +147,6 @@
*/
public String getName()
{
-
return name;
}
@@ -162,7 +159,6 @@
*/
public char[] getCharacters()
{
-
return characters;
}
@@ -176,7 +172,6 @@
*/
public char getRandomCharacter()
{
-
if ((characters == null) || (characters.length == 0))
{
return 0;
@@ -198,7 +193,6 @@
*/
public void getRandomCharacters(StringBuilder buffer, int count)
{
-
if ((characters == null) || (characters.length == 0))
{
return;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
index 01b4a9b..2dd1ab1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
@@ -215,7 +215,6 @@
*/
public String getDefinition()
{
-
return definition;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java b/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
index 4d968ba..fbe53a0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
@@ -88,7 +88,6 @@
public RDN(AttributeType attributeType,
AttributeValue attributeValue)
{
-
attributeTypes = new AttributeType[] { attributeType };
attributeNames = new String[] { attributeType.getPrimaryName() };
attributeValues = new AttributeValue[] { attributeValue };
@@ -113,7 +112,6 @@
public RDN(AttributeType attributeType, String attributeName,
AttributeValue attributeValue)
{
-
attributeTypes = new AttributeType[] { attributeType };
attributeNames = new String[] { attributeName };
attributeValues = new AttributeValue[] { attributeValue };
@@ -143,7 +141,6 @@
List<String> attributeNames,
List<AttributeValue> attributeValues)
{
-
this.attributeTypes = new AttributeType[attributeTypes.size()];
this.attributeNames = new String[attributeNames.size()];
this.attributeValues = new AttributeValue[attributeValues.size()];
@@ -176,7 +173,6 @@
public RDN(AttributeType[] attributeTypes, String[] attributeNames,
AttributeValue[] attributeValues)
{
-
this.numValues = attributeTypes.length;
this.attributeTypes = attributeTypes;
this.attributeNames = attributeNames;
@@ -201,7 +197,6 @@
public static RDN create(AttributeType attributeType,
AttributeValue attributeValue)
{
-
return new RDN(attributeType, attributeValue);
}
@@ -216,7 +211,6 @@
*/
public int getNumValues()
{
-
return numValues;
}
@@ -233,7 +227,6 @@
*/
public boolean hasAttributeType(AttributeType attributeType)
{
-
for (AttributeType t : attributeTypes)
{
if (t.equals(attributeType))
@@ -259,7 +252,6 @@
*/
public boolean hasAttributeType(String lowerName)
{
-
for (AttributeType t : attributeTypes)
{
if (t.hasNameOrOID(lowerName))
@@ -292,7 +284,6 @@
*/
public AttributeType getAttributeType(int pos)
{
-
return attributeTypes[pos];
}
@@ -310,7 +301,6 @@
*/
public String getAttributeName(int pos)
{
-
return attributeNames[pos];
}
@@ -329,7 +319,6 @@
*/
public AttributeValue getAttributeValue(AttributeType attributeType)
{
-
for (int i=0; i < numValues; i++)
{
if (attributeTypes[i].equals(attributeType))
@@ -355,7 +344,6 @@
*/
public AttributeValue getAttributeValue(int pos)
{
-
return attributeValues[pos];
}
@@ -369,7 +357,6 @@
*/
public boolean isMultiValued()
{
-
return (numValues > 1);
}
@@ -388,7 +375,6 @@
*/
public boolean hasValue(AttributeType type, AttributeValue value)
{
-
for (int i=0; i < numValues; i++)
{
if (attributeTypes[i].equals(type) &&
@@ -418,7 +404,6 @@
boolean addValue(AttributeType type, String name,
AttributeValue value)
{
-
for (int i=0; i < numValues; i++)
{
if (attributeTypes[i].equals(type) &&
@@ -469,8 +454,6 @@
public static RDN decode(String rdnString)
throws DirectoryException
{
-
-
// A null or empty RDN is not acceptable.
if (rdnString == null)
{
@@ -847,7 +830,6 @@
*/
public RDN duplicate()
{
-
AttributeType[] newTypes = new AttributeType[numValues];
System.arraycopy(attributeTypes, 0, newTypes, 0, numValues);
@@ -876,7 +858,6 @@
*/
public boolean equals(Object o)
{
-
if (this == o)
{
return true;
@@ -901,7 +882,6 @@
*/
public int hashCode()
{
-
return toNormalizedString().hashCode();
}
@@ -947,7 +927,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append(toString());
}
@@ -979,7 +958,6 @@
*/
public void toNormalizedString(StringBuilder buffer)
{
-
if (normalizedRDN != null)
{
buffer.append(normalizedRDN);
@@ -1066,7 +1044,6 @@
*/
public int compareTo(RDN rdn)
{
-
if ((attributeTypes.length == 1) &&
(rdn.attributeTypes.length == 1))
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
index c8b052c..638cc57 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
@@ -76,7 +76,6 @@
public RestoreConfig(BackupDirectory backupDirectory,
String backupID, boolean verifyOnly)
{
-
this.backupDirectory = backupDirectory;
this.backupID = backupID;
this.verifyOnly = verifyOnly;
@@ -93,7 +92,6 @@
*/
public BackupDirectory getBackupDirectory()
{
-
return backupDirectory;
}
@@ -108,7 +106,6 @@
*/
public String getBackupID()
{
-
return backupID;
}
@@ -131,7 +128,6 @@
*/
public boolean verifyOnly()
{
-
return verifyOnly;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
index c211677..44c9161 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
@@ -193,7 +193,6 @@
*/
public Schema()
{
-
attributeTypes = new ConcurrentHashMap<String,AttributeType>();
objectClasses = new ConcurrentHashMap<String,ObjectClass>();
syntaxes = new ConcurrentHashMap<String,AttributeSyntax>();
@@ -248,7 +247,6 @@
public final ConcurrentHashMap<String,AttributeType>
getAttributeTypes()
{
-
return attributeTypes;
}
@@ -261,7 +259,6 @@
*/
public final LinkedHashSet<AttributeValue> getAttributeTypeSet()
{
-
return attributeTypeSet;
}
@@ -280,7 +277,6 @@
*/
public boolean hasAttributeType(String lowerName)
{
-
return attributeTypes.containsKey(lowerName);
}
@@ -299,7 +295,6 @@
*/
public final AttributeType getAttributeType(String lowerName)
{
-
return attributeTypes.get(lowerName);
}
@@ -324,7 +319,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (attributeTypes)
{
if (! overwriteExisting)
@@ -398,7 +392,6 @@
public final void deregisterAttributeType(
AttributeType attributeType)
{
-
synchronized (attributeTypes)
{
attributeTypes.remove(toLowerCase(attributeType.getOID()),
@@ -444,7 +437,6 @@
AttributeType attributeType,
AttributeType superiorType)
{
-
List<AttributeType> subTypes = subordinateTypes.get(superiorType);
if (subTypes == null)
{
@@ -482,7 +474,6 @@
AttributeType attributeType,
AttributeType superiorType)
{
-
List<AttributeType> subTypes = subordinateTypes.get(superiorType);
if (subTypes != null)
{
@@ -513,7 +504,6 @@
public final Iterable<AttributeType>
getSubTypes(AttributeType attributeType)
{
-
List<AttributeType> subTypes =
subordinateTypes.get(attributeType);
if (subTypes == null)
@@ -540,7 +530,6 @@
public final ConcurrentHashMap<String,ObjectClass>
getObjectClasses()
{
-
return objectClasses;
}
@@ -553,7 +542,6 @@
*/
public final LinkedHashSet<AttributeValue> getObjectClassSet()
{
-
return objectClassSet;
}
@@ -572,7 +560,6 @@
*/
public boolean hasObjectClass(String lowerName)
{
-
return objectClasses.containsKey(lowerName);
}
@@ -591,7 +578,6 @@
*/
public final ObjectClass getObjectClass(String lowerName)
{
-
return objectClasses.get(lowerName);
}
@@ -615,7 +601,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (objectClasses)
{
if (! overwriteExisting)
@@ -681,7 +666,6 @@
*/
public final void deregisterObjectClass(ObjectClass objectClass)
{
-
synchronized (objectClasses)
{
objectClasses.remove(toLowerCase(objectClass.getOID()),
@@ -718,7 +702,6 @@
*/
public final ConcurrentHashMap<String,AttributeSyntax> getSyntaxes()
{
-
return syntaxes;
}
@@ -731,7 +714,6 @@
*/
public final LinkedHashSet<AttributeValue> getSyntaxSet()
{
-
return syntaxSet;
}
@@ -750,7 +732,6 @@
*/
public boolean hasSyntax(String lowerName)
{
-
return syntaxes.containsKey(lowerName);
}
@@ -767,7 +748,6 @@
*/
public final AttributeSyntax getSyntax(String lowerName)
{
-
return syntaxes.get(lowerName);
}
@@ -792,7 +772,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (syntaxes)
{
if (! overwriteExisting)
@@ -837,7 +816,6 @@
*/
public final void deregisterSyntax(AttributeSyntax syntax)
{
-
synchronized (syntaxes)
{
syntaxes.remove(toLowerCase(syntax.getOID()), syntax);
@@ -870,7 +848,6 @@
public final ConcurrentHashMap<String,MatchingRule>
getMatchingRules()
{
-
return matchingRules;
}
@@ -883,7 +860,6 @@
*/
public final LinkedHashSet<AttributeValue> getMatchingRuleSet()
{
-
return matchingRuleSet;
}
@@ -902,7 +878,6 @@
*/
public boolean hasMatchingRule(String lowerName)
{
-
return matchingRules.containsKey(lowerName);
}
@@ -921,7 +896,6 @@
*/
public final MatchingRule getMatchingRule(String lowerName)
{
-
return matchingRules.get(lowerName);
}
@@ -946,7 +920,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
if (matchingRule instanceof ApproximateMatchingRule)
{
registerApproximateMatchingRule(
@@ -1039,7 +1012,6 @@
*/
public final void deregisterMatchingRule(MatchingRule matchingRule)
{
-
if (matchingRule instanceof ApproximateMatchingRule)
{
deregisterApproximateMatchingRule(
@@ -1104,7 +1076,6 @@
public final ConcurrentHashMap<String,ApproximateMatchingRule>
getApproximateMatchingRules()
{
-
return approximateMatchingRules;
}
@@ -1125,7 +1096,6 @@
public final ApproximateMatchingRule
getApproximateMatchingRule(String lowerName)
{
-
return approximateMatchingRules.get(lowerName);
}
@@ -1151,8 +1121,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
-
synchronized (matchingRules)
{
if (! overwriteExisting)
@@ -1226,7 +1194,6 @@
public final void deregisterApproximateMatchingRule(
ApproximateMatchingRule matchingRule)
{
-
synchronized (matchingRules)
{
String oid = matchingRule.getOID();
@@ -1268,7 +1235,6 @@
public final ConcurrentHashMap<String,EqualityMatchingRule>
getEqualityMatchingRules()
{
-
return equalityMatchingRules;
}
@@ -1289,7 +1255,6 @@
public final EqualityMatchingRule getEqualityMatchingRule(
String lowerName)
{
-
return equalityMatchingRules.get(lowerName);
}
@@ -1314,8 +1279,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
-
synchronized (matchingRules)
{
if (! overwriteExisting)
@@ -1389,7 +1352,6 @@
public final void deregisterEqualityMatchingRule(
EqualityMatchingRule matchingRule)
{
-
synchronized (matchingRules)
{
String oid = matchingRule.getOID();
@@ -1432,7 +1394,6 @@
public final ConcurrentHashMap<String,OrderingMatchingRule>
getOrderingMatchingRules()
{
-
return orderingMatchingRules;
}
@@ -1453,7 +1414,6 @@
public final OrderingMatchingRule getOrderingMatchingRule(
String lowerName)
{
-
return orderingMatchingRules.get(lowerName);
}
@@ -1478,8 +1438,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
-
synchronized (matchingRules)
{
if (! overwriteExisting)
@@ -1553,7 +1511,6 @@
public final void deregisterOrderingMatchingRule(
OrderingMatchingRule matchingRule)
{
-
synchronized (matchingRules)
{
String oid = matchingRule.getOID();
@@ -1595,7 +1552,6 @@
public final ConcurrentHashMap<String,SubstringMatchingRule>
getSubstringMatchingRules()
{
-
return substringMatchingRules;
}
@@ -1616,7 +1572,6 @@
public final SubstringMatchingRule getSubstringMatchingRule(
String lowerName)
{
-
return substringMatchingRules.get(lowerName);
}
@@ -1641,8 +1596,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
-
synchronized (matchingRules)
{
if (! overwriteExisting)
@@ -1716,7 +1669,6 @@
public final void deregisterSubstringMatchingRule(
SubstringMatchingRule matchingRule)
{
-
synchronized (matchingRules)
{
String oid = matchingRule.getOID();
@@ -1758,7 +1710,6 @@
public final ConcurrentHashMap<MatchingRule,MatchingRuleUse>
getMatchingRuleUses()
{
-
return matchingRuleUses;
}
@@ -1771,7 +1722,6 @@
*/
public final LinkedHashSet<AttributeValue> getMatchingRuleUseSet()
{
-
return matchingRuleUseSet;
}
@@ -1789,7 +1739,6 @@
*/
public boolean hasMatchingRuleUse(MatchingRule matchingRule)
{
-
return matchingRuleUses.containsKey(matchingRule);
}
@@ -1808,7 +1757,6 @@
public final MatchingRuleUse getMatchingRuleUse(
MatchingRule matchingRule)
{
-
return matchingRuleUses.get(matchingRule);
}
@@ -1834,7 +1782,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (matchingRuleUses)
{
MatchingRule matchingRule = matchingRuleUse.getMatchingRule();
@@ -1883,7 +1830,6 @@
public final void deregisterMatchingRuleUse(
MatchingRuleUse matchingRuleUse)
{
-
synchronized (matchingRuleUses)
{
matchingRuleUses.remove(matchingRuleUse.getMatchingRule(),
@@ -1916,7 +1862,6 @@
public final ConcurrentHashMap<ObjectClass,DITContentRule>
getDITContentRules()
{
-
return ditContentRules;
}
@@ -1929,7 +1874,6 @@
*/
public final LinkedHashSet<AttributeValue> getDITContentRuleSet()
{
-
return ditContentRuleSet;
}
@@ -1947,7 +1891,6 @@
*/
public boolean hasDITContentRule(ObjectClass objectClass)
{
-
return ditContentRules.containsKey(objectClass);
}
@@ -1967,7 +1910,6 @@
public final DITContentRule getDITContentRule(
ObjectClass objectClass)
{
-
return ditContentRules.get(objectClass);
}
@@ -1992,7 +1934,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (ditContentRules)
{
ObjectClass objectClass = ditContentRule.getStructuralClass();
@@ -2040,7 +1981,6 @@
public final void deregisterDITContentRule(
DITContentRule ditContentRule)
{
-
synchronized (ditContentRules)
{
ditContentRules.remove(ditContentRule.getStructuralClass(),
@@ -2068,7 +2008,6 @@
*/
public final LinkedHashSet<AttributeValue> getDITStructureRuleSet()
{
-
return ditStructureRuleSet;
}
@@ -2086,7 +2025,6 @@
public final ConcurrentHashMap<Integer,DITStructureRule>
getDITStructureRulesByID()
{
-
return ditStructureRulesByID;
}
@@ -2104,7 +2042,6 @@
public final ConcurrentHashMap<NameForm,DITStructureRule>
getDITStructureRulesByNameForm()
{
-
return ditStructureRulesByNameForm;
}
@@ -2121,7 +2058,6 @@
*/
public boolean hasDITStructureRule(int ruleID)
{
-
return ditStructureRulesByID.containsKey(ruleID);
}
@@ -2140,7 +2076,6 @@
*/
public boolean hasDITStructureRule(NameForm nameForm)
{
-
return ditStructureRulesByNameForm.containsKey(nameForm);
}
@@ -2159,7 +2094,6 @@
*/
public final DITStructureRule getDITStructureRule(int ruleID)
{
-
return ditStructureRulesByID.get(ruleID);
}
@@ -2178,7 +2112,6 @@
*/
public final DITStructureRule getDITStructureRule(NameForm nameForm)
{
-
return ditStructureRulesByNameForm.get(nameForm);
}
@@ -2203,7 +2136,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (ditStructureRulesByNameForm)
{
NameForm nameForm = ditStructureRule.getNameForm();
@@ -2270,7 +2202,6 @@
public final void deregisterDITStructureRule(
DITStructureRule ditStructureRule)
{
-
synchronized (ditStructureRulesByNameForm)
{
ditStructureRulesByNameForm.remove(
@@ -2300,7 +2231,6 @@
*/
public final LinkedHashSet<AttributeValue> getNameFormSet()
{
-
return nameFormSet;
}
@@ -2318,7 +2248,6 @@
public final ConcurrentHashMap<ObjectClass,NameForm>
getNameFormsByObjectClass()
{
-
return nameFormsByOC;
}
@@ -2336,7 +2265,6 @@
public final ConcurrentHashMap<String,NameForm>
getNameFormsByNameOrOID()
{
-
return nameFormsByName;
}
@@ -2354,7 +2282,6 @@
*/
public boolean hasNameForm(ObjectClass objectClass)
{
-
return nameFormsByOC.containsKey(objectClass);
}
@@ -2373,7 +2300,6 @@
*/
public boolean hasNameForm(String lowerName)
{
-
return nameFormsByName.containsKey(lowerName);
}
@@ -2390,7 +2316,6 @@
*/
public final NameForm getNameForm(ObjectClass objectClass)
{
-
return nameFormsByOC.get(objectClass);
}
@@ -2407,7 +2332,6 @@
*/
public final NameForm getNameForm(String lowerName)
{
-
return nameFormsByName.get(lowerName);
}
@@ -2430,7 +2354,6 @@
boolean overwriteExisting)
throws DirectoryException
{
-
synchronized (nameFormsByOC)
{
ObjectClass objectClass = nameForm.getStructuralClass();
@@ -2512,7 +2435,6 @@
*/
public final void deregisterNameForm(NameForm nameForm)
{
-
synchronized (nameFormsByOC)
{
nameFormsByOC.remove(nameForm.getStructuralClass(), nameForm);
@@ -2548,7 +2470,6 @@
*/
public long getOldestModificationTime()
{
-
return oldestModificationTime;
}
@@ -2564,7 +2485,6 @@
*/
public void setOldestModificationTime(long oldestModificationTime)
{
-
this.oldestModificationTime = oldestModificationTime;
}
@@ -2580,7 +2500,6 @@
*/
public long getYoungestModificationTime()
{
-
return youngestModificationTime;
}
@@ -2597,7 +2516,6 @@
public void setYoungestModificationTime(
long youngestModificationTime)
{
-
this.youngestModificationTime = youngestModificationTime;
}
@@ -2648,7 +2566,6 @@
SchemaFileElement element)
throws DirectoryException
{
-
try
{
rebuildDependentElements(element, 0);
@@ -2692,7 +2609,6 @@
SchemaFileElement element, int depth)
throws DirectoryException
{
-
if (depth > 20)
{
// FIXME -- Is this an appropriate maximum depth for detecting
@@ -2847,7 +2763,6 @@
*/
public final Schema duplicate()
{
-
Schema dupSchema = new Schema();
dupSchema.attributeTypes.putAll(attributeTypes);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
index d2f5773..78f68cc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
@@ -139,7 +139,6 @@
ByteString subFinalElement,
String matchingRuleID, boolean dnAttributes)
{
-
// This used to happen in getSubAnyElements, but we do it here
// so that we can make this.subAnyElements final.
if (subAnyElements == null) {
@@ -178,7 +177,6 @@
public static SearchFilter createANDFilter(List<SearchFilter>
filterComponents)
{
-
return new SearchFilter(FilterType.AND, filterComponents, null,
null, null, null, null, null, null, null,
false);
@@ -197,7 +195,6 @@
public static SearchFilter createORFilter(List<SearchFilter>
filterComponents)
{
-
return new SearchFilter(FilterType.OR, filterComponents, null,
null, null, null, null, null, null, null,
false);
@@ -215,7 +212,6 @@
public static SearchFilter createNOTFilter(
SearchFilter notComponent)
{
-
return new SearchFilter(FilterType.NOT, null, notComponent, null,
null, null, null, null, null, null,
false);
@@ -238,7 +234,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.EQUALITY, null, null,
attributeType, null, assertionValue, null,
null, null, null, false);
@@ -264,7 +259,6 @@
Set<String> attributeOptions,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.EQUALITY, null, null,
attributeType, attributeOptions,
assertionValue, null, null, null, null,
@@ -293,7 +287,6 @@
List<ByteString> subAnyElements,
ByteString subFinalElement)
{
-
return new SearchFilter(FilterType.SUBSTRING, null, null,
attributeType, null, null,
subInitialElement, subAnyElements,
@@ -325,7 +318,6 @@
List<ByteString> subAnyElements,
ByteString subFinalElement)
{
-
return new SearchFilter(FilterType.SUBSTRING, null, null,
attributeType, attributeOptions, null,
subInitialElement, subAnyElements,
@@ -349,7 +341,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.GREATER_OR_EQUAL, null, null,
attributeType, null, assertionValue, null,
null, null, null, false);
@@ -375,7 +366,6 @@
Set<String> attributeOptions,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.GREATER_OR_EQUAL, null, null,
attributeType, attributeOptions,
assertionValue, null, null, null, null,
@@ -399,7 +389,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.LESS_OR_EQUAL, null, null,
attributeType, null, assertionValue, null,
null, null, null, false);
@@ -425,7 +414,6 @@
Set<String> attributeOptions,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.LESS_OR_EQUAL, null, null,
attributeType, attributeOptions,
assertionValue, null, null, null, null,
@@ -445,7 +433,6 @@
public static SearchFilter createPresenceFilter(
AttributeType attributeType)
{
-
return new SearchFilter(FilterType.PRESENT, null, null,
attributeType, null, null, null, null,
null, null, false);
@@ -467,7 +454,6 @@
AttributeType attributeType,
Set<String> attributeOptions)
{
-
return new SearchFilter(FilterType.PRESENT, null, null,
attributeType, attributeOptions, null,
null, null, null, null, false);
@@ -490,7 +476,6 @@
AttributeType attributeType,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.APPROXIMATE_MATCH, null, null,
attributeType, null, assertionValue, null,
null, null, null, false);
@@ -516,7 +501,6 @@
Set<String> attributeOptions,
AttributeValue assertionValue)
{
-
return new SearchFilter(FilterType.APPROXIMATE_MATCH, null, null,
attributeType, attributeOptions,
assertionValue, null, null, null, null,
@@ -546,7 +530,6 @@
String matchingRuleID,
boolean dnAttributes)
{
-
return new SearchFilter(FilterType.EXTENSIBLE_MATCH, null, null,
attributeType, null, assertionValue, null,
null, null, matchingRuleID, dnAttributes);
@@ -579,7 +562,6 @@
String matchingRuleID,
boolean dnAttributes)
{
-
return new SearchFilter(FilterType.EXTENSIBLE_MATCH, null, null,
attributeType, attributeOptions,
assertionValue, null, null, null,
@@ -604,8 +586,6 @@
String filterString)
throws DirectoryException
{
-
-
if (filterString == null)
{
int msgID = MSGID_SEARCH_FILTER_NULL;
@@ -669,8 +649,6 @@
int endPos)
throws DirectoryException
{
-
-
// Make sure that the length is sufficient for a valid search
// filter.
int length = endPos - startPos;
@@ -1058,8 +1036,6 @@
int endPos)
throws DirectoryException
{
-
-
// Create a list to hold the returned components.
List<SearchFilter> filterComponents =
new ArrayList<SearchFilter>();
@@ -1184,8 +1160,6 @@
int endPos)
throws DirectoryException
{
-
-
// Get a binary representation of the value.
byte[] valueBytes =
getBytes(filterString.substring(equalPos+1, endPos));
@@ -1798,8 +1772,6 @@
int equalPos, int endPos)
throws DirectoryException
{
-
-
AttributeType attributeType = null;
Set<String> attributeOptions = new HashSet<String>();
boolean dnAttributes = false;
@@ -2100,7 +2072,6 @@
*/
public FilterType getFilterType()
{
-
return filterType;
}
@@ -2114,7 +2085,6 @@
*/
public Set<SearchFilter> getFilterComponents()
{
-
return filterComponents;
}
@@ -2128,7 +2098,6 @@
*/
public SearchFilter getNotComponent()
{
-
return notComponent;
}
@@ -2142,7 +2111,6 @@
*/
public AttributeType getAttributeType()
{
-
return attributeType;
}
@@ -2156,7 +2124,6 @@
*/
public AttributeValue getAssertionValue()
{
-
return assertionValue;
}
@@ -2170,7 +2137,6 @@
*/
public ByteString getSubInitialElement()
{
-
return subInitialElement;
}
@@ -2184,7 +2150,6 @@
*/
public List<ByteString> getSubAnyElements()
{
-
return subAnyElements;
}
@@ -2197,7 +2162,6 @@
*/
public ByteString getSubFinalElement()
{
-
return subFinalElement;
}
@@ -2212,7 +2176,6 @@
*/
public String getMatchingRuleID()
{
-
return matchingRuleID;
}
@@ -2227,7 +2190,6 @@
*/
public boolean getDNAttributes()
{
-
return dnAttributes;
}
@@ -2247,7 +2209,6 @@
public boolean matchesEntry(Entry entry)
throws DirectoryException
{
-
ConditionResult result = matchesEntryInternal(this, entry, 0);
switch (result)
{
@@ -2295,8 +2256,6 @@
Entry entry, int depth)
throws DirectoryException
{
-
-
switch (filterType)
{
case AND:
@@ -3049,8 +3008,6 @@
Entry entry)
throws DirectoryException
{
-
-
// We must have an assertion value for which to make the
// determination.
if (assertionValue == null)
@@ -3439,7 +3396,6 @@
*/
public boolean equals(Object o)
{
-
if (o == null)
{
return false;
@@ -3618,7 +3574,6 @@
*/
public int hashCode()
{
-
switch (filterType)
{
case AND:
@@ -3703,7 +3658,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -3720,7 +3674,6 @@
*/
public void toString(StringBuilder buffer)
{
-
switch (filterType)
{
case AND:
@@ -3923,7 +3876,6 @@
private void valueToFilterString(StringBuilder buffer,
ByteString value)
{
-
if (value == null)
{
return;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
index 67319ff..1d1a50a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
@@ -116,7 +116,6 @@
*/
public List<Control> getControls()
{
-
return controls;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
index 0a448e8..ed8715e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
@@ -61,7 +61,6 @@
*/
public SearchResultReference(String referralURL)
{
-
referralURLs = new ArrayList<String>(1);
referralURLs.add(referralURL);
@@ -79,7 +78,6 @@
*/
public SearchResultReference(List<String> referralURLs)
{
-
if (referralURLs == null)
{
this.referralURLs = new ArrayList<String>();
@@ -106,7 +104,6 @@
public SearchResultReference(List<String> referralURLs,
List<Control> controls)
{
-
if (referralURLs == null)
{
this.referralURLs = new ArrayList<String>();
@@ -137,7 +134,6 @@
*/
public List<String> getReferralURLs()
{
-
return referralURLs;
}
@@ -152,7 +148,6 @@
*/
public String getReferralURLString()
{
-
if ((referralURLs == null) || (referralURLs.isEmpty()))
{
return "";
@@ -191,7 +186,6 @@
*/
public List<Control> getControls()
{
-
return controls;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
index 404bc1b..14043fd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
@@ -52,7 +52,6 @@
public SynchronizationProviderResult(
boolean continueOperationProcessing)
{
-
this.continueOperationProcessing = continueOperationProcessing;
}
@@ -68,7 +67,6 @@
*/
public boolean continueOperationProcessing()
{
-
return continueOperationProcessing;
}
@@ -85,7 +83,6 @@
public void setContinueOperationProcessing(
boolean continueOperationProcessing)
{
-
this.continueOperationProcessing = continueOperationProcessing;
}
@@ -100,7 +97,6 @@
*/
public String toString()
{
-
StringBuilder buffer = new StringBuilder();
toString(buffer);
return buffer.toString();
@@ -117,7 +113,6 @@
*/
public void toString(StringBuilder buffer)
{
-
buffer.append("SynchronizationProviderResult(" +
"continueOperationProcessing=");
buffer.append(continueOperationProcessing);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
index 80dfcad..67a169c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
@@ -92,7 +92,6 @@
*/
public ChangeOperationType getChangeOperationType()
{
-
return ChangeOperationType.ADD;
}
@@ -107,7 +106,6 @@
*/
public List<Attribute> getAttributes()
{
-
return Collections.unmodifiableList(attributes);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java b/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
index a68a109..cf715fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
@@ -71,7 +71,6 @@
*/
public static String encode(byte[] rawData)
{
-
ensureNotNull(rawData);
@@ -126,7 +125,6 @@
public static byte[] decode(String encodedData)
throws ParseException
{
-
ensureNotNull(encodedData);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
index 0bf0dbf..95ec341 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
@@ -53,7 +53,6 @@
*/
protected ChangeRecordEntry(DN dn)
{
-
ensureNotNull(dn);
this.dn = dn;
}
@@ -66,7 +65,6 @@
*/
public final DN getDN()
{
-
return dn;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
index 3b33afc..de12800 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
@@ -61,7 +61,6 @@
*/
public ChangeOperationType getChangeOperationType()
{
-
return ChangeOperationType.DELETE;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
index ec1da24..7f782a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
@@ -93,7 +93,6 @@
*/
public EMailMessage(String sender, String recipient, String subject)
{
-
this.sender = sender;
this.subject = subject;
@@ -117,7 +116,6 @@
public EMailMessage(String sender, ArrayList<String> recipients,
String subject)
{
-
this.sender = sender;
this.recipients = recipients;
this.subject = subject;
@@ -134,7 +132,6 @@
*/
public String getSender()
{
-
return sender;
}
@@ -147,7 +144,6 @@
*/
public void setSender(String sender)
{
-
this.sender = sender;
}
@@ -161,7 +157,6 @@
*/
public ArrayList<String> getRecipients()
{
-
return recipients;
}
@@ -174,7 +169,6 @@
*/
public void setRecipients(ArrayList<String> recipients)
{
-
this.recipients = recipients;
}
@@ -187,7 +181,6 @@
*/
public void addRecipient(String recipient)
{
-
recipients.add(recipient);
}
@@ -200,7 +193,6 @@
*/
public String getSubject()
{
-
return subject;
}
@@ -213,7 +205,6 @@
*/
public void setSubject(String subject)
{
-
this.subject = subject;
}
@@ -227,7 +218,6 @@
*/
public StringBuilder getBody()
{
-
return body;
}
@@ -240,7 +230,6 @@
*/
public void setBody(StringBuilder body)
{
-
this.body = body;
}
@@ -253,7 +242,6 @@
*/
public void setBody(String bodyString)
{
-
body = new StringBuilder(bodyString);
}
@@ -266,7 +254,6 @@
*/
public void appendToBody(String text)
{
-
body.append(text);
}
@@ -280,7 +267,6 @@
*/
public LinkedList<MimeBodyPart> getAttachments()
{
-
return attachments;
}
@@ -293,7 +279,6 @@
*/
public void addAttachment(MimeBodyPart attachment)
{
-
attachments.add(attachment);
}
@@ -310,7 +295,6 @@
public void addAttachment(String attachmentText)
throws MessagingException
{
-
MimeBodyPart attachment = new MimeBodyPart();
attachment.setText(attachmentText);
attachments.add(attachment);
@@ -329,7 +313,6 @@
public void addAttachment(File attachmentFile)
throws MessagingException
{
-
MimeBodyPart attachment = new MimeBodyPart();
FileDataSource dataSource = new FileDataSource(attachmentFile);
@@ -353,8 +336,6 @@
public void send()
throws MessagingException
{
-
-
// Get information about the available mail servers that we can use.
MessagingException sendException = null;
for (Properties props : DirectoryServer.getMailServerPropertySets())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
index bc0143b..788a566 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
@@ -153,7 +153,6 @@
*/
public int getMessageID()
{
-
return messageID;
}
@@ -166,7 +165,6 @@
*/
public long getLineNumber()
{
-
return lineNumber;
}
@@ -184,7 +182,6 @@
*/
public boolean canContinueReading()
{
-
return canContinueReading;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
index 9a08203..af2abf5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
@@ -135,7 +135,6 @@
public LDIFReader(LDIFImportConfig importConfig)
throws IOException
{
-
ensureNotNull(importConfig);
this.importConfig = importConfig;
@@ -167,7 +166,6 @@
public Entry readEntry()
throws IOException, LDIFException
{
-
return readEntry(importConfig.validateSchema());
}
@@ -194,8 +192,6 @@
public Entry readEntry(boolean checkSchema)
throws IOException, LDIFException
{
-
-
while (true)
{
// Read the set of lines that make up the next entry.
@@ -343,7 +339,6 @@
public ChangeRecordEntry readChangeRecord(boolean defaultAdd)
throws IOException, LDIFException
{
-
while (true)
{
// Read the set of lines that make up the next entry.
@@ -427,7 +422,6 @@
private LinkedList<StringBuilder> readEntryLines()
throws IOException, LDIFException
{
-
// Read the entry lines into a buffer.
LinkedList<StringBuilder> lines = new LinkedList<StringBuilder>();
int lastLine = -1;
@@ -530,7 +524,6 @@
private DN readDN(LinkedList<StringBuilder> lines)
throws LDIFException
{
-
if (lines.isEmpty())
{
// This is possible if the contents of the first "entry" were just
@@ -713,7 +706,6 @@
private String readChangeType(LinkedList<StringBuilder> lines)
throws LDIFException
{
-
if (lines.isEmpty())
{
// Error. There must be other entries.
@@ -833,7 +825,6 @@
HashMap<AttributeType,List<Attribute>> operationalAttributes)
throws LDIFException
{
-
// Parse the attribute type description.
int colonPos = parseColonPosition(lines, line);
String attrDescr = line.substring(0, colonPos);
@@ -1000,7 +991,6 @@
LinkedList<StringBuilder> lines, StringBuilder line, DN entryDN,
String attributeName) throws LDIFException
{
-
// Parse the attribute type description.
int colonPos = parseColonPosition(lines, line);
String attrDescr = line.substring(0, colonPos);
@@ -1040,7 +1030,6 @@
*/
public long getLastEntryLineNumber()
{
-
return lastEntryLineNumber;
}
@@ -1057,7 +1046,6 @@
*/
public void rejectLastEntry(String message)
{
-
entriesRejected++;
BufferedWriter rejectWriter = importConfig.getRejectWriter();
@@ -1103,7 +1091,6 @@
*/
public void close()
{
-
importConfig.close();
}
@@ -1117,7 +1104,6 @@
*/
private static Attribute parseAttrDescription(String attrDescr)
{
-
String attrName;
String lowerName;
LinkedHashSet<String> options;
@@ -1170,7 +1156,6 @@
*/
public long getEntriesRead()
{
-
return entriesRead;
}
@@ -1184,7 +1169,6 @@
*/
public long getEntriesIgnored()
{
-
return entriesIgnored;
}
@@ -1201,7 +1185,6 @@
*/
public long getEntriesRejected()
{
-
return entriesRejected;
}
@@ -1352,7 +1335,6 @@
DN entryDN,
String attributeName) throws LDIFException
{
-
Attribute attr =
readSingleValueAttribute(lines, line, entryDN, attributeName);
LinkedHashSet<AttributeValue> values = attr.getValues();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
index 0204db0..f7fe917 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
@@ -87,7 +87,6 @@
public LDIFWriter(LDIFExportConfig exportConfig)
throws IOException
{
-
ensureNotNull(exportConfig);
this.exportConfig = exportConfig;
@@ -123,7 +122,6 @@
public void writeComment(String comment, int wrapColumn)
throws IOException
{
-
ensureNotNull(comment);
@@ -245,7 +243,6 @@
public boolean writeEntry(Entry entry)
throws IOException, LDIFException
{
-
ensureNotNull(entry);
return entry.toLDIF(exportConfig);
}
@@ -265,7 +262,6 @@
public void writeAddChangeRecord(Entry entry)
throws IOException
{
-
ensureNotNull(entry);
@@ -343,7 +339,6 @@
public void writeDeleteChangeRecord(Entry entry, boolean commentEntry)
throws IOException
{
-
ensureNotNull(entry);
// Get the information necessary to write the LDIF.
@@ -422,7 +417,6 @@
public void writeModifyChangeRecord(DN dn, List<Modification> modifications)
throws IOException
{
-
ensureNotNull(dn, modifications);
// If there aren't any modifications, then there's nothing to do.
@@ -533,7 +527,6 @@
DN newSuperior)
throws IOException
{
-
ensureNotNull(dn, newRDN);
@@ -602,7 +595,6 @@
public void flush()
throws IOException
{
-
writer.flush();
}
@@ -616,7 +608,6 @@
public void close()
throws IOException
{
-
writer.flush();
writer.close();
}
@@ -638,7 +629,6 @@
public static void appendLDIFSeparatorAndValue(StringBuilder buffer,
byte[] valueBytes)
{
-
ensureNotNull(buffer, valueBytes);
@@ -694,7 +684,6 @@
boolean wrapLines, int wrapColumn)
throws IOException
{
-
ensureNotNull(line, writer);
int length = line.length();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
index 638b175..35505be 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
@@ -83,7 +83,6 @@
*/
public List<LDAPModification> getModifications()
{
-
return Collections.unmodifiableList(modifications);
}
@@ -96,7 +95,6 @@
*/
public ChangeOperationType getChangeOperationType()
{
-
return ChangeOperationType.MODIFY;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
index d4d4d48..778fb0f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
@@ -121,7 +121,6 @@
*/
public ChangeOperationType getChangeOperationType()
{
-
return ChangeOperationType.MODIFY_DN;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java b/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
index 47ac688..9b5b03e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
@@ -61,7 +61,6 @@
*/
public MultiOutputStream(OutputStream... targetStreams)
{
-
Validator.ensureNotNull(targetStreams);
this.targetStreams = targetStreams;
@@ -74,7 +73,6 @@
*/
public void close()
{
-
for (OutputStream s : targetStreams)
{
try
@@ -98,7 +96,6 @@
*/
public void flush()
{
-
for (OutputStream s : targetStreams)
{
try
@@ -125,7 +122,6 @@
*/
public void write(byte[] b)
{
-
for (OutputStream s : targetStreams)
{
try
@@ -154,7 +150,6 @@
*/
public void write(byte[] b, int off, int len)
{
-
for (OutputStream s : targetStreams)
{
try
@@ -180,7 +175,6 @@
*/
public void write(int b)
{
-
for (OutputStream s : targetStreams)
{
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
index e6f5d32..e81ee1d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -2016,7 +2016,6 @@
*/
public static boolean needsBase64Encoding(byte[] valueBytes)
{
-
int length;
if ((valueBytes == null) || ((length = valueBytes.length) == 0))
{
@@ -2079,7 +2078,6 @@
*/
public static boolean needsBase64Encoding(String valueString)
{
-
int length;
if ((valueString == null) || ((length = valueString.length()) == 0))
{
@@ -2134,7 +2132,6 @@
*/
public static boolean mayUseExec()
{
-
String s = System.getProperty(PROPERTY_DISABLE_EXEC);
if (s == null)
{
@@ -2178,8 +2175,6 @@
Map<String,String> environment, List<String> output)
throws IOException, SecurityException
{
-
-
// See whether we'll allow the use of exec on this system. If not, then
// throw an exception.
if (! mayUseExec())
@@ -2333,8 +2328,6 @@
int endPos,
StringBuilder invalidReason)
{
-
-
if ((element == null) || (startPos >= endPos))
{
int msgID = MSGID_SCHEMANAME_EMPTY_VALUE;
@@ -2471,7 +2464,6 @@
*/
public static String toLowerCase(String s)
{
-
if (s == null)
{
return null;
@@ -2498,7 +2490,6 @@
*/
public static void toLowerCase(String s, StringBuilder buffer)
{
-
if (s == null)
{
return;
@@ -2620,7 +2611,6 @@
*/
public static void toLowerCase(byte[] b, StringBuilder buffer, boolean trim)
{
-
if (b == null)
{
return;
@@ -2775,7 +2765,6 @@
*/
public static String toUpperCase(String s)
{
-
if (s == null)
{
return null;
@@ -2802,7 +2791,6 @@
*/
public static void toUpperCase(String s, StringBuilder buffer)
{
-
if (s == null)
{
return;
@@ -2924,7 +2912,6 @@
*/
public static void toUpperCase(byte[] b, StringBuilder buffer, boolean trim)
{
-
if (b == null)
{
return;
@@ -3095,7 +3082,6 @@
public static StringBuilder toRFC3641StringValue(StringBuilder builder,
String string)
{
-
// Initial double-quote.
builder.append('"');
@@ -3128,7 +3114,6 @@
*/
public static String[] listToArray(List<String> stringList)
{
-
if (stringList == null)
{
return null;
@@ -3150,7 +3135,6 @@
*/
public static ArrayList<String> arrayToList(String[] stringArray)
{
-
if (stringArray == null)
{
return null;
@@ -3179,7 +3163,6 @@
*/
public static boolean recursiveDelete(File file)
{
-
boolean successful = true;
if (file.isDirectory())
{
@@ -3277,7 +3260,6 @@
*/
public static boolean isRelativePath(String path)
{
-
File f = new File(path);
return (! f.isAbsolute());
}
@@ -3296,7 +3278,6 @@
*/
public static File getFileForPath(String path)
{
-
File f = new File (path);
if (f.isAbsolute())
@@ -3337,8 +3318,6 @@
*/
public static Entry createEntry(DN dn)
{
-
-
// If the provided DN was null or empty, then return null because we don't
// support it.
if ((dn == null) || dn.isNullDN())
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
index 394560a..27211d2 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
@@ -231,7 +231,6 @@
*/
private void updateConfig(Entry entry)
{
-
if (entry.hasObjectClass(connectionHandlerOc))
{
updateConfigWithConnectionHandler(entry);
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
index 75a9669..72ee355 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
@@ -832,7 +832,6 @@
*/
private void runProgressUpdater()
{
-
progressUpdater = new Thread()
{
public void run()
--
Gitblit v1.10.0