From ea1068c292e9b341af6d6b563cd8988a96be20a9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Feb 2015 16:08:40 +0000
Subject: [PATCH] AutoRefactor: annotations cleanup

---
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java                                 |    6 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java                                  |    6 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java                                           |   48 
 opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java                               |   22 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java                        |   18 
 opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java                                          |   10 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java                              |   26 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java                           |    2 
 opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java                                              |    4 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java                       |   20 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java                                     |   18 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java                                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java                                         |    6 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java                |   13 
 opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java                                            |   16 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java                          |   26 
 opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java                                   |   18 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java                                             |   10 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java                          |    6 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java                                      |   76 
 opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java                                     |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java              |    4 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java                              |    9 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java                              |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java                            |   12 
 opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java                                        |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java                          |   30 
 opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java                                   |    4 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java                          |   22 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java                                 |    2 
 opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java                                    |   14 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java                         |   16 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java                         |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java                |   18 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java                                            |   46 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java                              |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java                                              |   36 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java                             |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java                                 |   26 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java                              |   12 
 opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java                                            |   12 
 opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java                                      |  264 +-
 opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java                                    |    6 
 opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java                               |   74 
 opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java                                            |    3 
 opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java                                                     |   14 
 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java                                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java                                           |    8 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java                            |    6 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java                           |    5 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java                        |    6 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java                  |    6 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java                  |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java                                |    3 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java                                  |    6 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java        |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java                         |   30 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java                 |   16 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java                                    |    6 
 opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java                                         |    3 
 opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java                                      |    6 
 opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java                                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java        |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java                 |    2 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java                                   |   32 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java                      |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java           |   10 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java                                     |    8 
 opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java                                                     |    2 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java                                               |   12 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java                         |    9 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java                             |   12 
 opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java                                    |   14 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java                                   |    6 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java                            |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java                        |   28 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java                         |    5 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java                               |   26 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java          |    6 
 opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java                                     |   16 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java                     |   12 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java                                |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java                            |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java                             |    2 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java                                         |   14 
 opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java                                     |   66 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java    |   10 
 opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java                     |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java                                             |   36 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java                          |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java                                     |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java                                |   26 
 opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java                                        |   10 
 opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java                                        |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java                                       |   12 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java                             |    6 
 opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java       |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java                                |   12 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java                      |   36 
 opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java                                   |   64 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java                                            |    8 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java                  |   92 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java                                       |   10 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java                                            |   96 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java                            |   12 
 opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java                                       |   28 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java                                       |   22 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java                      |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java                                   |    8 
 opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java                                               |   16 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java                                                   |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java                        |   28 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java                          |    8 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java                                |   32 
 opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java                                     |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java                          |   28 
 opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java                                      |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java                     |   18 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java                      |    7 
 opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java                                        |   14 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java                            |    8 
 opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java                                |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java                         |    6 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java                            |    6 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java                    |   20 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java                               |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java                        |   28 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java                                 |   28 
 opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java                               |   30 
 opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java                                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java                                 |    2 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java                        |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java                |    2 
 opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java                                           |    4 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java                                          |   40 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java                                   |   14 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java                         |   14 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java                         |   56 
 opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java                                           |   12 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java                       |   10 
 opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java                              |   26 
 opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java                               |    6 
 opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java                                        |   59 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java                                  |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java                      |    4 
 opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java                                             |   12 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java                                         |   12 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java                                          |   12 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java                        |   20 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java                          |    6 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java                                   |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java                  |   18 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java                               |   26 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java                        |   22 
 opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java                                      |   12 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java                                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java                             |   58 
 opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java                                          |   10 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java           |   20 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java                                                  |    3 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java                    |   48 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java                            |   10 
 opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java                       |   26 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java                        |    5 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java                                            |    9 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java                                       |   24 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java                                  |    4 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java                                 |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java            |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java                             |   12 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java                                     |   12 
 opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java                                           |   20 
 opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java                         |   18 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java                                   |    8 
 opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java                 |    4 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java                                  |    4 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java                      |   12 
 opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java                                         |    4 
 opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java                                          |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java                          |   22 
 opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java                                        |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java         |    2 
 opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java                                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java                           |   22 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java                               |   14 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java |   24 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java                                     |  102 
 opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java                                  |    4 
 opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java                                   |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java                           |   26 
 opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java                                        |    8 
 opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java                                 |   10 
 opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java                            |   12 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java   |    8 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java                              |   14 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java                                      |    2 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java                                  |    2 
 opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java                                        |    3 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java                                 |    6 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java                           |   28 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java                     |   26 
 opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java                                        |    4 
 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java                                |    6 
 opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java                                       |   28 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java                            |   26 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java                                       |   36 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java                 |    8 
 opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java                                        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java                        |   11 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java                        |   16 
 opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java                                          |   25 
 opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java                                                         |    6 
 opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java                                             |   62 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java                                 |   26 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java                                |    8 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java                  |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java                                 |   26 
 opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java                     |    3 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java                              |   10 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java                               |   12 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java                |    2 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java                      |    5 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java                                            |   20 
 opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java                                    |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java                  |   22 
 opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java                                           |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java                                        |    6 
 opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java                                         |  154 +-
 opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java                                           |    6 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java              |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java                  |   22 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java                                  |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java                                           |   12 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java                          |    2 
 opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java                                          |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java   |   16 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java                               |   84 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java                                    |    6 
 opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java                        |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java                      |   12 
 opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java                                   |    4 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java                                              |    8 
 opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java                                    |   53 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java                             |    8 
 opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java                                  |    8 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java         |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java                                |    8 
 257 files changed, 2,159 insertions(+), 2,140 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
index 0129707..65b4709 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.quicksetup;
 
@@ -112,7 +112,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean equals(Object o)
   {
     boolean equals = o == this;
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public int hashCode()
   {
     int hashCode = 44 + initialMemory + maxMemory;
@@ -165,7 +165,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String toString()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
index 9a38576..acf956f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2007-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -98,7 +98,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final OperationType getOperationType()
   {
     // Note that no debugging will be done in this method because it is a likely
@@ -112,7 +112,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final List<Control> getResponseControls()
   {
     // An abandon operation can never have a response, so just return an empty
@@ -125,7 +125,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void addResponseControl(Control control)
   {
     // An abandon operation can never have a response, so just ignore this.
@@ -136,7 +136,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void removeResponseControl(Control control)
   {
     // An abandon operation can never have a response, so just ignore this.
@@ -230,7 +230,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void toString(StringBuilder buffer)
   {
     buffer.append("AbandonOperation(connID=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
index fd01925..4d19a23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -58,7 +58,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeAccessControlHandler(AccessControlHandlerCfg
                                                   configuration)
       throws ConfigException, InitializationException
@@ -71,7 +71,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeAccessControlHandler()
   {
     // No implementation required.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
index 56080ae..d4b0eb5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2007-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -163,7 +163,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final OperationType getOperationType()
   {
     // Note that no debugging will be done in this method because it is a likely
@@ -179,28 +179,28 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final List<Control> getResponseControls()
   {
     return responseControls;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void addResponseControl(Control control)
   {
     responseControls.add(control);
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void removeResponseControl(Control control)
   {
     responseControls.remove(control);
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void toString(StringBuilder buffer)
   {
     buffer.append("DeleteOperation(connID=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
index 71751f2..65b7fc0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -219,7 +219,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final OperationType getOperationType()
   {
     // Note that no debugging will be done in this method because it is a likely
@@ -232,7 +232,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final List<Control> getResponseControls()
   {
     return responseControls;
@@ -243,7 +243,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void addResponseControl(Control control)
   {
     responseControls.add(control);
@@ -254,7 +254,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void removeResponseControl(Control control)
   {
     responseControls.remove(control);
@@ -464,7 +464,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void toString(StringBuilder buffer)
   {
     buffer.append("ExtendedOperation(connID=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
index c25762c..c8c8dfa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -694,7 +694,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public void initializePasswordValidator(PasswordValidatorCfg configuration)
         throws ConfigException, InitializationException
     {
@@ -702,7 +702,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public boolean passwordIsAcceptable(ByteString newPassword,
                                         Set<ByteString> currentPasswords,
                                         Operation operation, Entry userEntry,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
index bcabe26..9e10cec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -75,7 +75,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final OperationType getOperationType()
   {
     // Note that no debugging will be done in this method because it is a likely
@@ -87,7 +87,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final List<Control> getResponseControls()
   {
     // An unbind operation can never have a response, so just return an empty
@@ -100,7 +100,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void addResponseControl(Control control)
   {
     // An unbind operation can never have a response, so just ignore this.
@@ -111,7 +111,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void removeResponseControl(Control control)
   {
     // An unbind operation can never have a response, so just ignore this.
@@ -163,7 +163,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void toString(StringBuilder buffer)
   {
     buffer.append("UnbindOperation(connID=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
index 73265ff..b814733 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -82,7 +82,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    AESPasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -95,7 +95,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_AES;
@@ -106,7 +106,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -141,7 +141,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -182,7 +182,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -206,7 +206,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -217,7 +217,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -243,7 +243,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -255,7 +255,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -269,7 +269,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -282,7 +282,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -297,7 +297,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // This password storage scheme should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index d32ecef..111983b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -71,7 +71,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(AnonymousSASLMechanismHandlerCfg
                                                   configuration)
          throws ConfigException, InitializationException
@@ -87,7 +87,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler()
   {
     DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_ANONYMOUS);
@@ -99,7 +99,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOperation)
   {
     // See if the client provided SASL credentials including trace information.
@@ -131,7 +131,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is not a password-based mechanism.
@@ -143,7 +143,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This is not a secure mechanism.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
index 700e830..790e05c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -72,7 +72,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    AttributeValuePasswordValidatorCfg configuration)
   {
@@ -85,7 +85,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeAttributeValueChangeListener(this);
@@ -131,7 +131,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
@@ -200,7 +200,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
index 0a65926..f5543e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -72,7 +72,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    Base64PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -85,7 +85,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_BASE64;
@@ -96,7 +96,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -108,7 +108,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -126,7 +126,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -140,7 +140,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -174,7 +174,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -186,7 +186,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -200,7 +200,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -213,7 +213,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -228,7 +228,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // Base64-encoded values may be easily decoded with no key or special
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
index 7c73575..147df5d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -67,7 +67,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeTrustManagerProvider(
                   BlindTrustManagerProviderCfg configuration)
          throws ConfigException, InitializationException
@@ -81,7 +81,7 @@
    * Performs any finalization that may be necessary for this trust manager
    * provider.
    */
-  @Override()
+  @Override
   public void finalizeTrustManagerProvider()
   {
     // No implementation is required.
@@ -92,7 +92,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public TrustManager[] getTrustManagers()
          throws DirectoryException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
index 7af1385..6c13be0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -82,7 +82,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    BlowfishPasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -95,7 +95,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_BLOWFISH;
@@ -106,7 +106,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -141,7 +141,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -183,7 +183,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -207,7 +207,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -218,7 +218,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -244,7 +244,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -256,7 +256,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -270,7 +270,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -283,7 +283,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -298,7 +298,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // This password storage scheme should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 46830a1..3f01a15 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -111,7 +111,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(
                    CramMD5SASLMechanismHandlerCfg configuration)
          throws ConfigException, InitializationException
@@ -156,7 +156,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler()
   {
     currentConfig.removeCramMD5ChangeListener(this);
@@ -169,7 +169,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOperation)
   {
     // The CRAM-MD5 bind process uses two stages.  See if the client provided
@@ -523,7 +523,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is a password-based mechanism.
@@ -535,7 +535,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This may be considered a secure mechanism.
@@ -547,7 +547,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
index be3f32e..00a9840 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -85,7 +85,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    CharacterSetPasswordValidatorCfg configuration)
          throws ConfigException
@@ -103,7 +103,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeCharacterSetChangeListener(this);
@@ -114,7 +114,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
@@ -486,7 +486,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
index f310f08..d7fb62b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -65,7 +65,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    ClearPasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -78,7 +78,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_CLEAR;
@@ -89,7 +89,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -101,7 +101,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -119,7 +119,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -131,7 +131,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -142,7 +142,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -154,7 +154,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -166,7 +166,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -180,7 +180,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -193,7 +193,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -208,7 +208,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // Clear-text passwords are not obscured in any way.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
index 24b35da..59f9b8c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -61,14 +61,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return true;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
 
@@ -91,7 +91,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -100,7 +100,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
index 2424a9e..ba168bd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -101,7 +101,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    CryptPasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException {
@@ -114,7 +114,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_CRYPT;
@@ -241,7 +241,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -268,7 +268,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -379,7 +379,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -405,7 +405,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -417,7 +417,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -431,7 +431,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -444,7 +444,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -455,7 +455,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -469,7 +469,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -484,7 +484,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // FIXME:
@@ -506,7 +506,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
           PasswordStorageSchemeCfg configuration,
           List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
index 1ca76ee..ee5bacc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -83,7 +83,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    DictionaryPasswordValidatorCfg configuration)
          throws ConfigException, InitializationException
@@ -99,7 +99,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeDictionaryChangeListener(this);
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
@@ -234,7 +234,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 3a7b4d1..ea22144 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -99,7 +99,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(
           DigestMD5SASLMechanismHandlerCfg configuration)
   throws ConfigException, InitializationException {
@@ -134,7 +134,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler() {
     configuration.removeDigestMD5ChangeListener(this);
     DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_DIGEST_MD5);
@@ -144,7 +144,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOp) {
       ClientConnection clientConnection = bindOp.getClientConnection();
       if (clientConnection == null) {
@@ -180,7 +180,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is a password-based mechanism.
@@ -192,7 +192,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This may be considered a secure mechanism.
@@ -203,7 +203,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
index a424ddd..5674f17 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -118,7 +118,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeGroupImplementation(
                    DynamicGroupImplementationCfg configuration)
          throws ConfigException, InitializationException
@@ -132,7 +132,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public DynamicGroup newInstance(ServerContext serverContext, Entry groupEntry)
          throws DirectoryException
   {
@@ -173,7 +173,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public SearchFilter getGroupDefinitionFilter()
          throws DirectoryException
   {
@@ -188,7 +188,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isGroupDefinition(Entry entry)
   {
     ifNull(entry);
@@ -205,7 +205,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public DN getGroupDN()
   {
     return groupEntryDN;
@@ -240,7 +240,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsNestedGroups()
   {
     // Dynamic groups don't support nesting.
@@ -252,7 +252,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public List<DN> getNestedGroupDNs()
   {
     // Dynamic groups don't support nesting.
@@ -264,7 +264,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void addNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -278,7 +278,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void removeNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -292,7 +292,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMember(DN userDN, Set<DN> examinedGroups)
          throws DirectoryException
   {
@@ -317,7 +317,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
          throws DirectoryException
   {
@@ -342,7 +342,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public MemberList getMembers()
          throws DirectoryException
   {
@@ -354,7 +354,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public MemberList getMembers(DN baseDN, SearchScope scope,
                                SearchFilter filter)
          throws DirectoryException
@@ -375,7 +375,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean mayAlterMemberList()
   {
     return false;
@@ -386,7 +386,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void addMember(Entry userEntry)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -400,7 +400,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void removeMember(DN userDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -414,7 +414,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("DynamicGroup(dn=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
index 23ac512..51f77d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -402,7 +402,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean hasMoreMembers()
   {
     while (! searchesCompleted)
@@ -426,7 +426,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Entry nextMemberEntry()
          throws MembershipException
   {
@@ -466,7 +466,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void close()
   {
     searchesCompleted = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
index d615949..ed5b3e7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -105,7 +105,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
   {
@@ -118,7 +118,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeVirtualAttributeProvider()
   {
     config.removeEntityTagChangeListener(this);
@@ -129,7 +129,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Attribute getValues(final Entry entry, final VirtualAttributeRule rule)
   {
     // Save reference to current configuration in case it changes.
@@ -156,7 +156,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
   {
@@ -169,7 +169,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean hasValue(final Entry entry, final VirtualAttributeRule rule)
   {
     // ETag is always present.
@@ -181,7 +181,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeVirtualAttributeProvider(
       final EntityTagVirtualAttributeCfg configuration) throws ConfigException,
       InitializationException
@@ -209,7 +209,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     // ETag is always single-valued.
@@ -221,7 +221,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSearchable(final VirtualAttributeRule rule,
                               final SearchOperation searchOperation,
                               final boolean isPreIndexed)
@@ -236,7 +236,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
   {
@@ -249,7 +249,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(final Entry entry,
       final VirtualAttributeRule rule, final ByteString subInitial,
       final List<ByteString> subAny, final ByteString subFinal)
@@ -263,7 +263,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSearch(final VirtualAttributeRule rule,
       final SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index 616bfbb..bf2fe8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -63,14 +63,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     String dnString = entry.getName().toString();
@@ -78,7 +78,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     // This virtual attribute provider will always generate a value.
@@ -86,7 +86,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
     try
@@ -105,7 +105,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -117,7 +117,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -127,7 +127,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -137,7 +137,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -161,7 +161,7 @@
    * </UL>
    * This virtual attribute also can be optimized as pre-indexed.
    */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -229,7 +229,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
index 0e7e56e..83ca267 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
@@ -70,14 +70,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     return Attributes.create(rule.getAttributeType(), getUUIDString(entry));
@@ -90,7 +90,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     // This virtual attribute provider will always generate a value.
@@ -98,7 +98,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
     MatchingRule matchingRule = rule.getAttributeType().getEqualityMatchingRule();
@@ -116,7 +116,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -128,7 +128,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -138,7 +138,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -148,7 +148,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -158,7 +158,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -167,7 +167,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index adcc199..e404a61 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -125,7 +125,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                       AccountStatusNotificationHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 516043c..834c79f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -280,7 +280,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 6f4927b..2c61b78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -93,7 +93,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(
                    ExternalSASLMechanismHandlerCfg configuration)
          throws ConfigException, InitializationException
@@ -136,7 +136,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler()
   {
     currentConfig.removeExternalChangeListener(this);
@@ -149,7 +149,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOperation)
   {
     ExternalSASLMechanismHandlerCfg config = currentConfig;
@@ -322,7 +322,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is not a password-based mechanism.
@@ -334,7 +334,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This may be considered a secure mechanism.
@@ -346,7 +346,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index ad9137f..e9c9738 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -285,7 +285,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                         FileBasedKeyManagerProviderCfg configuration,
                         List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index b6c2a01..5d9b541 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -100,7 +100,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeTrustManagerProvider(
                    FileBasedTrustManagerProviderCfg configuration)
          throws ConfigException, InitializationException
@@ -248,7 +248,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeTrustManagerProvider()
   {
     currentConfig.removeFileBasedChangeListener(this);
@@ -259,7 +259,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public TrustManager[] getTrustManagers()
          throws DirectoryException
   {
@@ -315,7 +315,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                          TrustManagerProviderCfg configuration,
                          List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index dd1fc3d..13c5b48 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -215,7 +215,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasMoreMembers()
   {
     if (! memberDNIterator.hasNext())
@@ -226,7 +226,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public DN nextMemberDN() throws MembershipException
   {
     if (! memberDNIterator.hasNext())
@@ -239,7 +239,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Entry nextMemberEntry() throws MembershipException
   {
     if (! memberDNIterator.hasNext())
@@ -261,7 +261,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void close()
   {
     // No implementation is required.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
index 12396b8..ea1b5d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -304,7 +304,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index b0c07d6..0eab842 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -117,7 +117,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(
       GSSAPISASLMechanismHandlerCfg configuration) throws ConfigException,
       InitializationException {
@@ -335,7 +335,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler() {
     logout();
     if(configuration != null)
@@ -358,7 +358,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOp)
   {
     ClientConnection connection = bindOp.getClientConnection();
@@ -433,7 +433,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is not a password-based mechanism.
@@ -444,7 +444,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This may be considered a secure mechanism.
@@ -456,7 +456,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
       SASLMechanismHandlerCfg configuration, List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
index a02aa99..355806f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -60,14 +60,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     DITStructureRule ditRule = getDITStructureRule(entry);
@@ -80,14 +80,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     return getDITStructureRule(entry)!=null;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -99,7 +99,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -109,7 +109,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -119,7 +119,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -129,7 +129,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -139,7 +139,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index f6fade4..f5f205a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -64,14 +64,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     Backend backend = DirectoryServer.getBackend(entry.getName());
@@ -93,7 +93,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     Backend backend = DirectoryServer.getBackend(entry.getName());
@@ -112,7 +112,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
     Backend backend = DirectoryServer.getBackend(entry.getName());
@@ -135,7 +135,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -147,7 +147,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -157,7 +157,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -167,7 +167,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -177,7 +177,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -186,7 +186,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index fbedcdd..d8b39b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -65,14 +65,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return true;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     // FIXME -- This probably isn't the most efficient implementation.
@@ -95,7 +95,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     // FIXME -- This probably isn't the most efficient implementation.
@@ -118,7 +118,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule,
                           ByteString value)
   {
@@ -137,7 +137,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -149,7 +149,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -159,7 +159,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -169,7 +169,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -192,7 +192,7 @@
    * Searching for this virtual attribute cannot be pre-indexed and thus,
    * it should not be searchable when pre-indexed is required.
    */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -246,7 +246,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
index b1daa00..d80c39c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -70,7 +70,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    LengthBasedPasswordValidatorCfg configuration)
          throws ConfigException, InitializationException
@@ -96,7 +96,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeLengthBasedChangeListener(this);
@@ -107,7 +107,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
@@ -139,7 +139,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
index d1219c4..58cf4ea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -95,7 +95,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    MD5PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -121,7 +121,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_MD5;
@@ -132,7 +132,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -171,7 +171,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -218,7 +218,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -268,7 +268,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -280,7 +280,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -294,7 +294,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -307,7 +307,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -318,7 +318,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -331,7 +331,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -346,7 +346,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // MD5 may be considered reasonably secure for this purpose.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index 4c5b290..1636537 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -83,7 +83,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeVirtualAttributeProvider(
                             MemberVirtualAttributeCfg configuration)
          throws ConfigException, InitializationException
@@ -97,7 +97,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return true;
@@ -108,7 +108,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     if (! currentConfig.isAllowRetrievingMembership())
@@ -159,7 +159,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     Group<?> g =
@@ -205,7 +205,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
     Group<?> g =
@@ -232,7 +232,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -248,7 +248,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -262,7 +262,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -276,7 +276,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -290,7 +290,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -303,7 +303,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
index dcb8757..6ca44c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -64,14 +64,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     Backend backend = DirectoryServer.getBackend(entry.getName());
@@ -93,7 +93,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     Backend backend = DirectoryServer.getBackend(entry.getName());
@@ -110,7 +110,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
     Backend<?> backend = DirectoryServer.getBackend(entry.getName());
@@ -132,7 +132,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -144,7 +144,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -154,7 +154,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -163,7 +163,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 977f89f..8ffa9c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -247,7 +247,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                         PKCS11KeyManagerProviderCfg configuration,
                           List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
index c6a4ab3..84ce381 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
@@ -123,7 +123,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeWorkQueue(ParallelWorkQueueCfg configuration)
          throws ConfigException, InitializationException
   {
@@ -174,7 +174,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeWorkQueue(LocalizableMessage reason)
   {
     shutdownRequested = true;
@@ -530,7 +530,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isIdle()
   {
     if (opQueue.size() > 0) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 1636303..291331a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -1172,7 +1172,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(ExtendedOperationHandlerCfg
                                                 configuration,
                                            List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index 8d425d3..6044643 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -61,14 +61,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     if (!entry.isSubentry() && !entry.isLDAPSubentry())
@@ -115,7 +115,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -124,7 +124,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 2a4244e..e0c6e29 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -92,7 +92,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeSASLMechanismHandler(
                    PlainSASLMechanismHandlerCfg configuration)
          throws ConfigException, InitializationException
@@ -114,7 +114,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeSASLMechanismHandler()
   {
     currentConfig.removePlainChangeListener(this);
@@ -127,7 +127,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSASLBind(BindOperation bindOperation)
   {
     // Get the SASL credentials provided by the user and decode them.
@@ -502,7 +502,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isPasswordBased(String mechanism)
   {
     // This is a password-based mechanism.
@@ -514,7 +514,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSecure(String mechanism)
   {
     // This is not a secure mechanism.
@@ -526,7 +526,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
index 5a5efdc..8026e7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -81,7 +81,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    RC4PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -94,7 +94,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_RC4;
@@ -105,7 +105,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -140,7 +140,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -182,7 +182,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -206,7 +206,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -217,7 +217,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -243,7 +243,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -255,7 +255,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -269,7 +269,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -282,7 +282,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -297,7 +297,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // This password storage scheme should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
index 0bb8321..092721f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -91,7 +91,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordGenerator(
       RandomPasswordGeneratorCfg configuration)
          throws ConfigException, InitializationException
@@ -219,7 +219,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordGenerator()
   {
     currentConfig.removeRandomChangeListener(this);
@@ -261,7 +261,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PasswordGeneratorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 8e06f78..e364e8f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -175,7 +175,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeIdentityMapper()
   {
     currentConfig.removeRegularExpressionChangeListener(this);
@@ -186,7 +186,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Entry getEntryForID(String id)
          throws DirectoryException
   {
@@ -301,7 +301,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index c1edc8f..6c191a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -73,7 +73,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    RepeatedCharactersPasswordValidatorCfg configuration)
   {
@@ -86,7 +86,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeRepeatedCharactersChangeListener(this);
@@ -97,7 +97,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 811bbe9..01e77a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -94,7 +94,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SHA1PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -120,7 +120,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SHA_1;
@@ -131,7 +131,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -170,7 +170,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -216,7 +216,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -266,7 +266,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -278,7 +278,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -292,7 +292,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -305,7 +305,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -316,7 +316,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -330,7 +330,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -345,7 +345,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // SHA-1 should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 7fa254e..e539210 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SaltedMD5PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -137,7 +137,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SALTED_MD5;
@@ -148,7 +148,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -202,7 +202,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -262,7 +262,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -328,7 +328,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does support the authentication password syntax.
@@ -340,7 +340,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getAuthPasswordSchemeName()
   {
     return AUTH_PASSWORD_SCHEME_NAME_SALTED_MD5;
@@ -351,7 +351,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -407,7 +407,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -451,7 +451,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -462,7 +462,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -476,7 +476,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -491,7 +491,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // MD5 may be considered reasonably secure for this purpose.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index 3846c89..6f69e5f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA1PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -136,7 +136,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SALTED_SHA_1;
@@ -147,7 +147,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -201,7 +201,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -261,7 +261,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -327,7 +327,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does support the authentication password syntax.
@@ -339,7 +339,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getAuthPasswordSchemeName()
   {
     return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1;
@@ -350,7 +350,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -406,7 +406,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -450,7 +450,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -461,7 +461,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -475,7 +475,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -490,7 +490,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // SHA-1 should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index 767b545..c6aa9bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA256PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -139,7 +139,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SALTED_SHA_256;
@@ -150,7 +150,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -204,7 +204,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -264,7 +264,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -332,7 +332,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does support the authentication password syntax.
@@ -344,7 +344,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getAuthPasswordSchemeName()
   {
     return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_256;
@@ -355,7 +355,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -411,7 +411,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -455,7 +455,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -466,7 +466,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -480,7 +480,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -495,7 +495,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // SHA-2 should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index 5cf2a0b..76a52f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -111,7 +111,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA384PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -140,7 +140,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SALTED_SHA_384;
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -205,7 +205,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -265,7 +265,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -333,7 +333,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does support the authentication password syntax.
@@ -345,7 +345,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getAuthPasswordSchemeName()
   {
     return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_384;
@@ -356,7 +356,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -412,7 +412,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -456,7 +456,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -467,7 +467,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -481,7 +481,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -496,7 +496,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // SHA-2 should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 497001a..dfa26c5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -111,7 +111,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA512PasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -139,7 +139,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_SALTED_SHA_512;
@@ -150,7 +150,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -204,7 +204,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -264,7 +264,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -332,7 +332,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does support the authentication password syntax.
@@ -344,7 +344,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getAuthPasswordSchemeName()
   {
     return AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_512;
@@ -355,7 +355,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -411,7 +411,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -455,7 +455,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return false;
@@ -466,7 +466,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -480,7 +480,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -495,7 +495,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // SHA-2 should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index ba1e39d..e8e2cbd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -70,7 +70,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    SimilarityBasedPasswordValidatorCfg configuration)
          throws ConfigException, InitializationException
@@ -83,7 +83,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeSimilarityBasedChangeListener(this);
@@ -94,7 +94,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
index 4d3005f..e9617e8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimpleStaticGroupMemberList.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 import org.forgerock.i18n.LocalizableMessage;
@@ -82,14 +82,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasMoreMembers()
   {
     return memberDNIterator.hasNext();
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public DN nextMemberDN()
          throws MembershipException
   {
@@ -113,7 +113,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Entry nextMemberEntry() throws MembershipException
   {
     if (memberDNIterator.hasNext())
@@ -143,7 +143,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void close()
   {
     // No implementation is required.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index 1c643cc..ed7e8a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -137,7 +137,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void initializeGroupImplementation(StaticGroupImplementationCfg configuration)
          throws ConfigException, InitializationException
   {
@@ -145,7 +145,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public StaticGroup newInstance(ServerContext serverContext, Entry groupEntry) throws DirectoryException
   {
     ifNull(groupEntry);
@@ -228,7 +228,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public SearchFilter getGroupDefinitionFilter()
          throws DirectoryException
   {
@@ -241,7 +241,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isGroupDefinition(Entry entry)
   {
     ifNull(entry);
@@ -290,7 +290,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public DN getGroupDN()
   {
     return groupEntryDN;
@@ -304,14 +304,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean supportsNestedGroups()
   {
     return true;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public List<DN> getNestedGroupDNs()
   {
     try {
@@ -323,7 +323,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void addNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -365,7 +365,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void removeNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -407,7 +407,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMember(DN userDN, Set<DN> examinedGroups) throws DirectoryException
   {
     reloadIfNeeded();
@@ -435,7 +435,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
          throws DirectoryException
   {
@@ -492,7 +492,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public MemberList getMembers() throws DirectoryException
   {
     reloadIfNeeded();
@@ -500,7 +500,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public MemberList getMembers(DN baseDN, SearchScope scope, SearchFilter filter) throws DirectoryException
   {
     reloadIfNeeded();
@@ -512,14 +512,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean mayAlterMemberList()
   {
     return true;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void addMember(Entry userEntry) throws UnsupportedOperationException, DirectoryException
   {
     ifNull(userEntry);
@@ -559,7 +559,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void removeMember(DN userDN) throws UnsupportedOperationException, DirectoryException
   {
     ifNull(userDN);
@@ -602,7 +602,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("StaticGroup(");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
index 25d74e5..a33eebc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -62,14 +62,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     return Attributes.create(rule.getAttributeType(), entry
@@ -77,7 +77,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
     //A structural object class is always present in an entry.
@@ -85,7 +85,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -97,7 +97,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -107,7 +107,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -117,7 +117,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -127,7 +127,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -138,7 +138,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 48cda98..55f23a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -371,7 +371,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 4e956ac..448d53c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -267,7 +267,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index e6cf34b..89c3d80 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -60,14 +60,14 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     return false;
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     DN schemaDN = DirectoryServer.getSchemaDN();
@@ -79,7 +79,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
                                           ByteString subInitial,
@@ -91,7 +91,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -101,7 +101,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -111,7 +111,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
                               ByteString value)
@@ -121,7 +121,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -132,7 +132,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
index e871684..ec91131 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -159,7 +159,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeWorkQueue(TraditionalWorkQueueCfg configuration)
       throws ConfigException, InitializationException
   {
@@ -227,7 +227,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeWorkQueue(LocalizableMessage reason)
   {
     queueWriteLock.lock();
@@ -781,7 +781,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isIdle()
   {
     queueReadLock.lock();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
index 7cf3709..17c2966 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -82,7 +82,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordStorageScheme(
                    TripleDESPasswordStorageSchemeCfg configuration)
          throws ConfigException, InitializationException
@@ -95,7 +95,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_3DES;
@@ -106,7 +106,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -141,7 +141,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -183,7 +183,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
   {
@@ -207,7 +207,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isReversible()
   {
     return true;
@@ -218,7 +218,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
   {
@@ -244,7 +244,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsAuthPasswordSyntax()
   {
     // This storage scheme does not support the authentication password syntax.
@@ -256,7 +256,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
   {
@@ -270,7 +270,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
   {
@@ -283,7 +283,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
          throws DirectoryException
@@ -298,7 +298,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isStorageSchemeSecure()
   {
     // This password storage scheme should be considered secure.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index 43833bc..0d0d473 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -72,7 +72,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    UniqueCharactersPasswordValidatorCfg configuration)
   {
@@ -85,7 +85,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizePasswordValidator()
   {
     currentConfig.removeUniqueCharactersChangeListener(this);
@@ -96,7 +96,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index 3b47726..6dd02bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -71,7 +71,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeVirtualAttributeProvider(
                             UserDefinedVirtualAttributeCfg configuration)
          throws ConfigException, InitializationException
@@ -85,7 +85,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeVirtualAttributeProvider()
   {
     currentConfig.removeUserDefinedChangeListener(this);
@@ -96,7 +96,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMultiValued()
   {
     if (currentConfig != null)
@@ -111,7 +111,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
     Set<String> userDefinedValues = currentConfig.getValue();
@@ -137,7 +137,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
                               boolean isPreIndexed)
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
index 8b0bc79..47622ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -113,7 +113,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeGroupImplementation(
                    VirtualStaticGroupImplementationCfg configuration)
          throws ConfigException, InitializationException
@@ -127,7 +127,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public VirtualStaticGroup newInstance(ServerContext serverContext, Entry groupEntry)
          throws DirectoryException
   {
@@ -182,7 +182,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public SearchFilter getGroupDefinitionFilter()
          throws DirectoryException
   {
@@ -197,7 +197,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isGroupDefinition(Entry entry)
   {
     ifNull(entry);
@@ -214,7 +214,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public DN getGroupDN()
   {
     return groupEntryDN;
@@ -248,7 +248,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean supportsNestedGroups()
   {
     // Virtual static groups don't support nesting.
@@ -260,7 +260,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public List<DN> getNestedGroupDNs()
   {
     // Virtual static groups don't support nesting.
@@ -272,7 +272,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void addNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -286,7 +286,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void removeNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -300,7 +300,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMember(DN userDN, Set<DN> examinedGroups)
          throws DirectoryException
   {
@@ -332,7 +332,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
          throws DirectoryException
   {
@@ -364,7 +364,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public MemberList getMembers()
          throws DirectoryException
   {
@@ -391,7 +391,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public MemberList getMembers(DN baseDN, SearchScope scope,
                                SearchFilter filter)
          throws DirectoryException
@@ -419,7 +419,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean mayAlterMemberList()
   {
     return false;
@@ -430,7 +430,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void addMember(Entry userEntry)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -444,7 +444,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void removeMember(DN userDN)
          throws UnsupportedOperationException, DirectoryException
   {
@@ -458,7 +458,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("VirtualStaticGroup(dn=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
index f734b2f..ad1ebe8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -73,7 +73,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public void processExtendedOperation(ExtendedOperation operation)
   {
     // Process any supported controls for this operation, including the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
index e99da22..10aa593 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -159,7 +159,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   protected void close0()
   {
     writer.shutdown();
@@ -171,7 +171,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeLogPublisher(FileBasedAuditLogPublisherCfg cfg, ServerContext serverContext)
       throws ConfigException, InitializationException
   {
@@ -280,7 +280,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void logAddResponse(AddOperation addOperation)
   {
     if (!isLoggable(addOperation))
@@ -330,7 +330,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void logDeleteResponse(DeleteOperation deleteOperation)
   {
     if (!isLoggable(deleteOperation))
@@ -356,7 +356,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
   {
     if (!isLoggable(modifyDNOperation))
@@ -405,7 +405,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void logModifyResponse(ModifyOperation modifyOperation)
   {
     if (!isLoggable(modifyOperation))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
index 0b5df93..8b47ec3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -81,7 +81,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getMonitorInstanceName()
   {
     return "JVM Memory Usage";
@@ -128,7 +128,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public ArrayList<Attribute> getMonitorData()
   {
     ArrayList<Attribute> attrs = new ArrayList<Attribute>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
index 7cabe86..0abe197 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -231,7 +231,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(final Set<PluginType> pluginTypes,
       final AttributeCleanupPluginCfg configuration) throws ConfigException,
       InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
index a438536..c5faad8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -122,7 +122,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      ChangeNumberControlPluginCfg configuration)
          throws ConfigException
@@ -179,7 +179,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeChangeNumberControlChangeListener(this);
@@ -189,7 +189,7 @@
  /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
   {
@@ -202,7 +202,7 @@
    /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationDeleteOperation deleteOperation)
   {
@@ -215,7 +215,7 @@
    /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
   {
@@ -228,7 +228,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
   {
@@ -243,7 +243,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
index ca5bbfd..fb4bd9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -114,7 +114,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      EntryUUIDPluginCfg configuration)
          throws ConfigException
@@ -143,7 +143,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeEntryUUIDChangeListener(this);
@@ -154,7 +154,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
   {
@@ -188,7 +188,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -221,7 +221,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index 041a720..d5803ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -164,7 +164,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                          LDAPAttributeDescriptionListPluginCfg configuration)
          throws ConfigException
@@ -198,7 +198,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeLDAPAttributeDescriptionListChangeListener(this);
@@ -209,7 +209,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreParse doPreParse(
       PreParseSearchOperation searchOperation)
   {
@@ -223,7 +223,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
index ae46ab9..32cc478 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      LastModPluginCfg configuration)
          throws ConfigException
@@ -140,7 +140,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeLastModChangeListener(this);
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -192,7 +192,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
   {
@@ -253,7 +253,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
   {
@@ -292,7 +292,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index baa8b06..b09503a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -114,7 +114,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                          PasswordPolicyImportPluginCfg configuration)
          throws ConfigException
@@ -309,7 +309,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
   {
@@ -561,7 +561,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 0be99a0..c0c3aa8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -282,7 +282,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
@@ -978,7 +978,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin() {
     currentConfiguration.removeReferentialIntegrityChangeListener(this);
     if(interval > 0)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index 9f6e954..689df34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -82,7 +82,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      SevenBitCleanPluginCfg configuration)
          throws ConfigException
@@ -113,7 +113,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeSevenBitCleanChangeListener(this);
@@ -124,7 +124,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
   {
@@ -189,7 +189,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreParse
                doPreParse(PreParseAddOperation addOperation)
   {
@@ -255,7 +255,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyOperation modifyOperation)
   {
@@ -333,7 +333,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyDNOperation modifyDNOperation)
   {
@@ -454,7 +454,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
index 67d1cd8..abae578 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -108,7 +108,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      UniqueAttributePluginCfg configuration)
           throws ConfigException
@@ -165,7 +165,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfiguration.removeUniqueAttributeChangeListener(this);
@@ -177,7 +177,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -221,7 +221,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationModifyOperation modifyOperation)
   {
@@ -354,7 +354,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PreOperation doPreOperation(
                     PreOperationModifyDNOperation modifyDNOperation)
   {
@@ -397,7 +397,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void doPostSynchronization(
                          PostSynchronizationAddOperation addOperation)
   {
@@ -434,7 +434,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void doPostSynchronization(
                          PostSynchronizationModifyOperation modifyOperation)
   {
@@ -506,7 +506,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void doPostSynchronization(
                          PostSynchronizationModifyDNOperation modifyDNOperation)
   {
@@ -694,7 +694,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
@@ -817,7 +817,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
   {
@@ -856,7 +856,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
   {
@@ -928,7 +928,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
index 97fef61..dc3937a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -121,7 +121,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      ProfilerPluginCfg configuration)
          throws ConfigException
@@ -164,7 +164,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     currentConfig.removeProfilerChangeListener(this);
@@ -199,7 +199,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.Startup doStartup()
   {
     ProfilerPluginCfg config = currentConfig;
@@ -219,7 +219,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
index 2ef0b46..588aa61 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -124,7 +124,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializeConnectionHandler(LDIFConnectionHandlerCfg
                                                configuration)
   {
@@ -167,7 +167,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
   {
     stopRequested = true;
@@ -202,7 +202,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getConnectionHandlerName()
   {
     return "LDIF Connection Handler";
@@ -213,7 +213,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String getProtocol()
   {
     return "LDIF";
@@ -224,7 +224,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Collection<HostPort> getListeners()
   {
     // There are no listeners for this connection handler.
@@ -236,7 +236,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Collection<ClientConnection> getClientConnections()
   {
     // There are no client connections for this connection handler.
@@ -248,7 +248,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void run()
   {
     isStopped = false;
@@ -567,7 +567,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("LDIFConnectionHandler(ldifDirectory=\"");
@@ -582,7 +582,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
index 3b43c75..1c94209 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -379,7 +379,7 @@
    * @return  The unique identifier that has been assigned to this
    *          connection.
    */
-  @Override()
+  @Override
   public long getConnectionID()
   {
     return connectionID;
@@ -399,7 +399,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public ConnectionHandler<?> getConnectionHandler()
   {
     return InternalConnectionHandler.getInstance();
@@ -414,7 +414,7 @@
    * @return  The protocol that the client is using to communicate
    *          with the Directory Server.
    */
-  @Override()
+  @Override
   public String getProtocol()
   {
     return "internal";
@@ -427,7 +427,7 @@
    *
    * @return  A string representation of the address of the client.
    */
-  @Override()
+  @Override
   public String getClientAddress()
   {
     return "internal";
@@ -456,7 +456,7 @@
    * @return  A string representation of the address on the server to
    *          which the client connected.
    */
-  @Override()
+  @Override
   public String getServerAddress()
   {
     return "internal";
@@ -489,7 +489,7 @@
    *          if the client is not connected over an IP-based
    *          connection.
    */
-  @Override()
+  @Override
   public InetAddress getRemoteAddress()
   {
     return null;
@@ -506,7 +506,7 @@
    *          connection.  It may be <CODE>null</CODE> if the client
    *          is not connected over an IP-based connection.
    */
-  @Override()
+  @Override
   public InetAddress getLocalAddress()
   {
     return null;
@@ -524,7 +524,7 @@
    *                    searches performed using this client
    *                    connection.
    */
-  @Override()
+  @Override
   public void setSizeLimit(int sizeLimit)
   {
     // No implementation required.  We never want to set a nonzero
@@ -543,7 +543,7 @@
    *                           entries that should be check for
    *                           matches during a search.
    */
-  @Override()
+  @Override
   public void setLookthroughLimit(int lookthroughLimit)
   {
     // No implementation required.  We never want to set a nonzero
@@ -564,7 +564,7 @@
    *                        allowed to remain idle before it should be
    *                        disconnected.
    */
-  @Override()
+  @Override
   public void setIdleTimeLimit(long idleTimeLimit)
   {
     // No implementation required.  We never want to set a nonzero
@@ -583,7 +583,7 @@
    *                    searches performed using this client
    *                    connection.
    */
-  @Override()
+  @Override
   public void setTimeLimit(int timeLimit)
   {
     // No implementation required.  We never want to set a nonzero
@@ -610,7 +610,7 @@
    *          using a secure mechanism to communicate with the server,
    *          or <CODE>false</CODE> if not.
    */
-  @Override()
+  @Override
   public boolean isSecure()
   {
       return true;
@@ -629,7 +629,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void sendResponse(Operation operation)
   {
     // There will not be any response sent by this method, since there
@@ -653,7 +653,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void setAuthenticationInfo(AuthenticationInfo
                                          authenticationInfo)
   {
@@ -672,7 +672,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void setUnauthenticated()
   {
     // No implementation required.
@@ -2038,7 +2038,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void sendSearchEntry(SearchOperation searchOperation,
                               SearchResultEntry searchEntry)
          throws DirectoryException
@@ -2071,7 +2071,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public boolean sendSearchReference(SearchOperation searchOperation,
                       SearchResultReference searchReference)
          throws DirectoryException
@@ -2098,7 +2098,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   protected boolean sendIntermediateResponseMessage(
                          IntermediateResponse intermediateResponse)
   {
@@ -2130,7 +2130,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void disconnect(DisconnectReason disconnectReason,
                          boolean sendNotification,
                          LocalizableMessage message)
@@ -2156,7 +2156,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public Collection<Operation> getOperationsInProgress()
   {
     return Collections.emptyList();
@@ -2179,7 +2179,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public Operation getOperationInProgress(int messageID)
   {
     // Internal operations will not be tracked.
@@ -2206,7 +2206,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public boolean removeOperationInProgress(int messageID)
   {
     // No implementation is required, since internal operations will
@@ -2231,7 +2231,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public CancelResult cancelOperation(int messageID,
                                       CancelRequest cancelRequest)
   {
@@ -2254,7 +2254,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void cancelAllOperations(CancelRequest cancelRequest)
   {
     // No implementation is required since internal operations cannot
@@ -2277,7 +2277,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void cancelAllOperationsExcept(CancelRequest cancelRequest,
                                         int messageID)
   {
@@ -2298,7 +2298,7 @@
    *          that is suitable for including in the monitor entry for
    *          the associated connection handler.
    */
-  @Override()
+  @Override
   public String getMonitorSummary()
   {
     StringBuilder buffer = new StringBuilder();
@@ -2320,7 +2320,7 @@
    * @param  buffer  The buffer to which the information should be
    *                 appended.
    */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("InternalClientConnection(connID=");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
index 58c8bd8..6184efc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 import org.forgerock.i18n.LocalizableMessage;
@@ -136,7 +136,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
   {
     // No implementation is required.
@@ -152,7 +152,7 @@
    * @return  A unique name that may be used to refer to this
    *          connection handler.
    */
-  @Override()
+  @Override
   public String getConnectionHandlerName()
   {
     return "Internal Connection Handler";
@@ -169,7 +169,7 @@
    * @return  The name of the protocol used to communicate with
    *          clients.
    */
-  @Override()
+  @Override
   public String getProtocol()
   {
     return protocol;
@@ -186,7 +186,7 @@
    *          connection handler does not accept connections from
    *          network clients.
    */
-  @Override()
+  @Override
   public Collection<HostPort> getListeners()
   {
     return listeners;
@@ -201,7 +201,7 @@
    * @return  The set of active client connections that have been
    *          established through this connection handler.
    */
-  @Override()
+  @Override
   public Collection<ClientConnection> getClientConnections()
   {
     return connectionList;
@@ -213,7 +213,7 @@
    * Operates in a loop, accepting new connections and ensuring that
    * requests on those connections are handled properly.
    */
-  @Override()
+  @Override
   public void run()
   {
     // No implementation is required since this connection handler
@@ -228,7 +228,7 @@
    *
    * @return  A string representation of this connection handler.
    */
-  @Override()
+  @Override
   public String toString()
   {
     return "Internal Connection Handler";
@@ -243,7 +243,7 @@
    * @param  buffer  The buffer to which the information should be
    *                 appended.
    */
-  @Override()
+  @Override
   public void toString(StringBuilder buffer)
   {
     buffer.append("Internal Connection Handler");
@@ -263,7 +263,7 @@
    * Return the configuration dn of the object.
    * @return DN of the entry.
    */
-  @Override()
+  @Override
   public DN getComponentEntryDN() {
       return this.configuration.dn();
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
index 29f3c3a..0531c20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -147,7 +147,7 @@
    *          from this input stream wihtout blocking.
    * @throws IOException if an I/O error occurs.
    */
-  @Override()
+  @Override
   public synchronized int available() throws IOException
   {
     if (messageReader.remaining() < 1)
@@ -182,7 +182,7 @@
    * stream has been reached.  If the queue is full, thenit will be
    * cleared before adding the marker element.
    */
-  @Override()
+  @Override
   public void close()
   {
     socket.close();
@@ -226,7 +226,7 @@
    * @param  readLimit  The maximum limit of bytes that can be read
    *                    before the mark position becomes invalid.
    */
-  @Override()
+  @Override
   public void mark(int readLimit)
   {
     // No implementation is required.
@@ -243,7 +243,7 @@
    *          support the use of the {@code mark} and {@code reset}
    *          methods.
    */
-  @Override()
+  @Override
   public boolean markSupported()
   {
     return false;
@@ -261,7 +261,7 @@
    * @throws  IOException  If a problem occurs while trying to read
    *                       data from the stream.
    */
-  @Override()
+  @Override
   public synchronized int read()
          throws IOException
   {
@@ -316,7 +316,7 @@
    * @throws  IOException  If a problem occurs while trying to read
    *                       data from the stream.
    */
-  @Override()
+  @Override
   public int read(byte[] b)
          throws IOException
   {
@@ -343,7 +343,7 @@
    * @throws  IOException  If a problem occurs while trying to read
    *                       data from the stream.
    */
-  @Override()
+  @Override
   public synchronized int read(byte[] b, int off, int len)
          throws IOException
   {
@@ -392,7 +392,7 @@
    * have any effect, as this input stream inplementation does not
    * support marking.
    */
-  @Override()
+  @Override
   public void reset()
   {
     // No implementation is required.
@@ -413,7 +413,7 @@
    * @throws  IOException  If a problem occurs while trying to read
    *                       data from the input stream.
    */
-  @Override()
+  @Override
   public synchronized long skip(long n)
          throws IOException
   {
@@ -460,7 +460,7 @@
    *
    * @return  A string representation of this internal LDAP socket.
    */
-  @Override()
+  @Override
   public String toString()
   {
     return "InternalLDAPInputStream";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
index 0517e4c..1f1ee9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -216,7 +216,7 @@
    * Closes this output stream, its associated socket, and the
    * socket's associated input stream.
    */
-  @Override()
+  @Override
   public void close()
   {
     socket.close();
@@ -246,7 +246,7 @@
    * written out.  This will have no effect, since this output
    * stream implementation does not use buffering.
    */
-  @Override()
+  @Override
   public void flush()
   {
     // No implementation is required.
@@ -263,7 +263,7 @@
    * @throws  IOException  If the output stream is closed, or if there
    *                       is a problem with the data being written.
    */
-  @Override()
+  @Override
   public void write(byte[] b)
          throws IOException
   {
@@ -287,7 +287,7 @@
    * @throws  IOException  If the output stream is closed, or if there
    *                       is a problem with the data being written.
    */
-  @Override()
+  @Override
   public synchronized void write(byte[] b, int off, int len)
          throws IOException
   {
@@ -340,7 +340,7 @@
    * @throws  IOException  If the output stream is closed, or if there
    *                       is a problem with the data being written.
    */
-  @Override()
+  @Override
   public synchronized void write(int b)
          throws IOException
   {
@@ -842,7 +842,7 @@
    *
    * @return  A string representation of this internal LDAP socket.
    */
-  @Override()
+  @Override
   public String toString()
   {
     return "InternalLDAPOutputStream";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
index dd26ee9..69295ce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -192,7 +192,7 @@
    *
    * @param  bindpoint  The socket address to which to bind.
    */
-  @Override()
+  @Override
   public void bind(SocketAddress bindpoint)
   {
     // No implementation is required.
@@ -203,7 +203,7 @@
   /**
    * Closes this socket.  This will make it unavailable for use.
    */
-  @Override()
+  @Override
   public synchronized void close()
   {
     try
@@ -231,7 +231,7 @@
    *
    * @param  endpoint  The address of the remote endpoint.
    */
-  @Override()
+  @Override
   public synchronized void connect(SocketAddress endpoint)
   {
     closed       = false;
@@ -250,7 +250,7 @@
    * @param  timeout   The maximum length of time in milliseconds to
    *                   wait for the connection to be established.
    */
-  @Override()
+  @Override
   public void connect(SocketAddress endpoint, int timeout)
   {
     closed       = false;
@@ -268,7 +268,7 @@
    * @return  {@code null} because this implementation does not
    *          support use with NIO channels.
    */
-  @Override()
+  @Override
   public SocketChannel getChannel()
   {
     // This implementation does not support use with NIO channels.
@@ -284,7 +284,7 @@
    *
    * @return The address to which this socket is connected.
    */
-  @Override()
+  @Override
   public InetAddress getInetAddress()
   {
     try
@@ -305,7 +305,7 @@
    *
    * @return  The input stream for this socket.
    */
-  @Override()
+  @Override
   public InternalLDAPInputStream getInputStream()
   {
     return inputStream;
@@ -322,7 +322,7 @@
    * @return  {@code true} if SO_KEEPALIVE is enabled, or
    *          {@code false} if not.
    */
-  @Override()
+  @Override
   public boolean getKeepAlive()
   {
     return keepAlive;
@@ -337,7 +337,7 @@
    *
    * @return The local address to which this socket is bound.
    */
-  @Override()
+  @Override
   public InetAddress getLocalAddress()
   {
     try
@@ -360,7 +360,7 @@
    *
    * @return  The local port to which this socket is bound.
    */
-  @Override()
+  @Override
   public int getLocalPort()
   {
     return 389;
@@ -375,7 +375,7 @@
    *
    * @return  The local socket address to which this socket is bound.
    */
-  @Override()
+  @Override
   public SocketAddress getLocalSocketAddress()
   {
     try
@@ -400,7 +400,7 @@
    * @return  {@code true} if OOBINLINE is enabled, or {@code false}
    *          if it is not.
    */
-  @Override()
+  @Override
   public boolean getOOBInline()
   {
     return oobInline;
@@ -413,7 +413,7 @@
    *
    * @return  The output stream for this socket.
    */
-  @Override()
+  @Override
   public InternalLDAPOutputStream getOutputStream()
   {
     return outputStream;
@@ -428,7 +428,7 @@
    *
    * @return  The remote port to which this socket is connected.
    */
-  @Override()
+  @Override
   public int getPort()
   {
     return 389;
@@ -443,7 +443,7 @@
    *
    * @return  The value of the SO_RCVBUF option for this socket.
    */
-  @Override()
+  @Override
   public int getReceiveBufferSize()
   {
     return receiveBufferSize;
@@ -460,7 +460,7 @@
    * @return  The remote socket address to which this socket is
    *          connected.
    */
-  @Override()
+  @Override
   public SocketAddress getRemoteSocketAddress()
   {
     try
@@ -485,7 +485,7 @@
    * @return  {@code true} if SO_REUSEADDR is enabled, or
    *          {@code false} if it is not.
    */
-  @Override()
+  @Override
   public boolean getReuseAddress()
   {
     return reuseAddress;
@@ -500,7 +500,7 @@
    *
    * @return  The value of the SO_SNDBUF option for this socket.
    */
-  @Override()
+  @Override
   public int getSendBufferSize()
   {
     return sendBufferSize;
@@ -515,7 +515,7 @@
    *
    * @return  The value of the SO_LINGER option for this socket.
    */
-  @Override()
+  @Override
   public int getSoLinger()
   {
     return lingerDuration;
@@ -530,7 +530,7 @@
    *
    * @return  The value of the SO_TIMEOUT option for this socket.
    */
-  @Override()
+  @Override
   public int getSoTimeout()
   {
     return timeout;
@@ -547,7 +547,7 @@
    * @return  {@code true} if TCP_NODELAY is enabled, or {@code false}
    *          if it is not.
    */
-  @Override()
+  @Override
   public boolean getTcpNoDelay()
   {
     return tcpNoDelay;
@@ -562,7 +562,7 @@
    *
    * @return  The traffic class for this socket.
    */
-  @Override()
+  @Override
   public int getTrafficClass()
   {
     return trafficClass;
@@ -578,7 +578,7 @@
    * @return  {@code true} to indicate that the socket is bound to a
    *          local address.
    */
-  @Override()
+  @Override
   public boolean isBound()
   {
     return true;
@@ -592,7 +592,7 @@
    *
    * @return  {@code false} to indicate that the socket is not closed.
    */
-  @Override()
+  @Override
   public boolean isClosed()
   {
     return closed;
@@ -607,7 +607,7 @@
    *
    * @return  {@code true} to indicate that the socket is connected.
    */
-  @Override()
+  @Override
   public boolean isConnected()
   {
     return (! closed);
@@ -623,7 +623,7 @@
    * @return  {@code false} to indicate that the input side of this
    *          socket is not closed.
    */
-  @Override()
+  @Override
   public boolean isInputShutdown()
   {
     return closed;
@@ -639,7 +639,7 @@
    * @return  {@code false} to indicate that the output side of this
    *          socket is not closed.
    */
-  @Override()
+  @Override
   public boolean isOutputShutdown()
   {
     return closed;
@@ -655,7 +655,7 @@
    * @throws  IOException  If a problem occurs while trying to write
    *                       the provided data over this socket.
    */
-  @Override()
+  @Override
   public void sendUrgentData(int data)
          throws IOException
   {
@@ -671,7 +671,7 @@
    *
    * @param  on  The value to use for the SO_KEEPALIVE option.
    */
-  @Override()
+  @Override
   public void setKeepAlive(boolean on)
   {
     keepAlive = on;
@@ -686,7 +686,7 @@
    *
    * @param  on  The value to use for the OOBINLINE option.
    */
-  @Override()
+  @Override
   public void setOOBInline(boolean on)
   {
     oobInline = on;
@@ -706,7 +706,7 @@
    * @param  bandwidth       An {@code int} expressing the relative
    *                         importance of high bandwidth.
    */
-  @Override()
+  @Override
   public void setPerformancePreferences(int connectionTime,
                                         int latency, int bandwidth)
   {
@@ -722,7 +722,7 @@
    *
    * @param  size  The value to use for the SO_RCVBUF option.
    */
-  @Override()
+  @Override
   public void setReceiveBufferSize(int size)
   {
     receiveBufferSize = size;
@@ -737,7 +737,7 @@
    *
    * @param  on  The value to use for the SO_REUSEADDR option.
    */
-  @Override()
+  @Override
   public void setReuseAddress(boolean on)
   {
     reuseAddress = on;
@@ -752,7 +752,7 @@
    *
    * @param  size  The value to use for the SO_SNDBUF option.
    */
-  @Override()
+  @Override
   public void setSendBufferSize(int size)
   {
     sendBufferSize = size;
@@ -769,7 +769,7 @@
    * @param  linger  The length of time in milliseconds to allow the
    *                 connection to linger.
    */
-  @Override()
+  @Override
   public void setSoLinger(boolean on, int linger)
   {
     lingerDuration = linger;
@@ -784,7 +784,7 @@
    *
    * @param  timeout  The value to use for the SO_TIMEOUT option.
    */
-  @Override()
+  @Override
   public void setSoTimeout(int timeout)
   {
     this.timeout = timeout;
@@ -799,7 +799,7 @@
    *
    * @param  on  The value to use for the TCP_NODELAY option.
    */
-  @Override()
+  @Override
   public void setTcpNoDelay(boolean on)
   {
     tcpNoDelay = on;
@@ -814,7 +814,7 @@
    *
    * @param  tc  The value to use for the traffic class.
    */
-  @Override()
+  @Override
   public void setTrafficClass(int tc)
   {
     trafficClass = tc;
@@ -826,7 +826,7 @@
    * Shuts down the input side of this socket.  This will have the
    * effect of closing the entire socket.
    */
-  @Override()
+  @Override
   public void shutdownInput()
   {
     close();
@@ -838,7 +838,7 @@
    * Shuts down the output side of this socket.  This will have the
    * effect of closing the entire socket.
    */
-  @Override()
+  @Override
   public void shutdownOutput()
   {
     close();
@@ -851,7 +851,7 @@
    *
    * @return  A string representation of this internal LDAP socket.
    */
-  @Override()
+  @Override
   public String toString()
   {
     return "InternalLDAPSocket";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
index a216b5b..1c5f69a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocketFactory.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -88,7 +89,7 @@
    *
    * @return  The created internal LDAP socket.
    */
-  @Override()
+  @Override
   public Socket createSocket(InetAddress host, int port)
   {
     return new InternalLDAPSocket();
@@ -107,7 +108,7 @@
    *
    * @return  The created internal LDAP socket.
    */
-  @Override()
+  @Override
   public Socket createSocket(String host, int port)
   {
     return new InternalLDAPSocket();
@@ -130,7 +131,7 @@
    *
    * @return  The created internal LDAP socket.
    */
-  @Override()
+  @Override
   public Socket createSocket(InetAddress host, int port,
                              InetAddress clientHost, int clientPort)
   {
@@ -154,7 +155,7 @@
    *
    * @return  The created internal LDAP socket.
    */
-  @Override()
+  @Override
   public Socket createSocket(String host, int port,
                              InetAddress clientHost, int clientPort)
   {
@@ -170,7 +171,7 @@
    * @return  A string representation of this internal LDAP socket
    *          factory.
    */
-  @Override()
+  @Override
   public String toString()
   {
     return "InternalLDAPSocketFactory";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java
index 8b0240a..fa75397 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -250,7 +250,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public void sendSearchEntry(SearchResultEntry searchEntry)
          throws DirectoryException
   {
@@ -279,7 +279,7 @@
        mayInstantiate=false,
        mayExtend=false,
        mayInvoke=false)
-  @Override()
+  @Override
   public boolean sendSearchReference(
                       SearchResultReference searchReference)
          throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 3d1cb85..535f9b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -367,7 +367,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 4a6ee30..feb0a69 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.protocols.ldap;
 
@@ -1480,7 +1480,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public Selector getWriteSelector()
   {
     Selector selector = writeSelector.get();
@@ -1509,7 +1509,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public long getMaxBlockedWriteTimeLimit()
   {
     return connectionHandler.getMaxBlockedWriteTimeLimit();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 5f1d6a7..1a6c7c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -787,7 +787,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
       List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
index 241e899..22c39e2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -129,7 +129,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
     FractionalLDIFImportPluginCfg configuration)
     throws ConfigException
@@ -151,7 +151,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void finalizePlugin()
   {
     // Nothing to do
@@ -213,7 +213,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public final void doLDIFImportEnd(LDIFImportConfig importConfig)
   {
     // Remove the cookie of this import session
@@ -227,7 +227,7 @@
    * See class comment for what we achieve here...
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public final PluginResult.ImportLDIF doLDIFImport(
     LDIFImportConfig importConfig, Entry entry)
   {
@@ -478,7 +478,7 @@
   }
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
     List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
index 589e915..4c17bd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools.tasks;
 
@@ -174,7 +174,7 @@
    *
    * @return  The hash code for this task entry.
    */
-  @Override()
+  @Override
   public int hashCode()
   {
     return hashCode;
@@ -183,7 +183,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean equals(Object o)
   {
     if (this == o)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index 21213ce..da9299a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -4203,7 +4203,7 @@
    *
    * @return  The hash code for this entry.
    */
-  @Override()
+  @Override
   public int hashCode()
   {
     int hashCode = dn.hashCode();
@@ -4250,7 +4250,7 @@
    * @return  {@code true} if the provided object may be considered
    *          equal to this entry, or {@code false} if not.
    */
-  @Override()
+  @Override
   public boolean equals(Object o)
   {
     if (this == o)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java b/opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java
index 0960a4c..e6544ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/PublicAPI.java
@@ -79,7 +79,7 @@
  * annotation, then it should be assumed the package is private and
  * should not be used by third-party code.
  */
-@Documented()
+@Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.PACKAGE,
           ElementType.TYPE,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
index 906da95..3316ea9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/AddChangeRecordEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -120,7 +120,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String toString()
   {
     StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
index 911c321..dabf41d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/DeleteChangeRecordEntry.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -70,7 +71,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String toString()
   {
     StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
index da11116..281d139 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyChangeRecordEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -102,7 +102,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String toString()
   {
     StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
index fde4249..65cd0a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ModifyDNChangeRecordEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -133,7 +133,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public String toString()
   {
     StringBuilder buffer = new StringBuilder();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
index 1b0e81c..fe5e4b7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -80,7 +80,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -94,7 +94,7 @@
    * Tests the ability of the alert handler to send an administrative alert
    * with no special configuration.
    */
-  @Test()
+  @Test
   public void testAlertHandler()
   {
     int count = DummyAlertHandler.getAlertCount();
@@ -109,7 +109,7 @@
   /**
    * Tests alert handler functionality when a given alert is explicitly enabled.
    */
-  @Test()
+  @Test
   public void testEnabledAlert()
   {
     TestCaseUtils.dsconfig(
@@ -140,7 +140,7 @@
    * Tests alert handler functionality when a given alert is not explicitly
    * enabled but others are.
    */
-  @Test()
+  @Test
   public void testNotEnabledAlert()
   {
     TestCaseUtils.dsconfig(
@@ -171,7 +171,7 @@
    * Tests alert handler functionality when a given alert is explicitly
    * disabled.
    */
-  @Test()
+  @Test
   public void testDisabledAlert()
   {
     TestCaseUtils.dsconfig(
@@ -202,7 +202,7 @@
    * Tests alert handler functionality when a given alert is not explicitly
    * disabled but others are.
    */
-  @Test()
+  @Test
   public void testNotDisabledAlert()
   {
     TestCaseUtils.dsconfig(
@@ -233,7 +233,7 @@
    * Tests alert handler functionality when a given alert is both enabled and
    * disabled.
    */
-  @Test()
+  @Test
   public void testEnabledAndDisabledAlert()
   {
     TestCaseUtils.dsconfig(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
index 5385944..b2d2af1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  *      Portions Copyright 2014 ForgeRock AS
  */
 package org.opends.server.api;
@@ -211,7 +211,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void beforeClass() throws Exception
   {
     TestCaseUtils.startServer();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java
index fb57b16..ae4805e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -53,7 +53,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java
index cbb4f8d..ab1bf5a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -132,7 +132,7 @@
     assertEquals(ditMap.size(), 0);
   }
 
-  @BeforeClass()
+  @BeforeClass
   public void beforeClass()
          throws Exception
   {
@@ -150,7 +150,7 @@
     dn9 = DN.valueOf(dn9String);
   }
 
-  @Test()
+  @Test
   public void testDITCacheMapBasicOps()
          throws Exception
   {
@@ -230,7 +230,7 @@
             "dc=com")));
   }
 
-  @Test()
+  @Test
   public void testDITCacheMapGetSubTree()
          throws Exception
   {
@@ -309,7 +309,7 @@
     assertTrue(subtreeSet.contains(dn3String));
   }
 
-  @Test()
+  @Test
   public void testDITCacheMapKeyAndEntrySet()
          throws Exception
   {
@@ -375,7 +375,7 @@
     assertTrue(ditMap.isEmpty());
   }
 
-  @Test()
+  @Test
   public void testDITCacheMapRemoveSubTree()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
index 37be55a..35028d2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.api;
 
@@ -63,7 +63,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -87,7 +87,7 @@
    * Gets simple test coverage for the default
    * PasswordValidator.finalizePasswordValidator method.
    */
-  @Test()
+  @Test
   public void testFinalizePasswordValidator()
   {
     TestPasswordValidator.getInstance().finalizePasswordValidator();
@@ -101,7 +101,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulValidationPasswordModifyExtOp()
          throws Exception
   {
@@ -149,7 +149,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedValidationPasswordModifyExtOp()
          throws Exception
   {
@@ -202,7 +202,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCurrentPasswordNotAvailablePasswordModifyExtOp()
          throws Exception
   {
@@ -248,7 +248,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCurrentPasswordAvailablePasswordModifyExtOp()
          throws Exception
   {
@@ -299,7 +299,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStoredPasswordAvailablePasswordModifyExtOp()
          throws Exception
   {
@@ -351,7 +351,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStoredAndCurrentPasswordAvailablePasswordModifyExtOp()
          throws Exception
   {
@@ -403,7 +403,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulValidationModify()
          throws Exception
   {
@@ -471,7 +471,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedValidationModify()
          throws Exception
   {
@@ -543,7 +543,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCurrentPasswordAvailableModify()
          throws Exception
   {
@@ -620,7 +620,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStoredPasswordAvailableModify()
          throws Exception
   {
@@ -694,7 +694,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStoredAndCurrentPasswordAvailableModify()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
index 20a0c2d..be22796 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api.plugin;
 
@@ -73,7 +73,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbstractMethods()
          throws Exception
   {
@@ -180,7 +180,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testNonAbstractPublicAPIMethods()
          throws Exception
   {
@@ -755,7 +755,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPluginEntryDN()
          throws Exception
   {
@@ -843,7 +843,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPluginTypes()
          throws Exception
   {
@@ -928,7 +928,7 @@
   /**
    * Invokes the default plugin finalizer.
    */
-  @Test()
+  @Test
   public void testDefaultFinalizer()
   {
     new NullPlugin().finalizePlugin();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
index abde251..11587c9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  *      Portions Copyright 2013 Manuel Gaupp
  *
  */
@@ -1799,7 +1799,7 @@
    * Test LDAP compare.
    * @throws Throwable If the compare is not valid for the ACI.
    */
-  @Test()
+  @Test
   public void testCompare() throws Throwable
   {
     SingleSearchParams adminParam =
@@ -1872,7 +1872,7 @@
    * tree back and re-search with base at orig DN.
    * @throws Throwable
    */
-  @Test()
+  @Test
   public void testModDN() throws Throwable {
     SingleSearchParams userParamOrig = SingleSearchParams.nonProxiedSearch(LEVEL_1_USER_DN,
                                       "pa$$word", SALES_USER_1,
@@ -1908,7 +1908,7 @@
   /**
    * Test anonymous modify DN with the same RDN.
    */
-  @Test()
+  @Test
   public void testAnonymousModDNSameRDN() throws Throwable {
     addEntries(BASIC_LDIF__GROUP_SEARCH_TESTS, DIR_MGR_DN, DIR_MGR_PW);
     String modRDNLdif = makeModDN(OU_LEAF_DN, "ou=leaf", "1", null);
@@ -1920,7 +1920,7 @@
    * user from a group, should fail.
    * @throws Throwable If the delete succeeds.
    */
-  @Test()
+  @Test
   public void testNonSelfWrite() throws Throwable {
     addEntries(BASIC_LDIF__GROUP_SEARCH_TESTS, DIR_MGR_DN, DIR_MGR_PW);
     modEntries(SELFWRITE_ACI, DIR_MGR_DN, DIR_MGR_PW);
@@ -1933,7 +1933,7 @@
    * from a group, should succeed.
    * @throws Throwable If the delete fails.
    */
-  @Test()
+  @Test
   public void testSelfWrite() throws Throwable {
     addEntries(BASIC_LDIF__GROUP_SEARCH_TESTS, DIR_MGR_DN, DIR_MGR_PW);
     modEntries(SELFWRITE_ACI, DIR_MGR_DN, DIR_MGR_PW);
@@ -1945,7 +1945,7 @@
    * Test ACI using dns="*" bind rule pattern. Search should succeed.
    * @throws Throwable  If the search doesn't return any entries.
    */
-  @Test()
+  @Test
   public void testDNSWildCard() throws Throwable {
         SingleSearchParams userParam =
           SingleSearchParams.nonProxiedSearch(LEVEL_1_USER_DN,
@@ -1964,7 +1964,7 @@
   /**
    * Test group  bind rule ACI keywords.
    */
- @Test()
+ @Test
  public void testGroupAcis()  throws Throwable {
      //group2   fail
      SingleSearchParams adminParam =
@@ -1993,7 +1993,7 @@
      *
      * @throws Throwable
      */
-    @Test()
+    @Test
  public void testGlobalAcis()  throws Throwable {
      SingleSearchParams monitorParam =
        SingleSearchParams.nonProxiedSearch(ADMIN_DN, ADMIN_PW, MONITOR_DN,
@@ -2108,7 +2108,7 @@
    * right test cases.
    * @throws Throwable If any test cases fail after re-initialization.
    */
-  @Test()
+  @Test
   public void testAciHandlerReInit() throws Throwable {
 
     // Setup using global and selfwrite test cases.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
index 4aadfca..16c4403 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -89,7 +89,7 @@
    *
    * @throws Exception  If an unexpected result is received.
    */
-  @Test()
+  @Test
   public void testAlternateDNs() throws Exception {
     String aciLdif=makeAddLDIF("aci", user1, rootDNACI);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
@@ -126,7 +126,7 @@
    *
    * @throws Exception  If an unexpected result is received.
    */
-  @Test()
+  @Test
   public void testAlternateProxyDNs() throws Exception {
     String aciLdif=makeAddLDIF("aci", user1, rootDNACI, proxyACI, controlACI);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
index 71d0119..cacf04b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.server.authorization.dseecompat;
@@ -133,7 +134,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testExtendOpPwdWC() throws Exception {
    String pwdLdifs =
         makeAddLDIF("aci", peopleBase, pwdControls, extOpWC, ALLOW_ALL);
@@ -156,7 +157,7 @@
     *
     * @throws Exception If an unexpected result is returned.
     */
-    @Test()
+    @Test
    public void testExtendOpPwdNotWC() throws Exception {
     String pwdLdifs =
          makeAddLDIF("aci", peopleBase, pwdControls, extOpNotWC, ALLOW_ALL);
@@ -173,7 +174,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testExtendOpPwd() throws Exception {
    String pwdLdifs =
         makeAddLDIF("aci", peopleBase, pwdControls, extOp, ALLOW_ALL);
@@ -189,7 +190,7 @@
    * @throws Exception If an unexpected result is returned.
    */
 
-  @Test()
+  @Test
   public void testTargetattrSideEffect() throws Exception {
    String pwdLdifs =
         makeAddLDIF("aci", peopleBase, complicated);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
index 6efa17f..ff7b47d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -176,7 +176,7 @@
    * @throws Exception If the search result is empty or a right string
    * doesn't match the expected value.
    */
-  @Test()
+  @Test
   public void testAnonEntryLevelParams() throws Exception {
     String aciLdif=makeAddLDIF("aci", "ou=People,o=test", readSearchAnonAci,
                                controlACI);
@@ -194,7 +194,7 @@
    * @throws Exception If the search result is empty or a right string
    * doesn't match the expected value.
    */
-  @Test()
+  @Test
   public void testSuEntryLevelParams() throws Exception {
     String aciLdif=makeAddLDIF("aci", "ou=People,o=test", aclRightsAci,
                                controlACI);
@@ -247,7 +247,7 @@
    * @throws Exception If the search result is empty or a right string
    * doesn't match the expected value.
    */
-  @Test()
+  @Test
    public void testSuEntryLevelCtrl() throws Exception {
      String aciLdif=makeAddLDIF("aci", "ou=People,o=test", aclRightsAci,
                                 controlACI);
@@ -300,7 +300,7 @@
   * @throws Exception If the search result is empty or a right string
   * doesn't match the expected value.
   */
- @Test()
+ @Test
   public void testBypassEntryLevelCtrl() throws Exception {
     String aciLdif=makeAddLDIF("aci", "ou=People,o=test",  controlACI);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
@@ -319,7 +319,7 @@
    * @throws Exception If the search result is empty or a right string
    * doesn't match the expected value.
    */
-  @Test()
+  @Test
   public void testSuAttrLevelParams() throws Exception {
     String aciLdif=makeAddLDIF("aci", "ou=People,o=test", aclRightsAci,
                                controlACI);
@@ -346,7 +346,7 @@
  * @throws Exception If the search result is empty or a right string
  * doesn't match the expected value.
  */
-@Test()
+@Test
 public void testSuAttrLevelParams2() throws Exception {
   String aciLdif=makeAddLDIF("aci", "ou=People,o=test", aclRightsAci,
                              controlACI);
@@ -379,7 +379,7 @@
  * @throws Exception If the search result is empty or a right string
  * doesn't match the expected value.
  */
-@Test()
+@Test
 public void testSuAttrLevelParams3() throws Exception {
   String aciLdif=makeAddLDIF("aci", "ou=People,o=test", aclRightsAci,
                             controlACI);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
index c13df85..9b46152 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 
@@ -73,7 +74,7 @@
    *
    * @throws Exception If an unexpected result is received.
    */
-  @Test()
+  @Test
   public void testNestedGroup() throws Exception {
     String aciLdif=makeAddLDIF("aci", peopleBase, groupAci);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
@@ -105,7 +106,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testNestedDynamicGroup() throws Exception {
     String aciLdif=makeAddLDIF("aci", peopleBase, groupAci);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
@@ -135,7 +136,7 @@
    *
    * @throws Exception IKf an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testNestedCircularGroup() throws Exception {
     String aciLdif=makeAddLDIF("aci", peopleBase, groupAci);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
index 1168a72..22112aa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 
 /**
@@ -165,7 +165,7 @@
      *
      * @throws Exception If an error occurs.
      */
-    @Test()
+    @Test
     public void testAci() throws Exception {
         Hashtable<String, String> env = new Hashtable<String, String>();
         env.put(Context.INITIAL_CONTEXT_FACTORY, factory);
@@ -211,7 +211,7 @@
      *
      * @throws Exception If an error occurs.
      */
-    @Test()
+    @Test
     public void testBypass() throws Exception {
         Hashtable<String, String> env = new Hashtable<String, String>();
         env.put(Context.INITIAL_CONTEXT_FACTORY, factory);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
index 7dfc7c1..2ef13ca 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.server.authorization.dseecompat;
@@ -87,7 +88,7 @@
    *
    * @throws Exception If results are unexpected.
    */
-  @Test()
+  @Test
   public void testRef() throws Exception {
     try {
     String pwdLdifs =
@@ -110,7 +111,7 @@
    *
    * @throws Exception  If results are unexpected.
    */
-  @Test()
+  @Test
   public void testRefAci() throws Exception {
     try {
     String pwdLdifs =
@@ -137,7 +138,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testGlobalTargetAci() throws Exception {
     try {
     String pwdLdifs =
@@ -165,7 +166,7 @@
    *
    * @throws Exception If an unexpected result us returned.
    */
-  @Test()
+  @Test
   public void testGlobalAci() throws Exception {
     try {
     String pwdLdifs =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
index 3a12208..24e2dff 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011-2013 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 /**
@@ -204,7 +204,7 @@
      *
      * @throws Exception If a test doesn't pass.
      */
-    @Test()
+    @Test
     public void testIntegrity() throws Exception {
         //set QOP to integrity.
         TestCaseUtils.dsconfig(
@@ -244,7 +244,7 @@
      * Test confidentiality settings using DIGEST-MD5.
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testConfidentiality() throws Exception {
         //set QOP to integrity.
         TestCaseUtils.dsconfig(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
index 65bfb55..9537313 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2013 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -132,7 +132,7 @@
    *
    * @throws Exception  If a test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrUserAttr() throws Exception {
     String aciLdif=makeAddLDIF("aci", user1, userAttrAci);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
@@ -170,7 +170,7 @@
    *
    * @throws Exception If a test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrOpAttr() throws Exception {
     //Add aci that only allows non-operational attributes search/read.
     String aciLdif=makeAddLDIF("aci", user1, nonOpAttrAci);
@@ -221,7 +221,7 @@
    *
    * @throws Exception  If a test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrAllAttr() throws Exception {
     //Add aci with: (targetattr = "+ || *")
     String aciLdif=makeAddLDIF("aci", user1, allAttrs);
@@ -245,7 +245,7 @@
    *
    * @throws Exception If a test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrOpPlusAttr() throws Exception {
     //Add aci with: (targetattr = "objectclass|| +")
     String aciLdif=makeAddLDIF("aci", user1, ocOpAttrs);
@@ -269,7 +269,7 @@
    *
    * @throws Exception  If a test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrUserStarAttr() throws Exception {
     //Add aci with: (targetattr = "*|| aci")
     String aciLdif=makeAddLDIF("aci", user1, starAciAttrs);
@@ -293,7 +293,7 @@
    *
    * @throws Exception If test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrSrchShorthand() throws Exception {
     //Aci: (targetattrs="sn || uid || +) and search with an
     //operational attr (aci).
@@ -342,7 +342,7 @@
    *
    * @throws Exception Exception If test result is unexpected.
    */
-  @Test()
+  @Test
   public void testTargetAttrGrpDN() throws Exception {
     String aciLdif=makeAddLDIF("aci", user1, grpAttrAci);
     LDIFModify(aciLdif, DIR_MGR_DN, PWD);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
index db79c4b..9b3b73c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions copyright 2012-2013 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -229,7 +229,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-  @Test()
+  @Test
   public void testTargetattrSideEffect() throws Exception {
    String pwdLdifs =
         makeAddLDIF("aci", peopleBase, complicated);
@@ -247,7 +247,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-   @Test()
+   @Test
   public void testExtendOpControls() throws Exception {
    String pwdLdifs =
         makeAddLDIF("aci", peopleBase, extOpControls, extOpAll, ALLOW_ALL);
@@ -269,7 +269,7 @@
    *
    * @throws Exception If an unexpected result is returned.
    */
-   @Test()
+   @Test
   public void testBindControl() throws Exception {
     String pwdLdifs =
             makeAddLDIF("aci", peopleBase, pwdControls, ALLOW_ALL);
@@ -300,7 +300,7 @@
    *
    * @throws Exception If an unexpected result happens.
    */
-  @Test()
+  @Test
   public void testGlobalTargets() throws Exception {
     String globalControlAcis=
             makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
@@ -342,7 +342,7 @@
    *
    * @throws Exception If an unexpected result happens.
    */
-  @Test()
+  @Test
   public void testWildCard() throws Exception {
     String aciDeny=makeAddLDIF("aci", base, controlNotWC);
     String aciRight=makeAddLDIF("aci", base, aclRightsAci);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
index b2344d9..49135b4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.server.authorization.dseecompat;
@@ -453,7 +453,7 @@
    *
    * @throws Exception If a test doesn't pass.
    */
-  @Test()
+  @Test
   public void testEntryCheckACI() throws Exception {
     try {
       String addACILDIF = makeAddLDIF("aci", aciUser, entryCheckACI);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 24af4db..307c62b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -781,7 +781,7 @@
     debugInfo(testName, "Ending test with success");
   }
 
-  @DataProvider()
+  @DataProvider
   Object[][] getFilters()
   {
     return new Object[][] {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
index 8f1b77b..9c62659 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.backends;
 
@@ -66,7 +66,7 @@
    * Ensures that the Directory Server is running and gets a reference to the
    * schema backend.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer() throws Exception
   {
     TestCaseUtils.startServer();
@@ -97,7 +97,7 @@
   /**
    * Tests the {@code isLocal} method to ensure that it is considered local.
    */
-  @Test()
+  @Test
   public void testIsLocal()
   {
     assertTrue(schemaBackend.isLocal());
@@ -111,7 +111,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidEntry()
          throws Exception
   {
@@ -141,7 +141,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetInvalidEntry()
          throws Exception
   {
@@ -162,7 +162,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetSchemaEntry()
          throws Exception
   {
@@ -209,7 +209,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEntryExistsValidDN()
          throws Exception
   {
@@ -224,7 +224,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEntryExistsInvalidDN()
          throws Exception
   {
@@ -299,7 +299,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleBaseSearch()
          throws Exception
   {
@@ -319,7 +319,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleOneLevelSearch() throws Exception
   {
     String filterString = "(|(objectClass=*)(objectClass=ldapSubentry))";
@@ -339,7 +339,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleSubtreeSearch()
          throws Exception
   {
@@ -360,7 +360,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleSubordinateSubtreeSearch()
          throws Exception
   {
@@ -381,7 +381,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSearchMatchedDN() throws Exception
   {
     InternalClientConnection conn = getRootConnection();
@@ -405,7 +405,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testTreatAsUserAttrs()
          throws Exception
   {
@@ -447,7 +447,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddUnsupportedAttr()
          throws Exception
   {
@@ -477,7 +477,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveUnsupportedAttr()
          throws Exception
   {
@@ -510,7 +510,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAllAttributeTypes()
          throws Exception
   {
@@ -539,7 +539,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testReplaceAllAttributeTypes()
          throws Exception
   {
@@ -568,7 +568,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeSuccessful()
          throws Exception
   {
@@ -606,7 +606,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeSuccessfulNoOID()
          throws Exception
   {
@@ -644,7 +644,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeType()
          throws Exception
   {
@@ -724,7 +724,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeSuccessfulReplace()
          throws Exception
   {
@@ -820,7 +820,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeInvalidSyntax()
          throws Exception
   {
@@ -850,7 +850,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedSyntax()
          throws Exception
   {
@@ -883,7 +883,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedEMR()
          throws Exception
   {
@@ -916,7 +916,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedOMR()
          throws Exception
   {
@@ -949,7 +949,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedSMR()
          throws Exception
   {
@@ -982,7 +982,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedAMR()
          throws Exception
   {
@@ -1015,7 +1015,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeInvalidUsage()
          throws Exception
   {
@@ -1048,7 +1048,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeObsoleteSuperior()
          throws Exception
   {
@@ -1087,7 +1087,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeObsoleteEMR()
          throws Exception
   {
@@ -1125,7 +1125,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeMultipleConflicts()
          throws Exception
   {
@@ -1158,7 +1158,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAttributeTypeUndefinedSuperior()
          throws Exception
   {
@@ -1193,7 +1193,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeSuccessful()
          throws Exception
   {
@@ -1238,7 +1238,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveThenAddAttributeTypeSuccessful()
          throws Exception
   {
@@ -1289,7 +1289,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeUndefined()
          throws Exception
   {
@@ -1326,7 +1326,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveSuperiorAttributeType()
          throws Exception
   {
@@ -1363,7 +1363,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeReferencedByObjectClass()
          throws Exception
   {
@@ -1400,7 +1400,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeReferencedByNameForm()
          throws Exception
   {
@@ -1457,7 +1457,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeReferencedByDCR()
          throws Exception
   {
@@ -1513,7 +1513,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributeTypeReferencedByMRU()
          throws Exception
   {
@@ -1574,7 +1574,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassSuccessful()
          throws Exception
   {
@@ -1612,7 +1612,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassSuccessfulNoOID()
          throws Exception
   {
@@ -1648,7 +1648,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassToAltSchemaFile()
          throws Exception
   {
@@ -1690,7 +1690,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassSuccessfulReplace()
          throws Exception
   {
@@ -1733,7 +1733,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassMultipleConflicts()
          throws Exception
   {
@@ -1771,7 +1771,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveThenAddAddObjectClassSuccessful()
          throws Exception
   {
@@ -1820,7 +1820,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassInvalidSyntax()
          throws Exception
   {
@@ -1850,7 +1850,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassUndefinedSuperiorClass()
          throws Exception
   {
@@ -1882,7 +1882,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassObsoleteSuperiorClass()
          throws Exception
   {
@@ -1918,7 +1918,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassObsoleteRequiredAttribute()
          throws Exception
   {
@@ -1957,7 +1957,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassObsoleteOptionalAttribute()
          throws Exception
   {
@@ -1996,7 +1996,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassUndefinedRequiredAttribute()
          throws Exception
   {
@@ -2029,7 +2029,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassMultipleUndefinedRequiredAttribute()
          throws Exception
   {
@@ -2062,7 +2062,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassUndefinedOptionalAttribute()
          throws Exception
   {
@@ -2095,7 +2095,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddObjectClassMultipleUndefinedOptionalAttribute()
          throws Exception
   {
@@ -2128,7 +2128,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAbstractObjectClassWithNonAbstractSuperior()
          throws Exception
   {
@@ -2160,7 +2160,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAuxiliaryObjectClassWithStructuralSuperior()
          throws Exception
   {
@@ -2192,7 +2192,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddStructuralObjectClassWithAuxiliarySuperior()
          throws Exception
   {
@@ -2224,7 +2224,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveObjectClassSuccessful()
          throws Exception
   {
@@ -2267,7 +2267,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveSuperiorObjectClass()
          throws Exception
   {
@@ -2303,7 +2303,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveObjectClassReferencedByNameForm()
          throws Exception
   {
@@ -2352,7 +2352,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveObjectClassReferencedByDCR()
          throws Exception
   {
@@ -2400,7 +2400,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormSuccessful()
          throws Exception
   {
@@ -2442,7 +2442,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormToAltSchemaFile()
          throws Exception
   {
@@ -2491,7 +2491,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithUndefinedReqAT()
          throws Exception
   {
@@ -2534,7 +2534,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithMultipleUndefinedReqAT()
          throws Exception
   {
@@ -2578,7 +2578,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithUndefinedOptAT()
          throws Exception
   {
@@ -2621,7 +2621,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithMultipleUndefinedOptAT()
          throws Exception
   {
@@ -2664,7 +2664,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithUndefinedOC()
          throws Exception
   {
@@ -2700,7 +2700,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithAuxiliaryOC()
          throws Exception
   {
@@ -2742,7 +2742,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithObsoleteOC()
          throws Exception
   {
@@ -2784,7 +2784,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithObsoleteReqAT()
          throws Exception
   {
@@ -2828,7 +2828,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormWithObsoleteOptAT()
          throws Exception
   {
@@ -2873,7 +2873,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddNameFormOCConflict()
          throws Exception
   {
@@ -2923,7 +2923,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveNameFormSuccessful()
          throws Exception
   {
@@ -2973,7 +2973,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveThenAddNameFormSuccessful()
          throws Exception
   {
@@ -3029,7 +3029,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveNameFormReferencedByDSR()
          throws Exception
   {
@@ -3085,7 +3085,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleSuccessful()
          throws Exception
   {
@@ -3132,7 +3132,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testReplaceDITContentRuleSuccessful()
          throws Exception
   {
@@ -3186,7 +3186,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleToAltSchemaFile()
          throws Exception
   {
@@ -3241,7 +3241,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveThenAddDITContentRule()
          throws Exception
   {
@@ -3300,7 +3300,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleUndefinedOC()
          throws Exception
   {
@@ -3332,7 +3332,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleAuxiliaryOC()
          throws Exception
   {
@@ -3369,7 +3369,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleObsoleteOC()
          throws Exception
   {
@@ -3407,7 +3407,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleConflictingOC()
          throws Exception
   {
@@ -3451,7 +3451,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleUndefinedAuxOC()
          throws Exception
   {
@@ -3489,7 +3489,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleMultipleUndefinedAuxOC()
          throws Exception
   {
@@ -3527,7 +3527,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleAuxOCNotAux()
          throws Exception
   {
@@ -3565,7 +3565,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleMultipleAuxOCNotAux()
          throws Exception
   {
@@ -3603,7 +3603,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleObsoleteAuxOC()
          throws Exception
   {
@@ -3644,7 +3644,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleUndefinedReqAT()
          throws Exception
   {
@@ -3682,7 +3682,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleMultipleUndefinedReqAT()
          throws Exception
   {
@@ -3720,7 +3720,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleUndefinedOptAT()
          throws Exception
   {
@@ -3758,7 +3758,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleMultipleUndefinedOptAT()
          throws Exception
   {
@@ -3796,7 +3796,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleUndefinedNotAT()
          throws Exception
   {
@@ -3834,7 +3834,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleMultipleUndefinedNotAT()
          throws Exception
   {
@@ -3873,7 +3873,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleProhibitRequiredStructuralAttribute()
          throws Exception
   {
@@ -3911,7 +3911,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleProhibitRequiredAuxiliaryAttribute()
          throws Exception
   {
@@ -3948,7 +3948,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleObsoleteRequiredAttributeType()
          throws Exception
   {
@@ -3991,7 +3991,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleObsoleteOptionalAttributeType()
          throws Exception
   {
@@ -4034,7 +4034,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITContentRuleObsoleteProhibitedAttributeType()
          throws Exception
   {
@@ -4077,7 +4077,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveDITContentRuleSuccessful()
          throws Exception
   {
@@ -4130,7 +4130,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleSuccessful()
          throws Exception
   {
@@ -4178,7 +4178,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testReplaceDITStructureRuleSuccessful()
          throws Exception
   {
@@ -4235,7 +4235,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleToAltSchemaFile()
          throws Exception
   {
@@ -4293,7 +4293,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAndAddDITStructureRuleSuccessful()
          throws Exception
   {
@@ -4356,7 +4356,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleUndefinedNameForm()
          throws Exception
   {
@@ -4393,7 +4393,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleUndefinedSuperior()
          throws Exception
   {
@@ -4441,7 +4441,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleObsoleteNameForm()
          throws Exception
   {
@@ -4485,7 +4485,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDITStructureRuleObsoleteSuperiorRule()
          throws Exception
   {
@@ -4540,7 +4540,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveDITStructureRuleSuccessful()
          throws Exception
   {
@@ -4597,7 +4597,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveSuperiorDITStructureRule()
          throws Exception
   {
@@ -4701,7 +4701,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseSuccessful()
          throws Exception
   {
@@ -4743,7 +4743,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseToAltSchemaFile()
          throws Exception
   {
@@ -4791,7 +4791,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testReplaceMatchingRuleUseSuccessful()
          throws Exception
   {
@@ -4840,7 +4840,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAndAddMatchingRuleUse()
          throws Exception
   {
@@ -4894,7 +4894,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseMRConflict()
          throws Exception
   {
@@ -4943,7 +4943,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseMRUndefined()
          throws Exception
   {
@@ -4973,7 +4973,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseAttributeTypeUndefined()
          throws Exception
   {
@@ -5012,7 +5012,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseAttributeTypeMultipleUndefined()
          throws Exception
   {
@@ -5049,7 +5049,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseObsoleteMatchingRule()
          throws Exception
   {
@@ -5086,7 +5086,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMatchingRuleUseObsoleteAttributeType()
          throws Exception
   {
@@ -5126,7 +5126,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveMatchingRuleUseSuccessful()
          throws Exception
   {
@@ -5189,7 +5189,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveAndAddObjectClassIssue1318()
          throws Exception
   {
@@ -5227,7 +5227,7 @@
    * Tests the behavior of schema backend when attribute type definitions
    * are added without a space before closing parenthesis.
    */
-  @Test()
+  @Test
  public void   testAddAttributeTypeNoSpaceBeforeParenthesis() throws Exception
   {
 
@@ -5348,7 +5348,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAndDeleteDefinitionWithExtraSpaces()
          throws Exception
   {
@@ -5388,7 +5388,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testExportLDIF()
          throws Exception
   {
@@ -5411,7 +5411,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testImportLDIF()
          throws Exception
   {
@@ -5437,7 +5437,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetComponentEntryDN()
          throws Exception
   {
@@ -5451,7 +5451,7 @@
   /**
    * Tests the {@code getClassName} method.
    */
-  @Test()
+  @Test
   public void testGetClassName()
   {
     assertEquals(schemaBackend.getClassName(), SchemaBackend.class.getName());
@@ -5462,7 +5462,7 @@
   /**
    * Tests the {@code getAlerts} method.
    */
-  @Test()
+  @Test
   public void testGetAlerts()
   {
     Map<String, String> alerts = schemaBackend.getAlerts();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java
index 64cb528..b5b6e63 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.backends.jeb;
 
@@ -73,7 +74,7 @@
    * @throws Exception
    *           If the test failed unexpectedly.
    */
-  @Test()
+  @Test
   public void testValidHomeDir() throws Exception {
     File homeDir = new File(homeDirName);
 
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java
index eb83942..df6a02d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java
@@ -429,7 +429,7 @@
    * @throws Exception
    *           If the test failed unexpectedly.
    */
-  @Test()
+  @Test
   public void testEntryToAndFromDatabase() throws Exception {
     ensureTheServerIsUpAndRunning();
 
@@ -500,7 +500,7 @@
    * @throws Exception
    *           If the test failed unexpectedly.
    */
-  @Test()
+  @Test
   public void testEntryToAndFromDatabaseV1() throws Exception {
     ensureTheServerIsUpAndRunning();
 
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java
index b3a75fa..b7b9f4d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java
@@ -355,7 +355,7 @@
    * @throws Exception
    *           If the test failed unexpectedly.
    */
-  @Test()
+  @Test
   public void testEntryToAndFromDatabase() throws Exception {
     ensureTheServerIsUpAndRunning();
 
@@ -426,7 +426,7 @@
    * @throws Exception
    *           If the test failed unexpectedly.
    */
-  @Test()
+  @Test
   public void testEntryToAndFromDatabaseV1() throws Exception {
     ensureTheServerIsUpAndRunning();
 
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java
index fb9f21f..6147ca0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.backends.task;
 
@@ -58,7 +58,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -76,7 +76,7 @@
    * Remove the dummy task from the set of allowed tasks.
    * @throws Exception If an unexpected error occurred.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanUp()
          throws Exception
   {
@@ -93,7 +93,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeletePendingTask()
          throws Exception
   {
@@ -135,7 +135,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteRunningTask()
          throws Exception
   {
@@ -184,7 +184,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteCompletedTask()
          throws Exception
   {
@@ -224,7 +224,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyPendingTask()
          throws Exception
   {
@@ -283,7 +283,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyRunningTask()
          throws Exception
   {
@@ -356,7 +356,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyCompletedTask()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
index 525a273..dfdf5f3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -217,7 +217,7 @@
   /**
    * Test OID
    */
-  @Test()
+  @Test
   public void checkPasswordOID() throws Exception
   {
     assertEquals(OID_NS_PASSWORD_EXPIRED,     "2.16.840.1.113730.3.4.4");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java
index f5abb42..211b30a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.controls;
 
@@ -60,7 +60,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -78,7 +78,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMustChange()
          throws Exception
   {
@@ -210,7 +210,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddPreEncodedPassword()
          throws Exception
   {
@@ -295,7 +295,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddPasswordFailsValidation()
          throws Exception
   {
@@ -390,7 +390,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testBindLockedDueToFailures()
          throws Exception
   {
@@ -493,7 +493,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareMustChange()
          throws Exception
   {
@@ -594,7 +594,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteMustChange()
          throws Exception
   {
@@ -1112,7 +1112,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyPasswordInHistory()
          throws Exception
   {
@@ -1218,7 +1218,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyMissingCurrentPassword()
          throws Exception
   {
@@ -1324,7 +1324,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyMinimumPasswordAge()
          throws Exception
   {
@@ -1429,7 +1429,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNMustChange()
          throws Exception
   {
@@ -1536,7 +1536,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSearchMustChange()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
index 3d532bc..41fd3f0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -527,7 +527,7 @@
   /**
    * Tests the maximum persistent search limit imposed by the server.
    */
-  @Test()
+  @Test
   public void testMaxPSearch() throws Exception
   {
     TestCaseUtils.initializeTestBackend(true);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
index bd1aa02..1940656 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -56,7 +56,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -71,7 +71,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testConstructor1()
          throws Exception
   {
@@ -123,7 +123,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testConstructor2()
          throws Exception
   {
@@ -292,7 +292,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlValueEmptyDN()
          throws Exception
   {
@@ -316,7 +316,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlValueNonEmptyDN()
          throws Exception
   {
@@ -341,7 +341,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetAndSetRawAuthorizationDN()
          throws Exception
   {
@@ -363,7 +363,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetAndSetAuthorizationDN()
          throws Exception
   {
@@ -387,7 +387,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNNullDN()
          throws Exception
   {
@@ -406,7 +406,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationExistingNormalUser()
          throws Exception
   {
@@ -486,7 +486,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testToString()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
index 6673ee8..4b54045 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -56,7 +56,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -79,7 +79,7 @@
   /**
    * Tests the constructor with an empty authorization ID.
    */
-  @Test()
+  @Test
   public void testConstructorEmptyAuthzID()
   {
     ProxiedAuthV2Control proxyControl =
@@ -93,7 +93,7 @@
    * Tests the constructor with a non-empty authorization ID using the "dn:"
    * form.
    */
-  @Test()
+  @Test
   public void testConstructorNonEmptyAuthzIDDN()
   {
     ProxiedAuthV2Control proxyControl =
@@ -108,7 +108,7 @@
    * Tests the constructor with a non-empty authorization ID using the "u:"
    * form.
    */
-  @Test()
+  @Test
   public void testConstructorNonEmptyAuthzIDUsername()
   {
     ProxiedAuthV2Control proxyControl =
@@ -158,7 +158,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlDNValue()
          throws Exception
   {
@@ -177,7 +177,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlUsernameValue()
          throws Exception
   {
@@ -216,7 +216,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlLegacyDNValue()
          throws Exception
   {
@@ -240,7 +240,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeControlLegacyUsernameValue()
          throws Exception
   {
@@ -263,7 +263,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNEmptyAuthzID()
          throws Exception
   {
@@ -280,7 +280,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNEmptyAuthzIDDN()
          throws Exception
   {
@@ -297,7 +297,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNExistingUserDN()
          throws Exception
   {
@@ -377,7 +377,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNEmptyAuthzIDUsername()
          throws Exception
   {
@@ -394,7 +394,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValidatedAuthorizationDNExistingUserUsername()
          throws Exception
   {
@@ -490,7 +490,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testToString()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
index 3aca6d4..301e654 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -99,7 +99,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
index 265df18..5ecc68f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -60,7 +60,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   protected Operation[] createTestOperations()
          throws Exception
   {
@@ -80,7 +80,7 @@
    * For some reason, the @BeforeClass method in the super class is not called.
    */
   @Override
-  @BeforeClass()
+  @BeforeClass
   public void startServer() throws Exception {
     super.startServer();
   }
@@ -88,7 +88,7 @@
   /**
    * Tests the <CODE>getIDToAbandon</CODE> method.
    */
-  @Test()
+  @Test
   public void testGetIDToAbandon()
   {
     InternalClientConnection conn =
@@ -105,7 +105,7 @@
   /**
    * Tests the <CODE>cancel</CODE> method.
    */
-  @Test()
+  @Test
   public void testCancel()
   {
     InternalClientConnection conn =
@@ -127,7 +127,7 @@
   /**
    * Tests the <CODE>getCancelRequest</CODE> method.
    */
-  @Test()
+  @Test
   public void testGetCancelRequest()
   {
     InternalClientConnection conn =
@@ -161,7 +161,7 @@
    * Attempts an internal abandon operation, which will fail because internal
    * operations cannot be abandoned.
    */
-  @Test()
+  @Test
   public void testAbandonInternal()
   {
     InternalClientConnection conn =
@@ -246,7 +246,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonAdd()
          throws Exception
   {
@@ -322,7 +322,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonCompare()
          throws Exception
   {
@@ -389,7 +389,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonDelete()
          throws Exception
   {
@@ -460,7 +460,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonExtended()
          throws Exception
   {
@@ -526,7 +526,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonModify()
          throws Exception
   {
@@ -599,7 +599,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonModifyDN()
          throws Exception
   {
@@ -671,7 +671,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAbandonSearch()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java
index aa620a2..56043f4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -55,7 +55,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
index 07d6bed..d611576 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -102,7 +102,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
index ecf8aae..38b1823 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -2188,7 +2188,7 @@
    * Tests the <CODE>getPasswordAttribute</CODE> method for the default password
    * policy.
    */
-  @Test()
+  @Test
   public void testGetPasswordAttributeDefault()
   {
     PasswordPolicy p = DirectoryServer.getDefaultPasswordPolicy();
@@ -2204,7 +2204,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordAttributeAuth()
          throws Exception
   {
@@ -2221,7 +2221,7 @@
    * Tests the <CODE>usesAuthPasswordSyntax</CODE> method for the default
    * password policy.
    */
-  @Test()
+  @Test
   public void testUsesAuthPasswordSyntaxDefault()
   {
     PasswordPolicy p = DirectoryServer.getDefaultPasswordPolicy();
@@ -2236,7 +2236,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUsesAuthPasswordSyntaxAuth()
          throws Exception
   {
@@ -2254,7 +2254,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetDefaultStorageSchemesDefault()
          throws Exception
   {
@@ -2288,7 +2288,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetDefaultStorageSchemesAuth()
          throws Exception
   {
@@ -2324,7 +2324,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsDefaultStorageSchemeDefault()
          throws Exception
   {
@@ -2355,7 +2355,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsDefaultStorageSchemeAuth()
          throws Exception
   {
@@ -2388,7 +2388,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetDeprecatedStorageSchemesDefault()
          throws Exception
   {
@@ -2422,7 +2422,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetDeprecatedStorageSchemesAuth()
          throws Exception
   {
@@ -2458,7 +2458,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsDeprecatedStorageSchemeDefault()
          throws Exception
   {
@@ -2487,7 +2487,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsDeprecatedStorageSchemeAuth()
          throws Exception
   {
@@ -2518,7 +2518,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordValidatorsDefault()
          throws Exception
   {
@@ -2549,7 +2549,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordValidatorsAuth()
          throws Exception
   {
@@ -2582,7 +2582,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetAccountStatusNotificationHandlersDefault()
          throws Exception
   {
@@ -2613,7 +2613,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetAccountStatusNotificationHandlersAuth()
          throws Exception
   {
@@ -2646,7 +2646,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowUserPasswordChangesDefault()
          throws Exception
   {
@@ -2675,7 +2675,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowUserPasswordChangesAuth()
          throws Exception
   {
@@ -2706,7 +2706,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireCurrentPasswordDefault()
          throws Exception
   {
@@ -2735,7 +2735,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireCurrentPasswordAuth()
          throws Exception
   {
@@ -2766,7 +2766,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testForceChangeOnAddDefault()
          throws Exception
   {
@@ -2795,7 +2795,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testForceChangeOnAddAuth()
          throws Exception
   {
@@ -2826,7 +2826,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testForceChangeOnResetDefault()
          throws Exception
   {
@@ -2855,7 +2855,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testForceChangeOnResetAuth()
          throws Exception
   {
@@ -2886,7 +2886,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSkipValidationForAdministratorsDefault()
          throws Exception
   {
@@ -2915,7 +2915,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSkipValidationForAdministratorsAuth()
          throws Exception
   {
@@ -2946,7 +2946,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordGeneratorDNDefault()
          throws Exception
   {
@@ -2975,7 +2975,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordGeneratorDNAuth()
          throws Exception
   {
@@ -3006,7 +3006,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordGeneratorDefault()
          throws Exception
   {
@@ -3035,7 +3035,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPasswordGeneratorAuth()
          throws Exception
   {
@@ -3066,7 +3066,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireSecureAuthenticationDefault()
          throws Exception
   {
@@ -3095,7 +3095,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireSecureAuthenticationAuth()
          throws Exception
   {
@@ -3126,7 +3126,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireSecurePasswordChangesDefault()
          throws Exception
   {
@@ -3155,7 +3155,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireSecurePasswordChangesAuth()
          throws Exception
   {
@@ -3186,7 +3186,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowMultiplePasswordValuesDefault()
          throws Exception
   {
@@ -3215,7 +3215,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowMultiplePasswordValuesAuth()
          throws Exception
   {
@@ -3246,7 +3246,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowPreEncodedPasswordsDefault()
          throws Exception
   {
@@ -3275,7 +3275,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowPreEncodedPasswordsAuth()
          throws Exception
   {
@@ -3306,7 +3306,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMinimumPasswordAgeDefault()
          throws Exception
   {
@@ -3335,7 +3335,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMinimumPasswordAgeAuth()
          throws Exception
   {
@@ -3366,7 +3366,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMaximumPasswordAgeDefault()
          throws Exception
   {
@@ -3395,7 +3395,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMaximumPasswordAgeAuth()
          throws Exception
   {
@@ -3426,7 +3426,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMaximumPasswordResetAgeDefault()
          throws Exception
   {
@@ -3455,7 +3455,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMaximumPasswordResetAgeAuth()
          throws Exception
   {
@@ -3486,7 +3486,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetWarningIntervalDefault()
          throws Exception
   {
@@ -3515,7 +3515,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetWarningIntervalAuth()
          throws Exception
   {
@@ -3546,7 +3546,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testExpirePasswordsWithoutWarningDefault()
          throws Exception
   {
@@ -3575,7 +3575,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testExpirePasswordsWithoutWarningAuth()
          throws Exception
   {
@@ -3606,7 +3606,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowExpiredPasswordChangesDefault()
          throws Exception
   {
@@ -3635,7 +3635,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowExpiredPasswordChangesAuth()
          throws Exception
   {
@@ -3666,7 +3666,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetGraceLoginCountDefault()
          throws Exception
   {
@@ -3695,7 +3695,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetGraceLoginCountAuth()
          throws Exception
   {
@@ -3726,7 +3726,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutFailureCountDefault()
          throws Exception
   {
@@ -3755,7 +3755,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutFailureCountAuth()
          throws Exception
   {
@@ -3786,7 +3786,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutDurationDefault()
          throws Exception
   {
@@ -3815,7 +3815,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutDurationAuth()
          throws Exception
   {
@@ -3846,7 +3846,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutFailureExpirationIntervalDefault()
          throws Exception
   {
@@ -3875,7 +3875,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLockoutFailureExpirationIntervalAuth()
          throws Exception
   {
@@ -3906,7 +3906,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetRequireChangeByTimeDefault()
          throws Exception
   {
@@ -3935,7 +3935,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetRequireChangeByTimeAuth()
          throws Exception
   {
@@ -3966,7 +3966,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLastLoginTimeAttributeDefault()
          throws Exception
   {
@@ -3995,7 +3995,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLastLoginTimeAttributeAuth()
          throws Exception
   {
@@ -4026,7 +4026,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLastLoginTimeAttributeFormatDefault()
          throws Exception
   {
@@ -4055,7 +4055,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetLastLoginTimeFormatAuth()
          throws Exception
   {
@@ -4086,7 +4086,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPreviousLastLoginTimeFormatsDefault()
          throws Exception
   {
@@ -4117,7 +4117,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetPreviousLastLoginTimeFormatsAuth()
          throws Exception
   {
@@ -4150,7 +4150,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetIdleLockoutIntervalDefault()
          throws Exception
   {
@@ -4179,7 +4179,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetIdleLockoutIntervalAuth()
          throws Exception
   {
@@ -4211,7 +4211,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testResetWithLastLoginTime()
          throws Exception
   {
@@ -4339,7 +4339,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHistoryWithMultipleSchemes()
          throws Exception
   {
@@ -4446,7 +4446,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordHistoryUsingCount()
          throws Exception
   {
@@ -4740,7 +4740,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testWarningIntervalGreaterThanMaxAge()
          throws Exception
   {
@@ -4775,7 +4775,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMinAgePlusWarningIntervalGreaterThanMaxAge()
          throws Exception
   {
@@ -4809,7 +4809,7 @@
   /**
    * Tests the <CODE>toString</CODE> methods with the default password policy.
    */
-  @Test()
+  @Test
   public void testToStringDefault()
   {
     PasswordPolicy p = DirectoryServer.getDefaultPasswordPolicy();
@@ -4824,7 +4824,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testToStringAuth()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java
index 62b0d5b..ef3aad3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -93,7 +93,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java b/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java
index 2ad78b6..fc0a780 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -298,7 +298,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer() throws Exception
   {
     TestCaseUtils.startServer();
@@ -312,7 +312,7 @@
    * with the default configuration settings for
    * "ds-cfg-reject-unauthenticated-requests".
    */
-  @Test()
+  @Test
   public void testAuthSearchDefCfg()
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -345,7 +345,7 @@
    * with the default configuration settings for
    * "ds-cfg-reject-unauthenticated-requests".
    */
-  @Test()
+  @Test
   public void testUnauthSearchDefCfg()
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -374,7 +374,7 @@
    * the default configuration settings for
    * "ds-cfg-reject-unauthenticated-requests" .
    */
-  @Test()
+  @Test
   public void testAuthBindDefCfg()
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -394,7 +394,7 @@
    * with the default configuration settings for
    * "ds-cfg-reject-unauthenticated-requests".
    */
-  @Test()
+  @Test
   public void testUnauthBindDefCfg()
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -415,7 +415,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuthWAIDefCfg() throws Exception
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -449,7 +449,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUnauthWAIDefCfg() throws Exception
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -480,7 +480,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSUnauthDefCfg() throws Exception
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
@@ -516,7 +516,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testOtherOpsAuthDefCfg() throws Exception
   {
     DirectoryServer.setRejectUnauthenticatedRequests(false);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
index edd0967..6f9bd81 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -1206,7 +1206,7 @@
   /**
    * Tests the one-level search with a lower allid threshold value.
    */
-  @Test()
+  @Test
   public void testOneLevelSearchWithAllIDThreshold() throws Exception
   {
     //Set a lower value for allid threshold. We set 2.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
index 60082e9..9903911 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
@@ -181,7 +181,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCollectiveAttributesWorkWithVirtualAttributes()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
index ae6dc08..b185515 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -56,7 +56,7 @@
   private static final String SUFFIX = "dc=example,dc=com";
   private static final String BASE = "ou=People," + SUFFIX;
 
-  @BeforeClass()
+  @BeforeClass
   public void setUp() throws Exception
   {
     TestCaseUtils.startServer();
@@ -248,7 +248,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValidConfiguration()
          throws Exception
   {
@@ -337,7 +337,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValidConfigurationWithValidator()
       throws Exception
   {
@@ -406,7 +406,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordPolicySubentryAttribute()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
index 7e34b41..85d3500 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  *      Portions copyright 2013 Manuel Gaupp
  */
 package org.opends.server.core;
@@ -233,7 +233,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   protected Operation[] createTestOperations() throws Exception
   {
     return new ModifyDNOperationBasis[] {
@@ -1092,7 +1092,7 @@
    * Tests performing a modify DN operation in which the new RDN contains an
    * attribute type marked OBSOLETE in the server schema.
    */
-  @Test()
+  @Test
   public void testModifyDNWithObsoleteAttribute()
          throws Exception
   {
@@ -1154,7 +1154,7 @@
    * Tests a subtree rename operation to ensure that subordinate modify DN
    * plugins will be invoked as expected.
    */
-  @Test()
+  @Test
   public void testSubordinateModifyDNPluginsForSubtreeRename()
          throws Exception
   {
@@ -1227,7 +1227,7 @@
    * Tests a subtree move operation to ensure that subordinate modify DN
    * plugins will be invoked as expected.
    */
-  @Test()
+  @Test
   public void testSubordinateModifyDNPluginsForSubtreeMove()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
index 31abb15..e29bc81 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -47,7 +47,7 @@
 {
 
   /** {@inheritDoc} */
-  @Override()
+  @Override
   protected Operation[] createTestOperations()
          throws Exception
   {
@@ -77,7 +77,7 @@
    * since there's nothing to disconnect with an internal connection, but it
    * will at least exercise the code path.
    */
-  @Test()
+  @Test
   public void testUnbindInternal()
   {
     InvocationCounterPlugin.resetAllCounters();
@@ -96,7 +96,7 @@
    * Tests the <CODE>cancel</CODE> method to ensure that it indicates that the
    * operation cannot be cancelled.
    */
-  @Test()
+  @Test
   public void testCancel()
   {
     final InternalClientConnection conn = getRootConnection();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
index a1f177a..ff5a185 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.crypto;
 
@@ -73,13 +73,13 @@
 @SuppressWarnings("javadoc")
 public class CryptoManagerTestCase extends CryptoTestCase {
 
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
          throws Exception {
     TestCaseUtils.startServer();
   }
 
-  @AfterClass()
+  @AfterClass
   public void CleanUp() throws Exception {
     // Removes at least secret keys added in this test case.
     TestCaseUtils.restartServer();
@@ -302,7 +302,7 @@
 
    @throws Exception  In case an error occurs in the encryption routine.
    */
-  @Test()
+  @Test
   public void testKeyPersistence()
         throws Exception {
     final CryptoManager cm = DirectoryServer.getCryptoManager();
@@ -333,7 +333,7 @@
 
    @throws Exception In case something exceptional happens.
    */
-  @Test()
+  @Test
   public void testCompromisedKey() throws Exception {
     final CryptoManager cm = DirectoryServer.getCryptoManager();
     final String secretMessage = "zyxwvutsrqponmlkjihgfedcba";
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index 75f4e47..6ee2388 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.crypto;
 
@@ -58,7 +58,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -141,7 +141,7 @@
   }
 
 
-  @Test()
+  @Test
   public void testInvalidRequest() throws Exception
   {
     CryptoManagerImpl cm = DirectoryServer.getCryptoManager();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
index c4da3aa..bf03149 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -74,7 +74,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testInitializationAndFinalization()
          throws Exception
   {
@@ -90,7 +90,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsPasswordBased()
          throws Exception
   {
@@ -109,7 +109,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsSecure()
          throws Exception
   {
@@ -128,7 +128,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testProcessSASLBindNoCreds()
          throws Exception
   {
@@ -155,7 +155,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testProcessSASLBindEmptyCreds()
          throws Exception
   {
@@ -181,7 +181,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testProcessSASLBindWithTraceInfo()
          throws Exception
   {
@@ -208,7 +208,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindNoCreds()
          throws Exception
   {
@@ -237,7 +237,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindWithTraceInfo()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
index 02d6563..c1e668a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -68,7 +68,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
index e8607c1..057c4a5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -49,7 +50,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -67,7 +68,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testBlindTrustManagerProvider()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 1a52bdd..22bf74e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -143,7 +143,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsPasswordBased()
          throws Exception
   {
@@ -161,7 +161,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsSecure()
          throws Exception
   {
@@ -180,7 +180,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindSuccessWithUID()
          throws Exception
   {
@@ -222,7 +222,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindSuccessWithDN()
          throws Exception
   {
@@ -264,7 +264,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindSuccessWithDNAndLongPassword()
          throws Exception
   {
@@ -309,7 +309,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailWrongPasswordWithUID()
          throws Exception
   {
@@ -351,7 +351,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailWrongPasswordWithDN()
          throws Exception
   {
@@ -393,7 +393,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithUID()
          throws Exception
   {
@@ -433,7 +433,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithDN()
          throws Exception
   {
@@ -473,7 +473,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailInvalidDN()
          throws Exception
   {
@@ -513,7 +513,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNoSuchUser()
          throws Exception
   {
@@ -553,7 +553,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNullDN()
          throws Exception
   {
@@ -581,7 +581,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithRootDN()
          throws Exception
   {
@@ -608,7 +608,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testOutOfSequenceBind()
          throws Exception
   {
@@ -628,7 +628,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedCredentials()
          throws Exception
   {
@@ -653,7 +653,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedDigest()
          throws Exception
   {
@@ -680,7 +680,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedDigestWithCorrectLength()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index 567ea5c..9242d6b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -81,7 +81,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -95,7 +95,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelAddOperation()
          throws Exception
   {
@@ -188,7 +188,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelCompareOperation()
          throws Exception
   {
@@ -271,7 +271,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelDeleteOperation()
          throws Exception
   {
@@ -358,7 +358,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelExtendedOperation()
          throws Exception
   {
@@ -428,7 +428,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelModifyOperation()
          throws Exception
   {
@@ -517,7 +517,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelModifyDNOperation()
          throws Exception
   {
@@ -605,7 +605,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelSearchOperation()
          throws Exception
   {
@@ -692,7 +692,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelNoSuchOperation()
          throws Exception
   {
@@ -749,7 +749,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelNoValue()
          throws Exception
   {
@@ -800,7 +800,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelMalformedValue()
          throws Exception
   {
@@ -850,7 +850,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCancelCancelExtendedOperation()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
index f2cf53f..2321fdc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -74,7 +75,7 @@
   /**
    * Tests the <CODE>policyForName</CODE> method with an invalid policy name.
    */
-  @Test()
+  @Test
   public void testPolicyForInvalidName()
   {
     assertNull(CertificateValidationPolicy.policyForName("invalid"));
@@ -109,7 +110,7 @@
   /**
    * Tests the <CODE>values</CODE> method.
    */
-  @Test()
+  @Test
   public void testValues()
   {
     assertNotNull(CertificateValidationPolicy.values());
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
index bd3aecf..6246eca 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -68,7 +68,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
index 53d17c5..22147fc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -55,7 +56,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index 8b44383..1bf2707 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -80,7 +80,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   @SuppressWarnings("unchecked")
   public void entryCacheTestInit()
          throws Exception
@@ -207,7 +207,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void entryCacheTestFini()
          throws Exception
   {
@@ -236,7 +236,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testContainsEntry()
          throws Exception
@@ -249,7 +249,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry1()
          throws Exception
@@ -262,7 +262,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry2()
          throws Exception
@@ -275,7 +275,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry3()
          throws Exception
@@ -288,7 +288,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntryID()
          throws Exception
@@ -301,7 +301,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntry()
          throws Exception
@@ -314,7 +314,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntryIfAbsent()
          throws Exception
@@ -327,7 +327,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testRemoveEntry()
          throws Exception
@@ -340,7 +340,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClear()
          throws Exception
@@ -353,7 +353,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearBackend()
          throws Exception
@@ -366,7 +366,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearSubtree()
          throws Exception
@@ -379,7 +379,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testHandleLowMemory()
          throws Exception
@@ -396,7 +396,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCacheLevels()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
index 8d205f6..4739d5b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
@@ -23,7 +23,7 @@
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
  *      Portions Copyright 2011 profiq, s.r.o.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -80,7 +80,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index b0f215e..a0983d8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -164,7 +164,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsPasswordBased()
          throws Exception
   {
@@ -182,7 +182,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testIsSecure()
          throws Exception
   {
@@ -201,7 +201,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindSuccessWithUID()
          throws Exception
   {
@@ -244,7 +244,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindSuccessWithDN()
          throws Exception
   {
@@ -287,7 +287,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailWrongPasswordWithUID()
          throws Exception
   {
@@ -330,7 +330,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailWrongPasswordWithDN()
          throws Exception
   {
@@ -373,7 +373,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithUID()
          throws Exception
   {
@@ -414,7 +414,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithDN()
          throws Exception
   {
@@ -455,7 +455,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailInvalidDN()
          throws Exception
   {
@@ -496,7 +496,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNoSuchUserForUID()
          throws Exception
   {
@@ -537,7 +537,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNoSuchUserForDN()
          throws Exception
   {
@@ -578,7 +578,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailEmptyUID()
          throws Exception
   {
@@ -608,7 +608,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNullDN()
          throws Exception
   {
@@ -638,7 +638,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailEmptyAuthID()
          throws Exception
   {
@@ -668,7 +668,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailEmptyAuthzID()
          throws Exception
   {
@@ -713,7 +713,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailIrreversiblePasswordWithRootDN()
          throws Exception
   {
@@ -742,7 +742,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulBindReversiblePasswordWithRootDN()
          throws Exception
   {
@@ -789,7 +789,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNonexistentAuthzDN()
          throws Exception
   {
@@ -833,7 +833,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNonexistentAuthzUsername()
          throws Exception
   {
@@ -877,7 +877,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailMalformedAuthzDN()
          throws Exception
   {
@@ -921,7 +921,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testOutOfSequenceBind()
          throws Exception
   {
@@ -941,7 +941,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedCredentials()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index 4a609f6..e19c6d8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -67,7 +67,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -351,7 +351,7 @@
   /**
    * Tests the {@code isMultiValued} method.
    */
-  @Test()
+  @Test
   public void testIsMultiValued()
   {
     EntryDNVirtualAttributeProvider provider =
@@ -366,7 +366,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValues()
          throws Exception
   {
@@ -394,7 +394,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasAnyValue()
          throws Exception
   {
@@ -419,7 +419,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasMatchingValue()
          throws Exception
   {
@@ -455,7 +455,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasNonMatchingValue()
          throws Exception
   {
@@ -480,7 +480,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMatchesSubstring()
          throws Exception
   {
@@ -509,7 +509,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGreaterThanOrEqualTo()
          throws Exception
   {
@@ -536,7 +536,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLessThanOrEqualTo()
          throws Exception
   {
@@ -563,7 +563,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testApproximatelyEqualTo()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 4361efa..813a5fa 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
index 04c6682..9ae4eeb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -75,7 +75,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -181,7 +181,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHandlerEnabled()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 5ed060a..72d3d89 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -270,7 +270,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMapperEnabled()
          throws Exception
   {
@@ -288,7 +288,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchWithoutBaseDN()
          throws Exception
   {
@@ -346,7 +346,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchWithValidBaseDN()
          throws Exception
   {
@@ -406,7 +406,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchWithInvalidBaseDN()
          throws Exception
   {
@@ -462,7 +462,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMismatch()
          throws Exception
   {
@@ -591,7 +591,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompoundFirstMatch()
          throws Exception
   {
@@ -650,7 +650,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompoundSecondMatch()
          throws Exception
   {
@@ -709,7 +709,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompoundMismatch()
          throws Exception
   {
@@ -766,7 +766,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testChangingMapAttribute()
          throws Exception
   {
@@ -849,7 +849,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testChangingMapBaseDN()
          throws Exception
   {
@@ -934,7 +934,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectChangingToNoMatchAttr()
          throws Exception
   {
@@ -958,7 +958,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectChangingToInvalidMatchAttr()
          throws Exception
   {
@@ -986,7 +986,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectChangingToInvalidMatchBaseDN()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index c40df25..a59bca6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -72,7 +72,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -154,7 +154,7 @@
   /**
    * Tests the <CODE>isPasswordBased</CODE> method.
    */
-  @Test()
+  @Test
   public void testIsPasswordBased()
   {
     ExternalSASLMechanismHandler handler =
@@ -169,7 +169,7 @@
   /**
    * Tests the <CODE>isSecure</CODE> method.
    */
-  @Test()
+  @Test
   public void testIsSecure()
   {
     ExternalSASLMechanismHandler handler =
@@ -188,7 +188,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEXTERNALTrustStore()
          throws Exception
   {
@@ -235,7 +235,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEXTERNALTrustAll()
          throws Exception
   {
@@ -279,7 +279,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailEXTERNALInsecureConnection()
          throws Exception
   {
@@ -311,7 +311,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailEXTERNALTrustAllNoSuchUser()
          throws Exception
   {
@@ -348,7 +348,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailEXTERNALTrustAllNoRequiredCert()
          throws Exception
   {
@@ -412,7 +412,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEXTERNALTrustAllValidOptionalCert()
          throws Exception
   {
@@ -467,7 +467,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailEXTERNALTrustAllInvalidOptionalCert()
          throws Exception
   {
@@ -533,7 +533,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEXTERNALTrustAllValidRequiredCert()
          throws Exception
   {
@@ -605,7 +605,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailEXTERNALTrustAllInvalidRequiredCert()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
index 16b7929..8c6c7cf 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void entryCacheTestInit()
          throws Exception
   {
@@ -129,7 +129,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void entryCacheTestFini()
          throws Exception
   {
@@ -141,7 +141,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testContainsEntry()
          throws Exception
@@ -154,7 +154,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry1()
          throws Exception
@@ -167,7 +167,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry2()
          throws Exception
@@ -180,7 +180,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry3()
          throws Exception
@@ -193,7 +193,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntryID()
          throws Exception
@@ -206,7 +206,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntry()
          throws Exception
@@ -219,7 +219,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntryIfAbsent()
          throws Exception
@@ -232,7 +232,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testRemoveEntry()
          throws Exception
@@ -245,7 +245,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClear()
          throws Exception
@@ -258,7 +258,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearBackend()
          throws Exception
@@ -271,7 +271,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearSubtree()
          throws Exception
@@ -284,7 +284,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testHandleLowMemory()
          throws Exception
@@ -357,7 +357,7 @@
   /**
    * Tests cache rotation on specific number of entries.
    */
-  @Test()
+  @Test
   public void testCacheRotation()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
index c7f1652..98f8a5e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -55,7 +55,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
index 7ebf5a3..450f9b6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index 0100000..9053e78 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -70,7 +70,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -189,7 +189,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingDefaultConfig()
          throws Exception
   {
@@ -249,7 +249,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingSHA1()
          throws Exception
   {
@@ -312,7 +312,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingNoMatchingEntries()
          throws Exception
   {
@@ -370,7 +370,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingMultipleMatchingEntries()
          throws Exception
   {
@@ -444,7 +444,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveFingerprintAttribute()
          throws Exception
   {
@@ -472,7 +472,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveFingerprintAlgorithm()
          throws Exception
   {
@@ -690,7 +690,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPrivilegeWithSuccessfulMappingDefaultConfig()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index ec31b89..a1b9d79 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -72,7 +72,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -104,7 +104,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
- @AfterClass()
+ @AfterClass
  public void cleanup() throws Exception
  {
     int resultCode = TestCaseUtils.applyModifications(true,
@@ -407,7 +407,7 @@
   /**
    * Tests the {@code isMultiValued} method.
    */
-  @Test()
+  @Test
   public void testIsMultiValued()
   {
     GoverningStructureRuleVirtualAttributeProvider provider =
@@ -422,7 +422,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetValues()
          throws Exception
   {
@@ -450,7 +450,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasAnyValue()
          throws Exception
   {
@@ -475,7 +475,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasMatchingValue()
          throws Exception
   {
@@ -500,7 +500,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasNonMatchingValue()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index ce5ae0a..a1b5fd4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -443,7 +443,7 @@
   /**
    * Tests the {@code isMultiValued} method.
    */
-  @Test()
+  @Test
   public void testIsMultiValued()
   {
     NumSubordinatesVirtualAttributeProvider provider =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java
index 206cdce..0f4f40e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 3239ee3..59d0dea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -1618,7 +1618,7 @@
    * @throws Exception
    *           If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void beforeClass() throws Exception
   {
     TestCaseUtils.startServer();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index c6e1376..cd46f47 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -67,7 +67,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -318,7 +318,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableNoConstraints()
          throws Exception
   {
@@ -391,7 +391,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableMinLengthConstraint()
          throws Exception
   {
@@ -466,7 +466,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableMaxLengthConstraint()
          throws Exception
   {
@@ -541,7 +541,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableMinAndMaxLengthConstraints()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
index aad4429..f6a1849 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -46,7 +47,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -61,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testNullKeyManagerProvider()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
index f6af0cc..463dd1a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -47,7 +48,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -62,7 +63,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testNullTrustManagerProvider()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 8903d96..13b8a5d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -61,7 +61,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
index f48866b..879bf75 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2012 profiq, s.r.o.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -59,7 +59,7 @@
   private Entry notExpired;
   private Entry expired;
 
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -113,7 +113,7 @@
     assertEquals(expirationTime, createTime + 2592000000L);
   }
 
-  @BeforeMethod()
+  @BeforeMethod
   public void environmentSetup() throws Exception
   {
     TestCaseUtils.initializeMemoryBackend(TestCaseUtils.TEST_BACKEND_ID,
@@ -121,7 +121,7 @@
                                           true);
   }
 
-  @AfterMethod()
+  @AfterMethod
   public void environmentCleanup() throws Exception
   {
     TestCaseUtils.clearMemoryBackend(TestCaseUtils.TEST_BACKEND_ID);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index fc3d827..9222632 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -162,7 +162,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsRootImplicitSelfWithOldPassword()
          throws Exception
   {
@@ -218,7 +218,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsRootExplicitSelfWithOldPassword()
          throws Exception
   {
@@ -276,7 +276,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsAnonymousExplicitRootWithOldPassword()
          throws Exception
   {
@@ -330,7 +330,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserImplicitSelfWithOldPasswordWithNewPassword()
          throws Exception
   {
@@ -385,7 +385,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserImplicitSelfNoOldPasswordWithNewPassword()
          throws Exception
   {
@@ -439,7 +439,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserImplicitSelfNoOldPasswordNoNewPassword()
          throws Exception
   {
@@ -485,7 +485,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserExplicitDNColonSelfNoOldPasswordWithNewPassword()
          throws Exception
   {
@@ -540,7 +540,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserExplicitUColonSelfNoOldPasswordWithNewPassword()
          throws Exception
   {
@@ -595,7 +595,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserExplicitDNSelfNoOldPasswordWithNewPassword()
          throws Exception
   {
@@ -650,7 +650,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsUserExplicitUSelfNoOldPasswordWithNewPassword()
          throws Exception
   {
@@ -705,7 +705,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsExplicitDNColonAnonymousWithOldPasswordWithNewPassword()
          throws Exception
   {
@@ -758,7 +758,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAsExplicitUColonAnonymousWithOldPasswordWithNewPassword()
          throws Exception
   {
@@ -811,7 +811,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testRootPasswordResetNoCurrentPasswordWithNewPassword()
          throws Exception
   {
@@ -859,7 +859,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureDNColonNoSuchUser()
          throws Exception
   {
@@ -890,7 +890,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureDNColonMalformedDN()
          throws Exception
   {
@@ -922,7 +922,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureDNColonNoSuchBaseDN()
          throws Exception
   {
@@ -953,7 +953,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureUColonNoSuchUser()
          throws Exception
   {
@@ -985,7 +985,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureUColonNoSuchUserWithCurrentPassword()
          throws Exception
   {
@@ -1017,7 +1017,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureMalformedAuthZID()
          throws Exception
   {
@@ -1048,7 +1048,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureWrongCurrentPassword()
          throws Exception
   {
@@ -1091,7 +1091,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAllowPreEncoded()
          throws Exception
   {
@@ -1151,7 +1151,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailurePreEncodedNewPassword()
          throws Exception
   {
@@ -1202,7 +1202,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailurePreEncodedNewPasswordWithCurrentPassword()
          throws Exception
   {
@@ -1249,7 +1249,7 @@
    * Tests the password modify extended operation over an internal connection
    * with a request whose value isn't a valid encoded sequence.
    */
-  @Test()
+  @Test
   public void testFailureInvalidRequestValueFormat()
   {
     ByteString requestValue = ByteString.valueOf("malformed");
@@ -1268,7 +1268,7 @@
    * Tests the password modify extended operation over an internal connection
    * with a request that contain an invalid sequence element type.
    */
-  @Test()
+  @Test
   public void testFailureInvalidSequenceElementType() throws Exception
   {
     ByteStringBuilder builder = new ByteStringBuilder();
@@ -1292,7 +1292,7 @@
    * Tests the password modify extended operation over an unauthenticated
    * internal connection and without providing an authorization ID.
    */
-  @Test()
+  @Test
   public void testFailureCompletelyAnonymous() throws Exception
   {
     ByteStringBuilder builder = new ByteStringBuilder();
@@ -1319,7 +1319,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRejectUserPasswordChanges()
          throws Exception
   {
@@ -1378,7 +1378,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRejectUserPasswordChangesWithCurrentPassword()
          throws Exception
   {
@@ -1438,7 +1438,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRequireCurrentPassword()
          throws Exception
   {
@@ -1497,7 +1497,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRequireSecureAuthentication()
          throws Exception
   {
@@ -1556,7 +1556,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRequireSecurePasswordChanges()
          throws Exception
   {
@@ -1615,7 +1615,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureRequireSecurePasswordChangesWithCurrentPassword()
          throws Exception
   {
@@ -1675,7 +1675,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureWithinMinAge()
          throws Exception
   {
@@ -1733,7 +1733,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureWithinMinAgeWithCurrentPassword()
          throws Exception
   {
@@ -1793,7 +1793,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureExpiredChangesNotAllowed()
          throws Exception
   {
@@ -1863,7 +1863,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testExpiredChangesAllowed()
          throws Exception
   {
@@ -1941,7 +1941,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureNoPasswordNoGenerator()
          throws Exception
   {
@@ -2001,7 +2001,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureNoPasswordNoGeneratorWithPassword()
          throws Exception
   {
@@ -2060,7 +2060,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureValidatorReject()
          throws Exception
   {
@@ -2120,7 +2120,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testFailureValidatorRejectWithCurrentPassword()
          throws Exception
   {
@@ -2181,7 +2181,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAllowMultiplePasswords()
          throws Exception
   {
@@ -2246,7 +2246,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testAllowMultipleAuthPasswords()
          throws Exception
   {
@@ -2312,7 +2312,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testUpdateLastLoginTime()
          throws Exception
   {
@@ -2395,7 +2395,7 @@
    *
    * @throws  Exception  If an unexpected error occurs.
    */
-  @Test()
+  @Test
   public void testUpdateAuthFailureTimes()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index 5fd15b7..df38fe3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -61,7 +61,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -74,7 +74,7 @@
    * Tests to ensure that the SASL PLAIN mechanism is loaded and available in
    * the server, and that it reports that it is password based and not secure.
    */
-  @Test()
+  @Test
   public void testSASLPlainLoaded()
   {
     SASLMechanismHandler<?> handler = DirectoryServer.getSASLMechanismHandler("PLAIN");
@@ -91,7 +91,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSASLPlainAdvertised() throws Exception
   {
     SearchRequest request =
@@ -348,7 +348,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSASLPlainAsRoot()
          throws Exception
   {
@@ -371,7 +371,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSASLPlainOverLDAP()
          throws Exception
   {
@@ -469,7 +469,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNonexistentAuthzDN()
          throws Exception
   {
@@ -511,7 +511,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailNonexistentAuthzUsername()
          throws Exception
   {
@@ -553,7 +553,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPBindFailMalformedAuthzDN()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
index e439725..a18fe60 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -79,7 +79,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void preloadEntryCacheTestInit()
          throws Exception
   {
@@ -183,7 +183,7 @@
   /**
    * Tests the entry cache pre-load.
    */
-  @Test()
+  @Test
   public void testEntryCachePreload()
          throws Exception
   {
@@ -213,7 +213,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void preloadEntryCacheTestFini()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index e0842f3..cfe2ba4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -60,7 +60,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -74,7 +74,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDefaultConfiguration()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
index ddac6aa..7cded23d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -77,7 +77,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMapperEnabled()
          throws Exception
   {
@@ -173,7 +173,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchSingleReplacementWithoutBaseDN()
          throws Exception
   {
@@ -237,7 +237,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchSingleReplacementMultipleAttributes()
          throws Exception
   {
@@ -302,7 +302,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchSingleReplacementWithBaseDNInScope()
          throws Exception
   {
@@ -367,7 +367,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchSingleReplacementWithBaseDNOutOfScope()
          throws Exception
   {
@@ -430,7 +430,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchSingleReplacementWithMultipleBaseDNs()
          throws Exception
   {
@@ -497,7 +497,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMatchPatternDoesntMatch()
          throws Exception
   {
@@ -560,7 +560,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchNoReplacePattern()
          throws Exception
   {
@@ -622,7 +622,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleMatchReplacePatternExpandsString()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
index c45649b..91361f0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -238,7 +238,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableNoConstraints()
          throws Exception
   {
@@ -312,7 +312,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPasswordIsAcceptableMinDifferenceConstraint()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
index ebe7dc9..37fe490 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -56,7 +56,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void entryCacheTestInit()
          throws Exception
   {
@@ -126,7 +126,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void entryCacheTestFini()
          throws Exception
   {
@@ -138,7 +138,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testContainsEntry()
          throws Exception
@@ -151,7 +151,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry1()
          throws Exception
@@ -164,7 +164,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry2()
          throws Exception
@@ -177,7 +177,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntry3()
          throws Exception
@@ -190,7 +190,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testGetEntryID()
          throws Exception
@@ -203,7 +203,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntry()
          throws Exception
@@ -216,7 +216,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testPutEntryIfAbsent()
          throws Exception
@@ -229,7 +229,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testRemoveEntry()
          throws Exception
@@ -242,7 +242,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClear()
          throws Exception
@@ -255,7 +255,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearBackend()
          throws Exception
@@ -268,7 +268,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testClearSubtree()
          throws Exception
@@ -281,7 +281,7 @@
   /**
    * {@inheritDoc}
    */
-  @Test()
+  @Test
   @Override
   public void testHandleLowMemory()
          throws Exception
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
index b091bc3..ce9cc3e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -47,7 +47,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -61,7 +61,7 @@
    * server in conjunction with no authentication and using a client trust store
    * to validate the server certificate.
    */
-  @Test()
+  @Test
   public void testStartTLSNoAuthTrustStore()
   {
     String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
@@ -88,7 +88,7 @@
    * Tests the use of the StartTLS extended operation to communicate with the
    * server in conjunction with no authentication and using blind trust.
    */
-  @Test()
+  @Test
   public void testStartTLSNoAuthTrustAll()
   {
     String[] args =
@@ -113,7 +113,7 @@
    * server in conjunction with simple authentication and using a client trust
    * store to validate the server certificate.
    */
-  @Test()
+  @Test
   public void testStartTLSSimpleAuthTrustStore()
   {
     String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
@@ -142,7 +142,7 @@
    * Tests the use of the StartTLS extended operation to communicate with the
    * server in conjunction with simple authentication and using blind trust.
    */
-  @Test()
+  @Test
   public void testStartTLSSimpleAuthTrustAll()
   {
     String[] args =
@@ -171,7 +171,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSExternalAuthTrustStore()
          throws Exception
   {
@@ -218,7 +218,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSExternalAuthTrustAll()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index a2f8b59..63a37e8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -69,7 +69,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index 37f3373..296f800 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  *      Portions Copyright 2013 Manuel Gaupp
  */
 package org.opends.server.extensions;
@@ -72,7 +72,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -237,7 +237,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingDefaultConfig()
          throws Exception
   {
@@ -295,7 +295,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingUsingAnOID()
          throws Exception
   {
@@ -358,7 +358,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingDefaultConfigEmailAddress()
          throws Exception
   {
@@ -417,7 +417,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingMultipleAttributes()
          throws Exception
   {
@@ -479,7 +479,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedNoMappableAttributes()
          throws Exception
   {
@@ -541,7 +541,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingNoMatchingUsers()
          throws Exception
   {
@@ -599,7 +599,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingMultipleMatchingUsers()
          throws Exception
   {
@@ -669,7 +669,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingNoUserBelowBaseDNs()
          throws Exception
   {
@@ -730,7 +730,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveMapAttribute()
          throws Exception
   {
@@ -996,7 +996,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPrivilegeWithSuccessfulMappingDefaultConfig()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index e884c28..2f23d7c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -70,7 +70,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -163,7 +163,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingDefaultConfig()
          throws Exception
   {
@@ -223,7 +223,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingAlternateSubjectAttribute()
          throws Exception
   {
@@ -286,7 +286,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSuccessfulMappingAlternateBaseDNs()
          throws Exception
   {
@@ -348,7 +348,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingNoUsers()
          throws Exception
   {
@@ -407,7 +407,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingMultipleUsers()
          throws Exception
   {
@@ -479,7 +479,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testFailedMappingNoUserBelowBaseDNs()
          throws Exception
   {
@@ -541,7 +541,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveSubjectAttribute()
          throws Exception
   {
@@ -721,7 +721,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPrivilegeWithSuccessfulMappingDefaultConfig()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index d6def55..0de64cc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -68,7 +68,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
index 9b06d49..de73381 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -88,7 +88,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePasswordValidator(
                    PasswordValidatorCfg configuration)
          throws InitializationException
@@ -108,7 +108,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index afd9262..badb5dd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -71,7 +71,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 81b20b4..c61243a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -245,7 +245,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
index be6293d..dae8800 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -67,7 +67,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -80,7 +80,7 @@
    * Tests the use of the Who Am I? extended operation with an internal
    * connection authenticated as a root user.
    */
-  @Test()
+  @Test
   public void testAsInternalRootUser()
   {
     InternalClientConnection conn =
@@ -99,7 +99,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAsInternalAnonymous()
          throws Exception
   {
@@ -118,7 +118,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAsInternalNormalUser()
          throws Exception
   {
@@ -151,7 +151,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAsLDAPRootUser()
          throws Exception
   {
@@ -184,7 +184,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAsLDAPAnonymous()
          throws Exception
   {
@@ -213,7 +213,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAsLDAPNormalUser()
          throws Exception
   {
@@ -261,7 +261,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testWithAlternateSASLAuthzID()
          throws Exception
   {
@@ -340,7 +340,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testWithAllowedProxiedAuthControl()
          throws Exception
   {
@@ -427,7 +427,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testWithDisallowedProxiedAuthControl()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
index 0aa808b..77eaa35 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -96,7 +96,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testInitialization()
          throws Exception
   {
@@ -111,7 +111,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMonitorInstanceName()
          throws Exception
   {
@@ -125,7 +125,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetMonitorData()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
index e5564dd..bc27aea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2011 profiq s.r.o.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -58,7 +58,7 @@
 public class AttributeCleanupPluginTestCase extends PluginTestCase
 {
 
-  @BeforeClass()
+  @BeforeClass
   public void startServer() throws Exception
   {
     TestCaseUtils.startServer();
@@ -215,7 +215,7 @@
    *
    * @throws Exception in case of bugs.
    */
-  @Test()
+  @Test
   public void testRenameAttributesForAddOperation() throws Exception
   {
     // Configure the plugin to rename incoming 'cn' attributes to 'description'.
@@ -306,7 +306,7 @@
    * Verifies the attribute removal in the incoming ADD request.
    * @throws Exception in case of bugs.
    */
-  @Test()
+  @Test
   public void testRemoveAttributesForAddOperation() throws Exception
   {
     /* Configure the plugin to remove 'modifyTimeStamp' and
@@ -405,7 +405,7 @@
    * SUCCESS.
    * @throws Exception in case of a bug.
    */
-  @Test()
+  @Test
   public void testRemoveAttributesForModifyOperationInvalid() throws Exception
   {
     /* Configure the plugin to remove 'modifyTimeStamp' and
@@ -479,7 +479,7 @@
    * Verify the attribute renaming for a MODIFY operation.
    * @throws Exception in case of a bug.
    */
-  @Test()
+  @Test
   public void testRemoveAttributesForModifyOperationValid() throws Exception
   {
     /* Configure the plugin to remove 'modifyTimeStamp' and
@@ -580,7 +580,7 @@
   /**
    * Verify the attribute renaming for the MODIFY operation.
    */
-  @Test()
+  @Test
   public void testRenameAttributesForModifyOperation() throws Exception
   {
     /* Configure the plugin to rename the 'modifyTimeStamp' attribute to
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
index a0b32a9..bbf02b4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -175,7 +175,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
          throws ConfigException
@@ -207,7 +207,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationAddOperation addOperation)
       throws CanceledOperationException {
@@ -219,7 +219,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
          doPreOperation(PreOperationBindOperation bindOperation)
   {
@@ -239,7 +239,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
          doPreOperation(PreOperationCompareOperation compareOperation)
       throws CanceledOperationException {
@@ -251,7 +251,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationDeleteOperation deleteOperation)
       throws CanceledOperationException {
@@ -263,7 +263,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationExtendedOperation extendedOperation)
       throws CanceledOperationException {
@@ -275,7 +275,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
       throws CanceledOperationException {
@@ -287,7 +287,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
       throws CanceledOperationException {
@@ -299,7 +299,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationSearchOperation searchOperation)
       throws CanceledOperationException {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
index 48608e7..9d34900 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -173,7 +173,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
          throws ConfigException
@@ -234,7 +234,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(
       PreParseAbandonOperation abandonOperation)
   {
@@ -247,7 +247,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
       throws CanceledOperationException {
     if (disconnectInternal(addOperation, "PreParse"))
@@ -262,7 +262,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
   {
     disconnectInternal(bindOperation, "PreParse");
@@ -274,7 +274,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseCompareOperation compareOperation)
        throws CanceledOperationException {
@@ -290,7 +290,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseDeleteOperation deleteOperation)
        throws CanceledOperationException {
@@ -306,7 +306,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseExtendedOperation extendedOperation)
        throws CanceledOperationException {
@@ -322,7 +322,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyOperation modifyOperation)
        throws CanceledOperationException {
@@ -338,7 +338,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyDNOperation modifyDNOperation)
        throws CanceledOperationException {
@@ -354,7 +354,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseSearchOperation searchOperation)
        throws CanceledOperationException {
@@ -370,7 +370,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseUnbindOperation unbindOperation)
   {
@@ -383,7 +383,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationAddOperation addOperation)
        throws CanceledOperationException {
@@ -399,7 +399,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationBindOperation bindOperation)
   {
@@ -412,7 +412,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationCompareOperation compareOperation)
        throws CanceledOperationException {
@@ -428,7 +428,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationDeleteOperation deleteOperation)
        throws CanceledOperationException {
@@ -444,7 +444,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationExtendedOperation extendedOperation)
        throws CanceledOperationException {
@@ -460,7 +460,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
        throws CanceledOperationException {
@@ -476,7 +476,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
        throws CanceledOperationException {
@@ -492,7 +492,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationSearchOperation searchOperation)
        throws CanceledOperationException {
@@ -508,7 +508,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationAbandonOperation abandonOperation)
   {
@@ -521,7 +521,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
   {
@@ -534,7 +534,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationBindOperation bindOperation)
   {
@@ -547,7 +547,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationCompareOperation compareOperation)
   {
@@ -560,7 +560,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationDeleteOperation deleteOperation)
   {
@@ -573,7 +573,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationExtendedOperation extendedOperation)
   {
@@ -586,7 +586,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
   {
@@ -599,7 +599,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
   {
@@ -612,7 +612,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationSearchOperation searchOperation)
   {
@@ -625,7 +625,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationUnbindOperation unbindOperation)
   {
@@ -638,7 +638,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseAddOperation addOperation)
   {
@@ -651,7 +651,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseBindOperation bindOperation)
   {
@@ -664,7 +664,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseCompareOperation compareOperation)
   {
@@ -677,7 +677,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseDeleteOperation deleteOperation)
   {
@@ -690,7 +690,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseExtendedOperation extendedOperation)
   {
@@ -703,7 +703,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseModifyOperation modifyOperation)
   {
@@ -716,7 +716,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
   {
@@ -729,7 +729,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseSearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 9c36828..fe41a21 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -250,7 +250,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoLDIFImport()
          throws Exception
   {
@@ -287,7 +287,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoLDIFImportWithExistingUUID()
          throws Exception
   {
@@ -327,7 +327,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoPreOperationAdd()
          throws Exception
   {
@@ -347,7 +347,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoPreOperationAddWithExistingUUID()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
index a144217..171d976 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -110,7 +110,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
   {
@@ -122,7 +122,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseAbandonOperation abandonOperation)
   {
@@ -135,7 +135,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
   {
     preParseCounter.incrementAndGet();
@@ -147,7 +147,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
   {
     preParseCounter.incrementAndGet();
@@ -159,7 +159,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseCompareOperation compareOperation)
   {
@@ -172,7 +172,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseDeleteOperation deleteOperation)
   {
@@ -185,7 +185,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseExtendedOperation extendedOperation)
   {
@@ -198,7 +198,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyOperation modifyOperation)
   {
@@ -211,7 +211,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyDNOperation modifyDNOperation)
   {
@@ -224,7 +224,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseSearchOperation searchOperation)
   {
@@ -237,7 +237,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseUnbindOperation unbindOperation)
   {
@@ -276,7 +276,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -289,7 +289,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationBindOperation bindOperation)
   {
@@ -302,7 +302,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationCompareOperation compareOperation)
   {
@@ -315,7 +315,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationDeleteOperation deleteOperation)
   {
@@ -328,7 +328,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationExtendedOperation extendedOperation)
   {
@@ -341,7 +341,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
   {
@@ -354,7 +354,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
   {
@@ -367,7 +367,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationSearchOperation searchOperation)
   {
@@ -406,7 +406,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationAbandonOperation abandonOperation)
   {
@@ -419,7 +419,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
   {
@@ -432,7 +432,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationBindOperation bindOperation)
   {
@@ -445,7 +445,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationCompareOperation compareOperation)
   {
@@ -458,7 +458,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationDeleteOperation deleteOperation)
   {
@@ -471,7 +471,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationExtendedOperation extendedOperation)
   {
@@ -484,7 +484,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
   {
@@ -497,7 +497,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
   {
@@ -510,7 +510,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationSearchOperation searchOperation)
   {
@@ -523,7 +523,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostOperation
        doPostOperation(PostOperationUnbindOperation unbindOperation)
   {
@@ -562,7 +562,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseAddOperation addOperation)
   {
@@ -575,7 +575,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseBindOperation bindOperation)
   {
@@ -588,7 +588,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseCompareOperation compareOperation)
   {
@@ -601,7 +601,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseDeleteOperation deleteOperation)
   {
@@ -614,7 +614,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseExtendedOperation extendedOperation)
   {
@@ -627,7 +627,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseModifyOperation modifyOperation)
   {
@@ -640,7 +640,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
   {
@@ -653,7 +653,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostResponse
        doPostResponse(PostResponseSearchOperation searchOperation)
   {
@@ -692,7 +692,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void doPostSynchronization(PostSynchronizationAddOperation
                                          addOperation)
   {
@@ -704,7 +704,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void doPostSynchronization(PostSynchronizationModifyOperation
                                          modifyOperation)
   {
@@ -716,7 +716,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void doPostSynchronization(PostSynchronizationModifyDNOperation
                                          modifyDNOperation)
   {
@@ -755,7 +755,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.IntermediateResponse
        processSearchEntry(SearchEntrySearchOperation searchOperation,
                           SearchResultEntry searchEntry)
@@ -796,7 +796,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.IntermediateResponse
        processSearchReference(SearchReferenceSearchOperation searchOperation,
                               SearchResultReference searchReference)
@@ -837,7 +837,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.SubordinateModifyDN processSubordinateModifyDN(
               SubordinateModifyDNOperation modifyDNOperation, Entry oldEntry,
               Entry newEntry, List<Modification> modifications)
@@ -879,7 +879,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.IntermediateResponse processIntermediateResponse(
               IntermediateResponse intermediateResponse)
   {
@@ -919,7 +919,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostConnect doPostConnect(ClientConnection
                                                     clientConnection)
   {
@@ -958,7 +958,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PostDisconnect doPostDisconnect(
           ClientConnection clientConnection, DisconnectReason disconnectReason,
           LocalizableMessage message)
@@ -998,7 +998,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.ImportLDIF doLDIFImport(LDIFImportConfig importConfig,
                                         Entry entry)
   {
@@ -1037,7 +1037,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.ImportLDIF doLDIFExport(LDIFExportConfig exportConfig,
                                        Entry entry)
   {
@@ -1099,7 +1099,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.Startup doStartup()
   {
     startupCalled = true;
@@ -1135,7 +1135,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void doShutdown(LocalizableMessage reason)
   {
     shutdownCalled = true;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
index 291d4f9..984f215 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
index 20205a4..5722da4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -68,7 +68,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -276,7 +276,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoPreOperationAdd()
          throws Exception
   {
@@ -296,7 +296,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoPreOperationModify()
          throws Exception
   {
@@ -325,7 +325,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoPreOperationModifyDN()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
index 9037a0d..531f54b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -60,7 +61,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
index 6b55a23..34acf2d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -57,7 +57,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -246,7 +246,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoLDIFImport()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
index 78254d4..d0a5d81 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -74,7 +74,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCleanAllowedDisabled()
          throws Exception
   {
@@ -114,7 +114,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDirtyAllowedDisabled()
          throws Exception
   {
@@ -154,7 +154,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCleanAllowedEnabled()
          throws Exception
   {
@@ -210,7 +210,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDirtyRejectedEnabled()
          throws Exception
   {
@@ -267,7 +267,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddDirtyAcceptedEnabledOutsideScope()
          throws Exception
   {
@@ -325,7 +325,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDirtyAllowedDisabled()
          throws Exception
   {
@@ -370,7 +370,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDirtyRejectedEnabled()
          throws Exception
   {
@@ -431,7 +431,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDirtyToCleanAllowedEnabled()
          throws Exception
   {
@@ -492,7 +492,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyRemoveDirtyValueAllowedEnabled()
          throws Exception
   {
@@ -553,7 +553,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNDirtyAllowedDisabled()
          throws Exception
   {
@@ -598,7 +598,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNDirtyRejectedEnabled()
          throws Exception
   {
@@ -659,7 +659,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNDirtyToCleanAllowedEnabled()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
index 9fa6561..ef8c656 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -201,7 +201,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
          throws ConfigException
@@ -243,7 +243,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
          doPreParse(PreParseAbandonOperation abandonOperation)
   {
@@ -265,7 +265,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseAddOperation addOperation)
   {
     int resultCode = shortCircuitInternal(addOperation, "PreParse");
@@ -286,7 +286,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse doPreParse(PreParseBindOperation bindOperation)
   {
     int resultCode = shortCircuitInternal(bindOperation, "PreParse");
@@ -307,7 +307,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseCompareOperation compareOperation)
   {
@@ -329,7 +329,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseDeleteOperation deleteOperation)
   {
@@ -351,7 +351,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseExtendedOperation extendedOperation)
   {
@@ -373,7 +373,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyOperation modifyOperation)
   {
@@ -395,7 +395,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseModifyDNOperation modifyDNOperation)
   {
@@ -417,7 +417,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseSearchOperation searchOperation)
   {
@@ -439,7 +439,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreParse
        doPreParse(PreParseUnbindOperation unbindOperation)
   {
@@ -461,7 +461,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -483,7 +483,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationBindOperation bindOperation)
   {
@@ -505,7 +505,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationCompareOperation compareOperation)
   {
@@ -527,7 +527,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationDeleteOperation deleteOperation)
   {
@@ -549,7 +549,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationExtendedOperation extendedOperation)
   {
@@ -571,7 +571,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
   {
@@ -593,7 +593,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
   {
@@ -615,7 +615,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationSearchOperation searchOperation)
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index c637477..c2d22ba 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -63,7 +63,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -339,7 +339,7 @@
    *
    * @throws Exception If an unexpected result occurs.
    */
-  @Test()
+  @Test
   public void testModDNOperation() throws Exception {
     //Add an entry under the new superior DN that has a value for uid
     //that will be tested for.
@@ -383,7 +383,7 @@
    *
    * @throws Exception If an unexpected result occurs.
    */
-  @Test()
+  @Test
   public void testModOperationNameContexts() throws Exception {
     replaceAttrInEntry(uidConfigDN,dsConfigAttrType,"mail");
     LinkedList<Modification> mods = new LinkedList<Modification>();
@@ -425,7 +425,7 @@
    *
    * @throws Exception If an unexpected result occurs.
    */
-  @Test()
+  @Test
   public void testDseeCompatAdd() throws Exception {
     //Set up one plugin with mail attribute and a suffix.
     replaceAttrInEntry(uidConfigDN,dsConfigAttrType,"mail");
@@ -456,7 +456,7 @@
    *
    * @throws Exception If an unexpected result occurs.
    */
-  @Test()
+  @Test
   public void testAddOperation() throws Exception {
     replaceAttrInEntry(uidConfigDN,dsConfigAttrType,"mail");
     replaceAttrInEntry(uidConfigDN,dsConfigBaseDN,"ou=People1,o=test",
@@ -501,7 +501,7 @@
    *
    * @throws Exception If an unexpected result occurs.
    */
-  @Test()
+  @Test
   public void testAddOperationNameContext() throws Exception {
     replaceAttrInEntry(uidConfigDN,dsConfigAttrType,"mail");
     Entry e = makeEntry("cn=test user, ou=People,o=test");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
index 3725d87..0ac1ab8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -98,7 +98,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public void initializePlugin(Set<PluginType> pluginTypes,
                                PluginCfg configuration)
          throws ConfigException
@@ -133,7 +133,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationAddOperation addOperation)
   {
@@ -167,7 +167,7 @@
   /**
    * {@inheritDoc}
    */
-  @Override()
+  @Override
   public PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
index 8c8ca3f..a351b17 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols;
 
@@ -56,7 +56,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -348,7 +348,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGenericConnectionHandlerMethods()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java
index 7c24dc5..515039a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2013-2014 Manuel Gaupp
- *      Portions copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.asn1;
 
@@ -54,7 +54,7 @@
   /**
    * Test the <CODE>hasNext</CODE> method.
    */
-  @Test()
+  @Test
   public void testHasNext() throws Exception
   {
     GSERParser parser = new GSERParser("0");
@@ -68,7 +68,7 @@
   /**
    * Test the <CODE>skipSP</CODE> method.
    */
-  @Test()
+  @Test
   public void testSkipSP() throws Exception
   {
     String[] values = {" 42","  42","42"};
@@ -85,7 +85,7 @@
   /**
    * Test the <CODE>skipMSP</CODE> method.
    */
-  @Test()
+  @Test
   public void testSkipMSP() throws Exception
   {
     String[] values = {" 42","  42","           42"};
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
index ba3aaa0..a58dc48 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -49,7 +50,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetInstanceAndInitialize()
          throws Exception
   {
@@ -64,7 +65,7 @@
   /**
    * Tests the <CODE>finalizeConnectionHandler</CODE> method.
    */
-  @Test()
+  @Test
   public void testFinalizeConnectionHandler()
   {
     InternalConnectionHandler handler = InternalConnectionHandler.getInstance();
@@ -78,7 +79,7 @@
   /**
    * Tests the <CODE>getClientConnections</CODE> method.
    */
-  @Test()
+  @Test
   public void testGetClientConnections()
   {
     InternalConnectionHandler handler = InternalConnectionHandler.getInstance();
@@ -95,7 +96,7 @@
    * Tests the <CODE>run</CODE> method.  This will make sure that it returns as
    * expected rather than actually running as a thread.
    */
-  @Test()
+  @Test
   public void testRun()
   {
     InternalConnectionHandler handler = InternalConnectionHandler.getInstance();
@@ -110,7 +111,7 @@
    * Tests the first <CODE>toString</CODE> method, which doesn't take any
    * arguments.
    */
-  @Test()
+  @Test
   public void testToString1()
   {
     InternalConnectionHandler handler = InternalConnectionHandler.getInstance();
@@ -127,7 +128,7 @@
    * Tests the second <CODE>toString</CODE> method, which takes a
    * <CODE>StringBuilder</CODE> argument.
    */
-  @Test()
+  @Test
   public void testToString2()
   {
     InternalConnectionHandler handler = InternalConnectionHandler.getInstance();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index f03b2fe..93a6655 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -52,7 +52,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -114,7 +114,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddSearchEntryWithoutListener() throws Exception
   {
     SearchRequest request = newSearchRequest(DN.rootDN(), SearchScope.BASE_OBJECT);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index d025822..cb08ba5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.protocols.jmx;
 
@@ -295,7 +295,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanUp()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
index 994a9f6..2d69d89 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -188,7 +188,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeZeroLengthArrayAsNull()
       throws Exception
   {
@@ -204,7 +204,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecodeExtendedZeroLengthArrayAsNull()
       throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index e36fede..5b71eac 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright  2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -93,7 +93,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -108,7 +108,7 @@
    * protocol.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void binaryAttributeAddV3() throws Exception
   {
     //Add a binary attribute both with or without the binary option.
@@ -161,7 +161,7 @@
    * transfer option using a V3 protocol.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void nonBinaryAttributeAddV3() throws Exception
   {
     String filePath = TestCaseUtils.createTempFile(
@@ -236,7 +236,7 @@
    * V2 protocol.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void binaryOptionUsingV2() throws Exception
   {
     //Construct a V2 connection.
@@ -424,7 +424,7 @@
    * protocol.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void binaryModifyV3() throws Exception
   {
     String filePath = TestCaseUtils.createTempFile(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 9f1dd46..f1ec59e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.protocols.ldap ;
 
@@ -57,7 +57,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -73,7 +73,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectBindRequest()
          throws Exception
   {
@@ -122,7 +122,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectExtendedRequest()
          throws Exception
   {
@@ -165,7 +165,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectAddControls()
          throws Exception
   {
@@ -217,7 +217,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectBindControls()
          throws Exception
   {
@@ -255,7 +255,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectCompareControls()
          throws Exception
   {
@@ -305,7 +305,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectDeleteControls()
          throws Exception
   {
@@ -354,7 +354,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectModifyControls()
          throws Exception
   {
@@ -407,7 +407,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectModifyDNControls()
          throws Exception
   {
@@ -457,7 +457,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRejectSearchControls()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
index 2886ddd..9599c00 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -40,13 +40,13 @@
 
   static int id=56;
 
-  @Test ()
+  @Test
   public void testAbandonRequestToString() throws Exception
   {
     toString(new AbandonRequestProtocolOp(id));
   }
 
-  @Test()
+  @Test
   public void testAbandonRequestEncodeDecode() throws Exception {
     ByteStringBuilder builder = new ByteStringBuilder();
     ASN1Writer writer = ASN1.getWriter(builder);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index fe5c625..b1897bc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -45,7 +45,7 @@
     private static String newDn="cn=new dn, dc=example,dc=com";
     private static String creds="some creds";
 
-  @Test()
+  @Test
   public void testBindRequestEncodeDecode() throws Exception {
     ByteStringBuilder simpleBuilder = new ByteStringBuilder();
     ASN1Writer simpleWriter = ASN1.getWriter(simpleBuilder);
@@ -97,7 +97,7 @@
     assertTrue(saslOpCreds.equals(saslCreds));
   }
 
-  @Test ()
+  @Test
   public void testBindRequestToString() throws Exception
   {
     ByteString bindDn=ByteString.valueOf(dn);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
index c2a7646..9802b43 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
@@ -68,7 +68,7 @@
     }
 
 
-    @Test ()
+    @Test
     public void testBindRequestToString() throws Exception
     {
         List<String> referralURLs=new ArrayList<String>();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index 1e747a5..f6a45d3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.protocols.ldap;
 
@@ -73,7 +73,7 @@
    *
    * @throws Exception if the handler cannot be instantiated.
    */
-  @Test()
+  @Test
   public void testLDAPConnectionHandler() throws Exception {
     Entry LDAPHandlerEntry=null;
 
@@ -212,7 +212,7 @@
    * it is acceptable and applied.
    * @throws Exception if handler cannot be instantiated.
    */
-  @Test()
+  @Test
   public void testGoodLDAPConnectionHandlerConfiguration() throws Exception
   {
     Entry GoodHandlerEntry=TestCaseUtils.makeEntry(
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
index d3ac954..b7f4cd9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.server.protocols.ldap;
@@ -43,7 +43,7 @@
 public class TestLDAPException extends LdapTestCase
 {
 
-  @Test()
+  @Test
   public void testLDAPException()
   {
     LocalizableMessageDescriptor.Arg1 msgDesc = ERR_ECN_INVALID_ELEMENT_TYPE;
@@ -53,7 +53,7 @@
     assertTrue(StaticUtils.hasDescriptor(ex.getMessageObject(), msgDesc));
   }
 
-  @Test()
+  @Test
   public void testLDAPExceptionThrowable()
   {
     LocalizableMessageDescriptor.Arg1 msgID = ERR_ECN_INVALID_ELEMENT_TYPE;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index bd97c90..c69e882 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -77,7 +77,7 @@
                                        attributes);
   }
 
-  @Test ()
+  @Test
   public void testSearchRequestToString() throws Exception
   {
     SearchRequestProtocolOp protocolOp = buildSearchRequestProtocolOp();
@@ -86,7 +86,7 @@
     protocolOp.toString(sb, 1);
   }
 
-  @Test ()
+  @Test
   public void testSearchRequestEncodeDecode() throws Exception
   {
     ByteStringBuilder builder = new ByteStringBuilder();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
index 4924299..68ec646 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -36,7 +36,7 @@
 
 public class TestUnbindRequestProtocolOp  extends LdapTestCase {
 
-  @Test()
+  @Test
   public void testUnbindEncodeDecodeRequest() throws Exception {
       ByteStringBuilder builder = new ByteStringBuilder();
       ASN1Writer writer = ASN1.getWriter(builder);
@@ -48,7 +48,7 @@
       assertTrue(reqOp.getType() == req.getType());
   }
 
-  @Test ()
+  @Test
   public void testUnbindRequestToString() throws Exception
   {
       UnbindRequestProtocolOp r =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java
index ae36226..ad439c3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.replication;
 
@@ -111,7 +111,7 @@
    * Checks that changes done to the schema are pushed to the replicationServer
    * clients.
    */
-  @Test()
+  @Test
   public void pushSchemaChange() throws Exception
   {
     logger.error(LocalizableMessage.raw("Starting replication test : pushSchemaChange "));
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 5449e57..f923de2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -103,7 +103,7 @@
   /**
    * Check the basic comparator on the HistoricalCsnOrderingMatchingRule
    */
-  @Test()
+  @Test
   public void basicRuleTest() throws Exception
   {
     // Creates a rule
@@ -134,7 +134,7 @@
    * a replication server and can  re-build operations from the historical
    * informations.
    */
-  @Test()
+  @Test
   public void buildAndPublishMissingChangesOneEntryTest() throws Exception
   {
     final int serverId = 123;
@@ -234,7 +234,7 @@
    * a replication server and can  re-build operations from the historical
    * informations.
    */
-  @Test()
+  @Test
   public void buildAndPublishMissingChangesSeveralEntriesTest() throws Exception
   {
     final DN baseDN = DN.valueOf(TEST_ROOT_DN_STRING);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java
index a6fa29a..498769b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -343,7 +343,7 @@
    * Test that historical information is correctly added when performing ADD,
    * MOD and MODDN operations.
    */
-  @Test()
+  @Test
   public void historicalAdd() throws Exception
   {
     final DN dn1 = DN.valueOf("cn=testHistoricalAdd,o=test");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
index 356c669..ada8e6e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -54,7 +54,7 @@
    *
    * @throws Exception If an unexpected error occurred.
    */
-  @Test()
+  @Test
   public void noUpdateIsolationPolicyTest() throws Exception
   {
     LDAPReplicationDomain domain = null;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
index 7f769c0..8f24569 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -78,7 +78,7 @@
    * Test that conflict between a modify-replace and modify-add for
    * multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void replaceAndAdd() throws Exception
   {
     Entry entry = initializeEntry();
@@ -122,7 +122,7 @@
    * Test that conflict between a modify-replace and modify-add for
    * single-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void replaceAndAddSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -166,7 +166,7 @@
    * by doing first a replace with null, then add at at previous time
    * then check that the add was ignored
    */
-  @Test()
+  @Test
   public void replaceWithNull() throws Exception
   {
     Entry entry = initializeEntry();
@@ -211,7 +211,7 @@
    * Test that conflict between modify-add and modify-replace for
    * multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void addAndReplace() throws Exception
   {
     Entry entry = initializeEntry();
@@ -260,7 +260,7 @@
    * Test that conflict between modify-add and modify-replace for
    * single-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void addAndReplaceSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -301,7 +301,7 @@
    * Test that conflict between a modify-delete-attribute and modify-add
    * for multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void deleteAndAdd() throws Exception
   {
     Entry entry = initializeEntry();
@@ -348,7 +348,7 @@
    * add attribute-values from 2 different servers are handled correctly.
    * This test was created to reproduce issue 3392.
    */
-  @Test()
+  @Test
   public void delValueAndAddValue() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -401,7 +401,7 @@
    * are handled correctly.
    * This test was created to reproduce and fix issue 3397.
    */
-  @Test()
+  @Test
   public void delValueAndDelValue() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -453,7 +453,7 @@
    * value on a single valued attribute works correctly.
    * This test was created to reproduce and fix issue 3399.
    */
-  @Test()
+  @Test
   public void delAttributeAndDelValueSingle() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -486,7 +486,7 @@
    * value on a single valued attribute works correctly.
    * This test was created to reproduce and fix issue 3399.
    */
-  @Test()
+  @Test
   public void delValueAndDelAttributeSingle() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -520,7 +520,7 @@
    * and replayed in the non-natural order are handled correctly.
    * This test was created to reproduce issue 3392.
    */
-  @Test()
+  @Test
   public void delValueAndAddValueDisordered() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -574,7 +574,7 @@
    * Test that conflict between a modify-delete-attribute and modify-add
    * for multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void deleteAndAddSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -624,7 +624,7 @@
    * Test that conflict between a modify-delete-attribute and modify-add
    * for multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void deleteAndReplace() throws Exception
   {
     Entry entry = initializeEntry();
@@ -650,7 +650,7 @@
    * with some attribute values is resolved correctly.
    * This test has been created to reproduce Issue 3397.
    */
-  @Test()
+  @Test
   public void replaceAndDelete() throws Exception
   {
     // create an entry to use with conflicts tests.
@@ -715,7 +715,7 @@
    * disorderly.
    * This test has been created to reproduce Issue 3397.
    */
-  @Test()
+  @Test
   public void replaceAndDeleteDisorder() throws Exception
   {
     AttributeType descriptionAttrType =
@@ -797,7 +797,7 @@
    * Test that conflict between a modify-delete-attribute and modify-add
    * for multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void deleteAndReplaceSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -829,7 +829,7 @@
    * Test that conflict between a modify-add and modify-add for
    * multi-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void addAndAdd() throws Exception
   {
     Entry entry = initializeEntry();
@@ -882,7 +882,7 @@
    *  This is not a conflict in the strict definition but does exert
    *  the conflict resolution code.
    */
-  @Test()
+  @Test
   public void delAndAddSameOp() throws Exception
   {
     Entry entry = initializeEntry();
@@ -927,7 +927,7 @@
    * This is not a conflict in the strict definition but does exert
    * the conflict resolution code.
    */
-  @Test()
+  @Test
   public void delAndReplaceSameOp() throws Exception
   {
     Entry entry = initializeEntry();
@@ -989,7 +989,7 @@
    * This is not a conflict in the strict definition but does exert
    *  the conflict resolution code.
    */
-  @Test()
+  @Test
   public void addAndDelSameOp() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1028,7 +1028,7 @@
    *  - second ADD done with value1 and value2
    * This test has been created to make sure that issue 3394 is fixed.
    */
-  @Test()
+  @Test
   public void addAndAddSameValues() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1087,7 +1087,7 @@
    * Test that conflict between a modify-add and modify-add for
    * single-valued attributes are handled correctly.
    */
-  @Test()
+  @Test
   public void addAndAddSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1134,7 +1134,7 @@
    * Test that conflict between add, delete and add on aingle valued attribute
    * are handled correctly.
    */
-  @Test()
+  @Test
   public void addDelAddSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1175,7 +1175,7 @@
    * a delete of the second value is done on another server.
    * The test checks that the first value wins and stays in the entry.
    */
-  @Test()
+  @Test
   public void addAddDelSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1452,7 +1452,7 @@
    * modify-add of a value followed by modify-delete of that value
    * is handled properly.
    */
-  @Test()
+  @Test
   public void addDeleteSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1480,7 +1480,7 @@
    * modify-add of a value followed by modify-delete of the attribute
    * is handled properly.
    */
-  @Test()
+  @Test
   public void addDeleteAttrSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1513,7 +1513,7 @@
    * that contains a modify-add of a value followed by modify-delete
    * of the same value is handled properly.
    */
-  @Test()
+  @Test
   public void replayAddDeleteSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1556,7 +1556,7 @@
    * Test we can del an existing value and add a new one, and then replay
    * a del of the same existing value and add of a different new one.
    */
-  @Test()
+  @Test
   public void replayDelAddDifferent() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1614,7 +1614,7 @@
    * Test we can del an existing value and add a new one, and then replay
    * a del of another existing value and add of the same one.
    */
-  @Test()
+  @Test
   public void replayDelAddSame() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1675,7 +1675,7 @@
    * that contains a modify-add of a value followed by modify-delete
    * of the attribute is handled properly.
    */
-  @Test()
+  @Test
   public void replayAddDeleteAttrSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1720,7 +1720,7 @@
    * modify-replace of a value followed by modify-delete of that value
    * is handled properly.
    */
-  @Test()
+  @Test
   public void replaceDeleteSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1754,7 +1754,7 @@
    * modify-replace of a value followed by modify-delete of the attribute
    * is handled properly.
    */
-  @Test()
+  @Test
   public void replaceDeleteAttrSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1787,7 +1787,7 @@
    * that contains a modify-replace of a value followed by modify-delete
    * of the same value is handled properly.
    */
-  @Test()
+  @Test
   public void replayReplaceDeleteSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1828,7 +1828,7 @@
    * that contains a modify-replace of a value followed by modify-delete
    * of the attribute is handled properly.
    */
-  @Test()
+  @Test
   public void replayReplaceDeleteAttrSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1870,7 +1870,7 @@
    * modify-replace of a value followed by modify-delete of that value,
    * followed by a modify-add of a new value is handled properly.
    */
-  @Test()
+  @Test
   public void replaceDeleteAddSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
@@ -1908,7 +1908,7 @@
    * modify-replace of a value followed by modify-delete of the attribute,
    * followed by a modify-add of a new value is handled properly.
    */
-  @Test()
+  @Test
   public void replaceDeleteAttrAddSameOpSingle() throws Exception
   {
     Entry entry = initializeEntry();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
index 60b71ab..18bbdc6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -34,7 +35,7 @@
 
 public class ReplicationRepairControlTest extends ReplicationTestCase
 {
-  @Test()
+  @Test
   public void testRepairControl()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index 5de4627..3111869 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.protocol;
 
@@ -762,7 +762,7 @@
    * Test that WindowMsg encoding and decoding works
    * by checking that : msg == new WindowMsg(msg.getBytes()).
    */
-  @Test()
+  @Test
   public void windowMsgTest() throws Exception
   {
     WindowMsg msg = new WindowMsg(123);
@@ -775,7 +775,7 @@
    * by checking that : new WindowProbeMsg(msg.getBytes()) does not throws
    * an exception.
    */
-  @Test()
+  @Test
   public void windowProbeMsgTest() throws Exception
   {
     WindowProbeMsg msg = new WindowProbeMsg();
@@ -980,7 +980,7 @@
   /**
    * Test MonitorMsg.
    */
-  @Test()
+  @Test
   public void monitorMsgTest() throws Exception
   {
     int sender = 2;
@@ -1061,7 +1061,7 @@
    * Test that EntryMsg encoding and decoding works
    * by checking that : msg == new EntryMessageTest(msg.getBytes()).
    */
-  @Test()
+  @Test
   public void entryMsgTest() throws Exception
   {
     String taskInitFromS2 = new String(
@@ -1086,7 +1086,7 @@
   /**
    * Test that InitializeRequestMsg encoding and decoding works
    */
-  @Test()
+  @Test
   public void initializeRequestMsgTest() throws Exception
   {
     int sender = 1;
@@ -1102,7 +1102,7 @@
   /**
    * Test that InitializeTargetMsg encoding and decoding works
    */
-  @Test()
+  @Test
   public void initializeTargetMsgTest() throws Exception
   {
     int senderID = 45678;
@@ -1130,7 +1130,7 @@
   /**
    * Test that DoneMsg encoding and decoding works
    */
-  @Test()
+  @Test
   public void doneMsgTest() throws Exception
   {
     DoneMsg msg = new DoneMsg(1, 2);
@@ -1142,7 +1142,7 @@
   /**
    * Test that ErrorMsg encoding and decoding works
    */
-  @Test()
+  @Test
   public void errorMsgTest() throws Exception
   {
     ErrorMsg msg = new ErrorMsg(1, 2, LocalizableMessage.raw("details"));
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
index 1118167..554a56f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.replication.server;
 
@@ -45,7 +45,7 @@
    * Tests the applyConfigurationChange method of the ReplicationServer
    * class.
    */
-  @Test()
+  @Test
   public void replServerApplyChangeTest() throws Exception
   {
     TestCaseUtils.startServer();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
index 2eabd59..64484b6 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014 ForgeRock AS
+ *      Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.replication.server.changelog.file;
 
@@ -73,7 +73,7 @@
     assertThat(record.getValue().getCSN()).isEqualTo(msg.getCSN());
   }
 
-  @Test()
+  @Test
   public void testAddAndReadRecords() throws Exception
   {
     ReplicationServer replicationServer = null;
@@ -111,7 +111,7 @@
     }
   }
 
-  @Test()
+  @Test
   public void testClear() throws Exception
   {
     ReplicationServer replicationServer = null;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
index 0ed96bf..565e3fe 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.schema;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -79,7 +79,7 @@
    * Test to verify an ADD of an entry containing international characters.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void addEntry() throws Exception
   {
     String filePath = TestCaseUtils.createTempFile(
@@ -260,7 +260,7 @@
    * Test to verify the Sort control works well with the Collation
    * Less-than-equal-to matching rule and French Locale.
    */
-  @Test()
+  @Test
   public void testSortControlLTERule() throws Exception
   {
     ArrayList<DN> expectedDNOrder = new ArrayList<DN>();
@@ -278,7 +278,7 @@
    * Test to verify the Sort control works with Collation equality
    * matching rule and Spanish locale.
    */
-  @Test()
+  @Test
   public void testSortControlEQRule() throws Exception
   {
     ArrayList<DN> expectedDNOrder = new ArrayList<DN>();
@@ -296,7 +296,7 @@
    * Test to verify the Sort control works with Collation greater
    * than matching rule and English locale in a descending order.
    */
-  @Test()
+  @Test
   public void testSortControlGTRule() throws Exception
   {
     ArrayList<DN> expectedDNOrder = new ArrayList<DN>();
@@ -315,7 +315,7 @@
    * Tests the Sort control with the VLV control using a collation equality
    * matching rule.
    */
-  @Test()
+  @Test
   public void testVLVSortControl() throws Exception
   {
     ArrayList<DN> expectedDNOrder = new ArrayList<DN>();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
index d65575f..dac80ce 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS.
+ *      Portions Copyright 2014-2015 ForgeRock AS.
  *
  */
 package org.opends.server.schema;
@@ -69,7 +69,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
          throws Exception
   {
@@ -82,7 +82,7 @@
    * Tests to ensure that all attribute syntaxes defined in the schema have
    * valid OIDs.
    */
-  @Test()
+  @Test
   public void testEnsureValidSyntaxOIDs()
   {
     TreeSet<String> invalidOIDs = new TreeSet<String>();
@@ -120,7 +120,7 @@
    * Tests to ensure that all matching rules defined in the schema have valid
    * OIDs.
    */
-  @Test()
+  @Test
   public void testEnsureValidMatchingRuleOIDs()
   {
     TreeSet<String> invalidOIDs = new TreeSet<String>();
@@ -160,7 +160,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEnsureValidAttributeTypeOIDs()
          throws Exception
   {
@@ -237,7 +237,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEnsureValidObjectClassOIDs()
          throws Exception
   {
@@ -313,7 +313,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testEnsureValidNameFormOIDs()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 164c7db..a8b151e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2010-2014 ForgeRock AS.
+ *      Portions Copyright 2010-2015 ForgeRock AS.
  */
 package org.opends.server.schema;
 
@@ -76,7 +76,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -117,7 +117,7 @@
   /**
    * Test to search using the less-than relative time matching rule for expired events.
    */
-  @Test()
+  @Test
   public void testRTLessThanExpiredEvents() throws Exception
   {
     try
@@ -142,7 +142,7 @@
   /**
    * Test to search using the less-than relative time matching rule for future events.
    */
-  @Test()
+  @Test
   public void testRTLessThanFutureEvents() throws Exception
   {
     try
@@ -167,7 +167,7 @@
   /**
    * Test to search using the greater-than relative time matching rule for expired events.
    */
-  @Test()
+  @Test
   public void testRTGreaterThanExpiredEvents() throws Exception
   {
     try
@@ -193,7 +193,7 @@
     /**
    * Test to search using the greater-than relative time matching rule for future events.
    */
-  @Test()
+  @Test
   public void testRTGreaterThanFutureEvents() throws Exception
   {
     try
@@ -221,7 +221,7 @@
     * Dates for this test are hardcoded to avoid test failures depending
     * on when the tests are launched.
     */
-  @Test()
+  @Test
   public void testPartialDateNTimeMatchingRuleUsingSearch() throws Exception
   {
     try
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
index 5c45d53..c1de20e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  *
  */
 package org.opends.server.schema;
@@ -121,7 +121,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCreateAndDecodeUTCTimeValue()
          throws Exception
   {
@@ -142,7 +142,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecode50to99()
          throws Exception
   {
@@ -167,7 +167,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDecode00to49()
          throws Exception
   {
@@ -192,7 +192,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCreate50to99()
          throws Exception
   {
@@ -217,7 +217,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCreate00to49()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index 47b3f93..63ad8a0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.tasks;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -88,7 +88,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddValidSchemaFile()
          throws Exception
   {
@@ -165,7 +165,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMultipleValidSchemaFiles()
          throws Exception
   {
@@ -287,7 +287,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMissingSchemaFileNames()
          throws Exception
   {
@@ -311,7 +311,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddMissingSchemaFile()
          throws Exception
   {
@@ -337,7 +337,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddEmptySchemaFile()
          throws Exception
   {
@@ -381,7 +381,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddInvalidSchemaFile()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java
index 606d97b..a8ca8bb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tasks;
 
@@ -54,7 +54,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -69,7 +69,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowedTask()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java
index 1ad018a..0e836cb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tasks;
 
@@ -60,7 +60,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -75,7 +75,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDisconnectWithNotification()
          throws Exception
   {
@@ -151,7 +151,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDisconnectWithoutNotification()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
index 911edf0..319dc58 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tasks;
 
@@ -57,7 +57,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -70,7 +70,7 @@
    * Make sure that no matter what, when these tests are done the server is no
    * longer in lockdown mode.
    */
-  @AfterClass()
+  @AfterClass
   public void disableLockdownMode()
   {
     DirectoryServer.setLockdownMode(false);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
index 2e833b9..fdfb825 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -65,7 +66,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -228,7 +229,7 @@
   /**
    * Tests the EncodePassword tool with the --listSchemes argument.
    */
-  @Test()
+  @Test
   public void testListSchemes()
   {
     String[] args =
@@ -246,7 +247,7 @@
    * Tests the EncodePassword tool with the --listSchemes and
    * --authPasswordSyntax arguments.
    */
-  @Test()
+  @Test
   public void testListAuthSchemes()
   {
     String[] args =
@@ -265,7 +266,7 @@
    * Tests the EncodePassword tool with the --clearPassword and --storageScheme
    * arguments.
    */
-  @Test()
+  @Test
   public void testEncodeClearPassword()
   {
     String[] args =
@@ -284,7 +285,7 @@
    * Tests the EncodePassword tool with the --clearPassword, --storageScheme,
    * and --authPasswordSyntax arguments.
    */
-  @Test()
+  @Test
   public void testEncodeClearAuthPassword()
   {
     String[] args =
@@ -304,7 +305,7 @@
    * Tests the EncodePassword tool with the --clearPasswordFile and
    * --storageScheme arguments.
    */
-  @Test()
+  @Test
   public void testEncodeClearPasswordFromFile()
   {
     String[] args =
@@ -323,7 +324,7 @@
    * Tests the EncodePassword tool with the --clearPasswordFile, --storageScheme,
    * and --authPasswordSyntax arguments.
    */
-  @Test()
+  @Test
   public void testEncodeClearAuthPasswordFromFile()
   {
     String[] args =
@@ -343,7 +344,7 @@
    * Tests the EncodePassword tool with the --clearPassword and --storageScheme
    * arguments using an invalid storage scheme.
    */
-  @Test()
+  @Test
   public void testEncodeClearPasswordWithInvalidScheme()
   {
     String[] args =
@@ -362,7 +363,7 @@
    * Tests the EncodePassword tool with the --clearPassword, --storageScheme,
    * and --authPasswordSyntax arguments using an invalid storage scheme.
    */
-  @Test()
+  @Test
   public void testEncodeClearPasswordWithInvalidAuthScheme()
   {
     String[] args =
@@ -382,7 +383,7 @@
    * Tests the EncodePassword tool with the --clearPasswordFile and
    * --storageScheme arguments using an a password file that doesn't exist.
    */
-  @Test()
+  @Test
   public void testEncodeClearPasswordFromMissingFile()
   {
     String[] args =
@@ -402,7 +403,7 @@
    * --storageScheme, and --authPasswordSyntax arguments using an a password
    * file that doesn't exist.
    */
-  @Test()
+  @Test
   public void testEncodeClearAuthPasswordFromMissingFile()
   {
     String[] args =
@@ -422,7 +423,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a valid matching encoded password.
    */
-  @Test()
+  @Test
   public void testCompareMatchingPasswordsNoScheme()
   {
     String[] args =
@@ -441,7 +442,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a valid matching encoded password.
    */
-  @Test()
+  @Test
   public void testCompareMatchingPasswordsWithScheme()
   {
     String[] args =
@@ -461,7 +462,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a valid matching encoded password.
    */
-  @Test()
+  @Test
   public void testCompareMatchingEncodedPasswordsFromFile()
   {
     String[] args =
@@ -480,7 +481,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a valid matching auth password.
    */
-  @Test()
+  @Test
   public void testCompareMatchingAuthPasswords()
   {
     String[] args =
@@ -500,7 +501,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a non-matching encoded password.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingPasswordsNoScheme()
   {
     String[] args =
@@ -519,7 +520,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a non-matching encoded password.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingPasswordsWithScheme()
   {
     String[] args =
@@ -539,7 +540,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a non-matching auth password.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingAuthPasswords()
   {
     String[] args =
@@ -560,7 +561,7 @@
    * with a valid matching encoded password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareMatchingPasswordsNoSchemeCompareResult()
   {
     String[] args =
@@ -582,7 +583,7 @@
    * with a valid matching encoded password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareMatchingPasswordsWithSchemeCompareResult()
   {
     String[] args =
@@ -605,7 +606,7 @@
    * with a valid matching auth password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareMatchingAuthPasswordsCompareResult()
   {
     String[] args =
@@ -628,7 +629,7 @@
    * with a non-matching encoded password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingPasswordsNoSchemeCompareResult()
   {
     String[] args =
@@ -650,7 +651,7 @@
    * with a non-matching encoded password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingPasswordsWithSchemeCompareResult()
   {
     String[] args =
@@ -673,7 +674,7 @@
    * with a non-matching auth password using the LDAP compare result as an
    * exit code.
    */
-  @Test()
+  @Test
   public void testCompareNonMatchingAuthPasswordsCompareResult()
   {
     String[] args =
@@ -695,7 +696,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with a malformed encoded auth password.
    */
-  @Test()
+  @Test
   public void testCompareInvalidEncodedAuthPassword()
   {
     String[] args =
@@ -715,7 +716,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with an encoded password that uses an unknown scheme.
    */
-  @Test()
+  @Test
   public void testCompareEncodedPasswordWithUnknownScheme()
   {
     String[] args =
@@ -734,7 +735,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with an encoded password that uses an unknown scheme.
    */
-  @Test()
+  @Test
   public void testCompareEncodedPasswordWithUnknownSeparateScheme()
   {
     String[] args =
@@ -754,7 +755,7 @@
    * Tests the EncodePassword tool by performing a comparison of clear-text
    * with an encoded auth password that uses an unknown scheme.
    */
-  @Test()
+  @Test
   public void testCompareEncodedAuthPasswordWithUnknownScheme()
   {
     String[] args =
@@ -773,7 +774,7 @@
   /**
    * Tests the EncodePassword tool with the help options.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index 7c60a1d..7178b74 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -146,7 +146,7 @@
    * Tests the <CODE>getSASLProperties</CODE> method with an unsupported
    * mechanism name.
    */
-  @Test()
+  @Test
   public void testGetSASLPropertiesInvlaid()
   {
     LinkedHashMap<String,LocalizableMessage> properties =
@@ -163,7 +163,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSimpleBindWithValidDNAndPWNoControls()
          throws Exception
   {
@@ -192,7 +192,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSimpleBindWithNullDNAndPWNoControls()
          throws Exception
   {
@@ -219,7 +219,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSimpleBindWithEmptyDNAndPWNoControls()
          throws Exception
   {
@@ -317,7 +317,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSimpleBindWithPasswordPolicyControl()
          throws Exception
   {
@@ -497,7 +497,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindAnonymous()
          throws Exception
   {
@@ -536,7 +536,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindAnonymousNoTrace()
          throws Exception
   {
@@ -666,7 +666,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindAnonymousWithPasswordPolicyControl()
          throws Exception
   {
@@ -770,7 +770,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindCRAMMD5()
          throws Exception
   {
@@ -1195,7 +1195,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindCRAMMD5WithPasswordPolicyControl()
          throws Exception
   {
@@ -1318,7 +1318,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindDigestMD5()
          throws Exception
   {
@@ -1372,7 +1372,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindDigestMD5WithAuthzID()
          throws Exception
   {
@@ -1678,7 +1678,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindDigestMD5ValidQoP()
          throws Exception
   {
@@ -2268,7 +2268,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindDigestMD5WithPasswordPolicyControl()
          throws Exception
   {
@@ -2392,7 +2392,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindExternal()
          throws Exception
   {
@@ -2520,7 +2520,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindExternalWithPasswordPolicy()
          throws Exception
   {
@@ -3217,7 +3217,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindPlain()
          throws Exception
   {
@@ -3649,7 +3649,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDoSASLBindPlainWithPasswordPolicy()
          throws Exception
   {
@@ -3700,7 +3700,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentityUnauthenticated()
          throws Exception
   {
@@ -3724,7 +3724,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentitySimpleAnonymous()
          throws Exception
   {
@@ -3753,7 +3753,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentitySimpleRootUser()
          throws Exception
   {
@@ -3783,7 +3783,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentitySimpleTestUser()
          throws Exception
   {
@@ -3827,7 +3827,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentitySASLAnonymous()
          throws Exception
   {
@@ -3868,7 +3868,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentityCRAMMD5()
          throws Exception
   {
@@ -3922,7 +3922,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentityDigestMD5()
          throws Exception
   {
@@ -3977,7 +3977,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentityExternal()
          throws Exception
   {
@@ -4034,7 +4034,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequestAuthorizationIdentityPlain()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
index dcce0fa..06dc125 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.tools;
 
@@ -391,7 +391,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleLDAPv2Compare()
          throws Exception
   {
@@ -435,7 +435,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleLDAPv3CompareTrue()
          throws Exception
   {
@@ -479,7 +479,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleLDAPv3CompareFalse()
          throws Exception
   {
@@ -688,7 +688,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLBlindTrust()
          throws Exception
   {
@@ -734,7 +734,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStore()
          throws Exception
   {
@@ -783,7 +783,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSBlindTrust()
          throws Exception
   {
@@ -829,7 +829,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSTrustStore()
          throws Exception
   {
@@ -879,7 +879,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleCompareSSLTrustStoreSASLExternal()
          throws Exception
   {
@@ -944,7 +944,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleCompareSSLTrustStoreSASLExternalValidClientCert()
          throws Exception
   {
@@ -1011,7 +1011,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleCompareSSLTrustStoreSASLExternalInvalidClientCert()
          throws Exception
   {
@@ -1059,7 +1059,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleCompareStartTLSTrustStoreSASLExternal()
          throws Exception
   {
@@ -1123,7 +1123,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCRAMMD5()
          throws Exception
   {
@@ -1182,7 +1182,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDigestMD5()
          throws Exception
   {
@@ -1244,7 +1244,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAIN()
          throws Exception
   {
@@ -1301,7 +1301,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareValidBase64Assertion()
          throws Exception
   {
@@ -1346,7 +1346,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareInvalidBase64Assertion()
          throws Exception
   {
@@ -1374,7 +1374,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareAssertionValueFromFile()
          throws Exception
   {
@@ -1425,7 +1425,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareAssertionValueFromNonExistentFile()
          throws Exception
   {
@@ -1452,7 +1452,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareLDAPAssertionControlTrue()
          throws Exception
   {
@@ -1499,7 +1499,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareLDAPAssertionControlNotTrue()
          throws Exception
   {
@@ -1528,7 +1528,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareDNsFromFile()
          throws Exception
   {
@@ -1565,7 +1565,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCompareDNsFromNonExistentFile()
          throws Exception
   {
@@ -1592,7 +1592,7 @@
   /**
    * Tests the LDAPCompare tool with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
index 5ffb01d..eca1876 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -60,7 +60,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServerAndCreatePasswordFiles()
          throws Exception
   {
@@ -319,7 +319,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleLDAPv2Delete()
          throws Exception
   {
@@ -346,7 +346,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testSimpleLDAPv3Delete()
          throws Exception
   {
@@ -373,7 +373,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteSSLBlindTrust()
          throws Exception
   {
@@ -401,7 +401,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteSSLTrustStore()
          throws Exception
   {
@@ -432,7 +432,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteStartTLSBlindTrust()
          throws Exception
   {
@@ -460,7 +460,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteStartTLSTrustStore()
          throws Exception
   {
@@ -491,7 +491,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeletePLAIN()
          throws Exception
   {
@@ -518,7 +518,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteNonExistent()
          throws Exception
   {
@@ -545,7 +545,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteMalformedDN()
          throws Exception
   {
@@ -573,7 +573,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteParentNoSubtreeDeleteControl()
          throws Exception
   {
@@ -612,7 +612,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteValidPasswordFile()
          throws Exception
   {
@@ -638,7 +638,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteInvalidPasswordFile()
          throws Exception
   {
@@ -665,7 +665,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteNonExistentPasswordFile()
          throws Exception
   {
@@ -692,7 +692,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteDNsFromFile()
          throws Exception
   {
@@ -740,7 +740,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSubtreeDelete()
          throws Exception
   {
@@ -779,7 +779,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testSubtreeDeleteAltName()
          throws Exception
   {
@@ -818,7 +818,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteClientSideNoOp()
          throws Exception
   {
@@ -845,7 +845,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteServerSideNoOp()
          throws Exception
   {
@@ -874,7 +874,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteServerSideNoOpAltName()
          throws Exception
   {
@@ -903,7 +903,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleRequestControls()
          throws Exception
   {
@@ -929,7 +929,7 @@
   /**
    * Tests the LDAPDelete tool with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java
index 010c34c..d841562 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServerAndCreatePasswordFiles()
          throws Exception
   {
@@ -353,7 +353,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPv2Modify()
          throws Exception
   {
@@ -380,7 +380,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPv3Modify()
          throws Exception
   {
@@ -407,7 +407,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLBlindTrust()
          throws Exception
   {
@@ -435,7 +435,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStore()
          throws Exception
   {
@@ -466,7 +466,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSBlindTrust()
          throws Exception
   {
@@ -494,7 +494,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSTrustStore()
          throws Exception
   {
@@ -526,7 +526,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStoreSASLExternal()
          throws Exception
   {
@@ -572,7 +572,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStoreSASLExternalValidClientCert()
          throws Exception
   {
@@ -619,7 +619,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStoreSASLExternalInvalidClientCert()
          throws Exception
   {
@@ -666,7 +666,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSTrustStoreSASLExternal()
          throws Exception
   {
@@ -711,7 +711,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCRAMMD5()
          throws Exception
   {
@@ -753,7 +753,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDigestMD5()
          throws Exception
   {
@@ -796,7 +796,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAIN()
          throws Exception
   {
@@ -823,7 +823,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyClientSideNoOp()
          throws Exception
   {
@@ -850,7 +850,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddClientSideNoOp()
          throws Exception
   {
@@ -884,7 +884,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteClientSideNoOp()
          throws Exception
   {
@@ -915,7 +915,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNClientSideNoOp()
          throws Exception
   {
@@ -948,7 +948,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPNoOp()
          throws Exception
   {
@@ -977,7 +977,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPNoOpAltName()
          throws Exception
   {
@@ -1005,7 +1005,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddLDAPNoOp()
          throws Exception
   {
@@ -1041,7 +1041,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddLDAPNoOpAltName()
          throws Exception
   {
@@ -1076,7 +1076,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteLDAPNoOp()
          throws Exception
   {
@@ -1109,7 +1109,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteLDAPNoOpAltName()
          throws Exception
   {
@@ -1141,7 +1141,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNLDAPNoOp()
          throws Exception
   {
@@ -1181,7 +1181,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNLDAPNoOpAltName()
          throws Exception
   {
@@ -1221,7 +1221,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPAssertionTrue()
          throws Exception
   {
@@ -1249,7 +1249,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPAssertionFalse()
          throws Exception
   {
@@ -1277,7 +1277,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteLDAPAssertionTrue()
          throws Exception
   {
@@ -1308,7 +1308,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNLDAPAssertionTrue()
          throws Exception
   {
@@ -1346,7 +1346,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPPreReadSingleAttribute()
          throws Exception
   {
@@ -1374,7 +1374,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPPreReadMultipleAttributes()
          throws Exception
   {
@@ -1402,7 +1402,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDeleteLDAPPreReadSingleAttribute()
          throws Exception
   {
@@ -1433,7 +1433,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNLDAPPreReadSingleAttribute()
          throws Exception
   {
@@ -1471,7 +1471,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPostReadSingleAttribute()
          throws Exception
   {
@@ -1499,7 +1499,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyLDAPPostReadMultipleAttributes()
          throws Exception
   {
@@ -1527,7 +1527,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddLDAPostReadSingleAttribute()
          throws Exception
   {
@@ -1562,7 +1562,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDNLDAPostReadSingleAttribute()
          throws Exception
   {
@@ -1599,7 +1599,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testServerSideModifyFailure()
          throws Exception
   {
@@ -1632,7 +1632,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddExplicitChangeType()
          throws Exception
   {
@@ -1665,7 +1665,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAddImplicitChangeType()
          throws Exception
   {
@@ -1698,7 +1698,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testModifyDN()
          throws Exception
   {
@@ -1736,7 +1736,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDelete()
          throws Exception
   {
@@ -1773,7 +1773,7 @@
    *
    * @throws  Exception  If an unexpectd problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleRequestControls()
          throws Exception
   {
@@ -1805,7 +1805,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedLDIF()
          throws Exception
   {
@@ -1865,7 +1865,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMalformedLDIFNoContinueOnError()
          throws Exception
   {
@@ -1899,7 +1899,7 @@
   /**
    * Tests the LDAPModify tool with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index d41e044..56a9a50 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -64,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServerAndCreatePasswordFiles()
          throws Exception
   {
@@ -359,7 +360,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSelfChangeCurrentPasswordNewPassword()
          throws Exception
   {
@@ -390,7 +391,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSelfChangeNoCurrentPasswordNewPassword()
          throws Exception
   {
@@ -420,7 +421,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSelfChangeCurrentPasswordNoNewPassword()
          throws Exception
   {
@@ -450,7 +451,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSelfChangeNoCurrentPasswordNoNewPassword()
          throws Exception
   {
@@ -479,7 +480,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuthenticatedSelfExplicitAuthzIDCurrentNew()
          throws Exception
   {
@@ -511,7 +512,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuthenticatedSelfImplicitAuthzIDCurrentNew()
          throws Exception
   {
@@ -544,7 +545,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuthenticatedSelfImplicitAuthzIDNoCurrentNew()
          throws Exception
   {
@@ -575,7 +576,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUnauthenticatedSelfChangeNewPassword()
          throws Exception
   {
@@ -605,7 +606,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUnauthenticatedSelfChangeNoNewPassword()
          throws Exception
   {
@@ -633,7 +634,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAdminResetNewPassword()
          throws Exception
   {
@@ -663,7 +664,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAdminResetNoNewPassword()
          throws Exception
   {
@@ -692,7 +693,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLBlindTrust()
          throws Exception
   {
@@ -723,7 +724,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSSLTrustStore()
          throws Exception
   {
@@ -758,7 +759,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSBlindTrust()
          throws Exception
   {
@@ -790,7 +791,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testStartTLSTrustStore()
          throws Exception
   {
@@ -825,7 +826,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testBindAndNewPasswordsFromFile()
          throws Exception
   {
@@ -856,7 +857,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testCurrentAndNewPasswordsFromFile()
          throws Exception
   {
@@ -886,7 +887,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testResetWithInvalidAuthzDN()
          throws Exception
   {
@@ -915,7 +916,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testResetOnNonExistentUser()
          throws Exception
   {
@@ -945,7 +946,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testResetOnDisabledUser()
          throws Exception
   {
@@ -988,7 +989,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUnsupportedCriticalControl()
          throws Exception
   {
@@ -1020,7 +1021,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPNoOpExplicitOID()
          throws Exception
   {
@@ -1052,7 +1053,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPNoOpImplicitOID()
          throws Exception
   {
@@ -1084,7 +1085,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testLDAPMultipleControls()
          throws Exception
   {
@@ -1114,7 +1115,7 @@
   /**
    * Tests the LDAPModify tool with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
index 6f8f323..a7f5b49 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.tools;
 
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -99,7 +99,7 @@
    * Tests the LDIFDiff tool with an argument that will simply cause it to
    * display usage information.
    */
-  @Test()
+  @Test
   public void testUsage()
   {
     String[] args = { "--help" };
@@ -117,7 +117,7 @@
   /**
    * Tests the LDIFDiff tool with an invalid set of arguments.
    */
-  @Test()
+  @Test
   public void testInvalidArguments()
   {
     String[] args =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java
index 6a28df8..50946d5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.server.tools;
@@ -104,7 +105,7 @@
    *
    * @throws Exception The objectclass attribute is not returned.
    */
- @Test()
+ @Test
   public void testLDIFSearchStarOps() throws Exception {
     String[] args =
     {
@@ -130,7 +131,7 @@
    *
    * @throws Exception  The objectclass attribute is returned.
    */
- @Test()
+ @Test
   public void testLDIFSearchOpsOnly() throws Exception {
     String[] args =
     {
@@ -157,7 +158,7 @@
    * @throws Exception  The objectclass attribute is returned or one of the
    * specified attributes is not returned.
    */
- @Test()
+ @Test
   public void testLDIFSearchOpsAttrs() throws Exception {
     String[] args =
     {
@@ -187,7 +188,7 @@
    * specified attributes is not returned.
    */
 
- @Test()
+ @Test
   public void testLDIFSearchAttrsOnly() throws Exception {
 
     String[] args =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
index 99f8a0f..106fafb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -56,7 +57,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -190,7 +191,7 @@
   /**
    * Tests the ListBackends tool with the no arguments.
    */
-  @Test()
+  @Test
   public void testNoArguments()
   {
     String[] args =
@@ -207,7 +208,7 @@
    * Tests the ListBackends tool with one instance of the --backendID argument
    * and a valid backend ID.
    */
-  @Test()
+  @Test
   public void testSingleBackendID()
   {
     String[] args =
@@ -225,7 +226,7 @@
    * Tests the ListBackends tool with multiple instances of the --backendID
    * argument valid backend IDs.
    */
-  @Test()
+  @Test
   public void testMultipleBackendIDs()
   {
     String[] args =
@@ -244,7 +245,7 @@
    * Tests the ListBackends tool with multiple instances of the --backendID
    * argument in which one is valid and one is not.
    */
-  @Test()
+  @Test
   public void testMultipleBackendIDsPartiallyValid()
   {
     String[] args =
@@ -263,7 +264,7 @@
    * Tests the ListBackends tool with multiple instances of the --backendID
    * argument in which all are invalid.
    */
-  @Test()
+  @Test
   public void testMultipleBackendIDsAllInvalid()
   {
     String[] args =
@@ -282,7 +283,7 @@
    * Tests the ListBackends tool with one instance of the --baseDN argument
    * and a valid DN that is a base DN.
    */
-  @Test()
+  @Test
   public void testSingleBaseDN()
   {
     String[] args =
@@ -300,7 +301,7 @@
    * Tests the ListBackends tool with one instance of the --baseDN argument
    * and a valid DN that is not a base DN but is directly below a valid base DN.
    */
-  @Test()
+  @Test
   public void testSingleBaseDNBelowActualBaseDN()
   {
     String[] args =
@@ -319,7 +320,7 @@
    * and a valid DN that is not a base DN but is two levels below a valid base
    * DN.
    */
-  @Test()
+  @Test
   public void testSingleBaseDNTwoLevelsBelowActualBaseDN()
   {
     String[] args =
@@ -337,7 +338,7 @@
    * Tests the ListBackends tool with one instance of the --baseDN argument
    * and a valid DN that is not associated with any backend in the server
    */
-  @Test()
+  @Test
   public void testSingleBaseDNNotBelowAnyBaseDN()
   {
     String[] args =
@@ -355,7 +356,7 @@
    * Tests the ListBackends tool with multiple instances of the "--baseDN"
    * argument with valid base DNs.
    */
-  @Test()
+  @Test
   public void testMultipleBaseDNs()
   {
     String[] args =
@@ -373,7 +374,7 @@
   /**
    * Tests the ListBackends tool with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
index 2ec58ad..345beea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -65,7 +65,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setup()
          throws Exception
   {
@@ -92,7 +92,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanup()
          throws Exception
   {
@@ -112,7 +112,7 @@
   /**
    * Tries to rebuild an index but the index doesn't exist in the base DN.
    */
-  @Test()
+  @Test
   public void testRebuildIndexOnNonExistentShouldFail()
   {
     final String[] args = {
@@ -126,7 +126,7 @@
   /**
    * Tries to rebuild a valid index.
    */
-  @Test()
+  @Test
   public void testRebuildIndexShouldSuccess()
   {
     final String[] args = {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
index e7a0a78..55c6876 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.tools;
 
@@ -100,7 +100,7 @@
   /**
    * Tests display help information.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDisplaysHelpUsage()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -121,7 +121,7 @@
   /**
    * Tests display help information.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDisplaysHelpUsage2()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -142,7 +142,7 @@
   /**
    * Tests display help information.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDisplaysHelpUsage3()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -163,7 +163,7 @@
   /**
    * Tests the upgrade tool with an invalid sub-command.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDoesntAllowWrongSubcommand()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -184,7 +184,7 @@
   /**
    * Tests the upgrade tool with an invalid sub-command.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDoesntAllowWrongSubcommand2()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -206,7 +206,7 @@
    * The upgrade tool disallows the force sub-command used with 'interactive
    * mode'.
    */
-  @Test()
+  @Test
   public void testUpgradeToolDoesntAllowInteractiveAndForce()
   {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -229,7 +229,7 @@
   /**
    * Upgrade tool allows use of force and no-prompt sub-commands.
    */
-  @Test()
+  @Test
   public void testUpgradeToolAllowsNonInteractiveAndForce() throws Exception
   {
     TestCaseUtils.startServer();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
index f1da839..daae8ec 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setup()
          throws Exception
   {
@@ -87,7 +87,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanup()
          throws Exception
   {
@@ -106,7 +106,7 @@
   /**
    * Tests the verify-index -b o=airius.com -i description
    */
-  @Test()
+  @Test
   public void testNoIndexOnDescription()
   {
     String[] args = {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
index 888ec4a..0c322c1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.tools.dsconfig;
 
@@ -58,7 +58,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void before()
          throws Exception
   {
@@ -83,7 +83,7 @@
    * Ensures ADS is removed.
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void afterClass()
          throws Exception
   {
@@ -92,7 +92,7 @@
   /**
    * Tests list-list-connection-handlers with a malformed bind DN.
    */
-  @Test()
+  @Test
   public void testMalformedBindDN()
   {
     String[] args =
@@ -113,7 +113,7 @@
   /**
    * Tests list-connection-handlers with a nonexistent bind DN.
    */
-  @Test()
+  @Test
   public void testNonExistentBindDN()
   {
     String[] args =
@@ -135,7 +135,7 @@
    *  --bindPassword and the --bindPasswordFile arguments can not be provided 
    *  together.
    */
-  @Test()
+  @Test
   public void testConflictualArgumentsPasswordAndFilePassword()
   {
     String[] args =
@@ -158,7 +158,7 @@
    *  Quiet mode and verbose arguments can not be provided 
    *  together.
    */
-  @Test()
+  @Test
   public void testConflictualArgumentsQuietAndVerbose()
   {
     String[] args =
@@ -180,7 +180,7 @@
   /**
    * Tests list-connection-handlers with an invalid password.
    */
-  @Test()
+  @Test
   public void testInvalidBindPassword()
   {
     String[] args =
@@ -201,7 +201,7 @@
   /**
    * Tests list-connection-handlers with an valid password.
    */
-  @Test()
+  @Test
   public void testValidBindPassword()
   {
     String[] args =
@@ -225,7 +225,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValidPasswordFromFile()
          throws Exception
   {
@@ -249,7 +249,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testInvalidPasswordFromFile()
          throws Exception
   {
@@ -271,7 +271,7 @@
   /**
    * Tests list-connection-handlers over SSL using a trust store.
    */
-  @Test()
+  @Test
   public void testListConnectionHandlersSSLTrustStore()
   {
     String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
@@ -296,7 +296,7 @@
   /**
    * Tests the dsconfig with the "--help" option.
    */
-  @Test()
+  @Test
   public void testHelp()
   {
     String[] args = { "--noPropertiesFile", "--help" };
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index f64107c..5c84a35 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -22,7 +22,7 @@
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
  *      Portions Copyright 2006 Brighton Consulting, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.tools.makeldif;
 
@@ -70,7 +70,7 @@
    * uninitialized variable when generating templates reports the
    * correct line.
    */
-  @Test()
+  @Test
   public void testParseTemplate() throws Exception
   {
     String[] lines =
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java
index be2dbb3..bdeaa5e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -49,7 +49,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -64,7 +64,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testInvalidDITContentRule()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java
index 6ebb5ea..9f69264 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -85,7 +85,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValidSingleStructuralClass()
          throws Exception
   {
@@ -109,7 +109,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValidSingleStructuralClassAndAuxiliaryClass()
          throws Exception
   {
@@ -134,7 +134,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testNoStructuralClass()
          throws Exception
   {
@@ -155,7 +155,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleStructuralClasses()
          throws Exception
   {
@@ -184,7 +184,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUndefinedStructuralObjectClass()
          throws Exception
   {
@@ -208,7 +208,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUndefinedAuxiliaryObjectClass()
          throws Exception
   {
@@ -233,7 +233,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMissingAttributeRequiredByStructuralClass()
          throws Exception
   {
@@ -277,7 +277,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMissingAttributeRequiredByAuxiliaryClass()
          throws Exception
   {
@@ -322,7 +322,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDisallowedAttributeType()
          throws Exception
   {
@@ -366,7 +366,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleValuesForMultiValuedAttribute()
          throws Exception
   {
@@ -390,7 +390,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleValuesForSingleValuedAttribute()
          throws Exception
   {
@@ -415,7 +415,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMultipleValuesForSingleValuedOperationalAttribute()
          throws Exception
   {
@@ -448,7 +448,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuxiliaryClassAllowedByDCR()
          throws Exception
   {
@@ -503,7 +503,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAuxiliaryClassNotAllowedByDCR()
          throws Exception
   {
@@ -556,7 +556,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowAttributeRequiredByDCR()
          throws Exception
   {
@@ -607,7 +607,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testRequireAttributeRequiredByDCR()
          throws Exception
   {
@@ -656,7 +656,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDontRequireAttributeRequiredByObsoleteDCR()
          throws Exception
   {
@@ -706,7 +706,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testAllowAttributeAllowedByDCR()
          throws Exception
   {
@@ -758,7 +758,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDontRequireAttributeAllowedByDCR()
          throws Exception
   {
@@ -808,7 +808,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDontAllowAttributeProhibitedByDCR()
          throws Exception
   {
@@ -857,7 +857,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSatisfiesSingleValuedNameForm()
          throws Exception
   {
@@ -907,7 +907,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testViolatesSingleValuedNameForm()
          throws Exception
   {
@@ -957,7 +957,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMVViolatesSingleValuedNameForm()
          throws Exception
   {
@@ -1007,7 +1007,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testViolatesSingleValuedObsoleteNameForm()
          throws Exception
   {
@@ -1060,7 +1060,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSatisfiesRequiredMultiValuedNameForm()
          throws Exception
   {
@@ -1114,7 +1114,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testViolatesRequiredMultiValuedNameForm()
          throws Exception
   {
@@ -1166,7 +1166,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSVSatisfiesOptionalMultiValuedNameForm()
          throws Exception
   {
@@ -1219,7 +1219,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMVSatisfiesOptionalMultiValuedNameForm()
          throws Exception
   {
@@ -1272,7 +1272,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testSVViolatesOptionalMultiValuedNameForm()
          throws Exception
   {
@@ -1322,7 +1322,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDITStructureRuleConstraints()
          throws Exception
   {
@@ -1426,7 +1426,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testInvalidSuperiorAttribute()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java
index 033da40..e73b72d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -43,7 +43,7 @@
   /**
    * Tests the first constructor, which takes int and String arguments.
    */
-  @Test()
+  @Test
   public void testConstructor1()
   {
     LocalizableMessage message = LocalizableMessage.raw("Test Constructor 1");
@@ -58,7 +58,7 @@
    * Tests the second constructor, which takes int, String, and Throwable
    * arguments.
    */
-  @Test()
+  @Test
   public void testConstructor2()
   {
     LocalizableMessage   message = LocalizableMessage.raw("Test Constructor 2");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
index 53a77fb..cfd681e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2007-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -118,7 +118,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
          throws Exception
   {
@@ -299,7 +299,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanUp() throws Exception
   {
     TestCaseUtils.dsconfig(
@@ -1447,7 +1447,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5AnonymousAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1478,7 +1478,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5SameAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1509,7 +1509,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5DifferentAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1540,7 +1540,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5AnonymousAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1571,7 +1571,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5SameAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1602,7 +1602,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5DifferentAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1633,7 +1633,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5AnonymousAuthzIDFailedDNColon()
          throws Exception
   {
@@ -1664,7 +1664,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5SameUnprivAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1695,7 +1695,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5DifferentAuthzIDFailedDNColon()
          throws Exception
   {
@@ -1726,7 +1726,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5AnonymousAuthzIDFailedUColon()
          throws Exception
   {
@@ -1757,7 +1757,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5SameUnprivAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1788,7 +1788,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDIGESTMD5DifferentAuthzIDFailedUColon()
          throws Exception
   {
@@ -1819,7 +1819,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINAnonymousAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1850,7 +1850,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINSameAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1881,7 +1881,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINDifferentAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -1912,7 +1912,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINAnonymousAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1943,7 +1943,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINSameAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -1974,7 +1974,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINDifferentAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -2005,7 +2005,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINAnonymousAuthzIDFailedDNColon()
          throws Exception
   {
@@ -2036,7 +2036,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINSameUnprivAuthzIDSuccessfulDNColon()
          throws Exception
   {
@@ -2067,7 +2067,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINDifferentAuthzIDFailedDNColon()
          throws Exception
   {
@@ -2098,7 +2098,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINAnonymousAuthzIDFailedUColon()
          throws Exception
   {
@@ -2129,7 +2129,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINSameUnprivAuthzIDSuccessfulUColon()
          throws Exception
   {
@@ -2160,7 +2160,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testPLAINDifferentAuthzIDFailedUColon()
          throws Exception
   {
@@ -2190,7 +2190,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testDisablePrivilege()
          throws Exception
   {
@@ -2237,7 +2237,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUpdateUserPrivileges()
          throws Exception
   {
@@ -2324,7 +2324,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testUpdateRootPrivileges() throws Exception
   {
     // Make sure that a root connection doesn't  have the proxied auth
@@ -2378,7 +2378,7 @@
    * the set of privileges that can be configured as default root privileges,
    * and that it also matches the set of privileges that can be disabled.
    */
-  @Test()
+  @Test
   public void testConfigurablePrivilegeSets()
   {
     Set<String> serverPrivNames = new HashSet<String>();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
index e5a2cbb..6f7a5a4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -276,7 +276,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasAttribute()
          throws Exception
   {
@@ -364,7 +364,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasUserAttribute()
          throws Exception
   {
@@ -410,7 +410,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testHasOperationalAttribute()
          throws Exception
   {
@@ -456,7 +456,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetAttribute()
          throws Exception
   {
@@ -711,7 +711,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetUserAttribute()
          throws Exception
   {
@@ -860,7 +860,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetOperationalAttribute()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
index 4db18ea..d628d32 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -59,7 +59,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
index 03bbe7a..a71cb21 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -62,7 +62,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -98,7 +98,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testGetters()
          throws Exception
   {
@@ -115,7 +115,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testValues()
          throws Exception
   {
@@ -142,7 +142,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @Test()
+  @Test
   public void testMatching()
          throws Exception
   {
@@ -165,7 +165,7 @@
   /**
    * Tests the {@code toString} method.
    */
-  @Test()
+  @Test
   public void testToString()
   {
     String vattrString = virtualAttribute.toString();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
index b9df79b..5dc9dfc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -102,7 +102,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void startServer()
          throws Exception
   {
@@ -267,7 +267,7 @@
    * Tests the certificate manager with a valid constructor using the JKS key
    * store type.
    */
-  @Test()
+  @Test
   public void testValidConstructorJKS()
   {
     if (! CERT_MANAGER_AVAILABLE)
@@ -284,7 +284,7 @@
    * Tests the certificate manager with a valid constructor using the PKCS12 key
    * store type.
    */
-  @Test()
+  @Test
   public void testValidConstructorPKCS12()
   {
     if (! CERT_MANAGER_AVAILABLE)
@@ -302,7 +302,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAliasInUseNull()
          throws Exception
   {
@@ -328,7 +328,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAliasInUseEmpty()
          throws Exception
   {
@@ -354,7 +354,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAliasInUseInvalidKeyStore()
          throws Exception
   {
@@ -389,7 +389,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAliasInUseJKS()
          throws Exception
   {
@@ -415,7 +415,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAliasInUsePKCS12()
          throws Exception
   {
@@ -442,7 +442,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificateAliasesJKS()
          throws Exception
   {
@@ -472,7 +472,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificateAliasesPKCS12()
          throws Exception
   {
@@ -501,7 +501,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificateNull()
          throws Exception
   {
@@ -527,7 +527,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificateEmpty()
          throws Exception
   {
@@ -553,7 +553,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificateJKS()
          throws Exception
   {
@@ -584,7 +584,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGetCertificatePKCS12()
          throws Exception
   {
@@ -614,7 +614,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateNullAlias()
          throws Exception
   {
@@ -641,7 +641,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateEmptyAlias()
          throws Exception
   {
@@ -668,7 +668,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateAliasInUse()
          throws Exception
   {
@@ -696,7 +696,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateNullSubject()
          throws Exception
   {
@@ -723,7 +723,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateEmptySubject()
          throws Exception
   {
@@ -750,7 +750,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateInvalidSubject()
          throws Exception
   {
@@ -782,7 +782,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateInvalidValidity()
          throws Exception
   {
@@ -809,7 +809,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testGenerateSelfSignedCertificateJKS()
          throws Exception
   {
@@ -868,7 +868,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateNullAlias()
          throws Exception
   {
@@ -897,7 +897,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateEmptyAlias()
          throws Exception
   {
@@ -926,7 +926,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateNullCertificateFile()
          throws Exception
   {
@@ -953,7 +953,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateMissingCertificateFile()
          throws Exception
   {
@@ -983,7 +983,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateFileNotFile()
          throws Exception
   {
@@ -1013,7 +1013,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddCertificateFileNotCertificate()
          throws Exception
   {
@@ -1048,7 +1048,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveCertificateNullAlias()
          throws Exception
   {
@@ -1074,7 +1074,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveCertificateEmptyAlias()
          throws Exception
   {
@@ -1101,7 +1101,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testRemoveCertificateNonexistentAlias()
          throws Exception
   {
@@ -1128,7 +1128,7 @@
    *
    * @throws  Exception  If a problem occurs.
    */
-  @Test()
+  @Test
   public void testAddAndRemoveCertificateJKS()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java
index ab53bb0..127228f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -52,7 +52,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
          throws Exception
   {
@@ -69,7 +69,7 @@
    *
    * @throws  Exception  If an unexpected problem occurs.
    */
-  @AfterClass()
+  @AfterClass
   public void cleanUp()
          throws Exception
   {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
index 619f9c2..7292a17 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -56,7 +57,7 @@
   /**
    * Ensure that the source root directories are initialized properly.
    */
-  @BeforeClass()
+  @BeforeClass
   public void setUp()
   {
     String rootDir = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
index d725941..29cb3bc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.util;
 
@@ -69,7 +69,7 @@
     /**
      * {@inheritDoc}
      */
-    @Override()
+    @Override
     public String toString()
     {
       return "MyChangeRecordEntry()";

--
Gitblit v1.10.0