From 93dc3520b26d74dadbdad265182d9beaa9145dc4 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Apr 2016 13:16:38 +0000
Subject: [PATCH] opendj-config: added @Override + Autorefactor'ed comments
---
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Condition.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DeleteSubCommandHandler.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/Tag.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java | 13
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/NOTCondition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ANDCondition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/UndefinedDefaultBehaviorProvider.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/InstantiableRelationDefinition.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyValueVisitor.java | 5
opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java | 9
opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java | 17
opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressMaskPropertyDefinition.java | 17
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java | 30
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java | 11
opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/DefaultManagedObject.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java | 6
opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java | 3
opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java | 13
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockConstraint.java | 18
opendj-config/src/main/java/org/forgerock/opendj/config/client/DriverBasedManagementContext.java | 10
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/HelpSubCommandHandler.java | 65 -
opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java | 6
opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java | 19
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/BooleanPropertyDefinition.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/TopCfgDefn.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java | 82 --
opendj-config/src/main/java/org/forgerock/opendj/config/AdminException.java | 10
opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java | 19
opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java | 25
opendj-config/src/main/java/org/forgerock/opendj/config/Constraint.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyOption.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java | 4
opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/DefinedDefaultBehaviorProvider.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java | 23
opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java | 13
opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/server/DelayedConfigAddListener.java | 4
opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java | 24
opendj-config/src/main/java/org/forgerock/opendj/config/DNPropertyDefinition.java | 21
opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java | 52 -
opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminSecurityException.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/DecodingException.java | 9
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java | 5
opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java | 12
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java | 30
opendj-config/src/main/java/org/forgerock/opendj/config/server/AbstractConfigListenerAdaptor.java | 9
opendj-config/src/main/java/org/forgerock/opendj/config/OptionalRelationDefinition.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java | 27
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java | 4
opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java | 9
opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java | 16
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/DefaultBehaviorProvider.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/SingletonRelationDefinition.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/AliasDefaultBehaviorProvider.java | 13
opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressPropertyDefinition.java | 17
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/AbsoluteInheritedDefaultBehaviorProvider.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java | 13
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigTestCase.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java | 9
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java | 10
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListenerAdaptor.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java | 12
opendj-config/src/main/java/org/forgerock/opendj/config/RelationOption.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java | 63 -
opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java | 78 -
opendj-config/src/main/java/org/forgerock/opendj/config/StringPropertyDefinition.java | 35
opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java | 14
opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java | 9
opendj-config/src/main/java/org/forgerock/opendj/config/Reference.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/ClassPropertyDefinition.java | 22
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java | 11
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/IsPresentCondition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ORCondition.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/package-info.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ArgumentExceptionFactory.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/DNBuilder.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CLIProfile.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProvider.java | 3
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java | 2
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java | 75 +-
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ListSubCommandHandler.java | 4
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigAddListenerAdaptor.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationClient.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/SetRelationDefinition.java | 16
opendj-config/src/main/java/org/forgerock/opendj/config/AdministratorAction.java | 12
opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java | 8
opendj-config/src/main/java/org/forgerock/opendj/config/Configuration.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java | 4
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java | 15
opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java | 35
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyEditorModification.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java | 22
opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminClientException.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagementContext.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/SizeUnit.java | 6
opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java | 10
opendj-config/src/main/java/org/forgerock/opendj/config/DurationUnit.java | 6
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java | 3
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListenerAdaptor.java | 5
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java | 103 +-
opendj-config/src/main/java/org/forgerock/opendj/config/OperationsException.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/server/DNBuilder.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 97 --
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/LDAPManagementContextFactory.java | 8
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java | 6
opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionVisitor.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java | 7
opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigException.java | 7
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java | 2
opendj-config/src/main/java/org/forgerock/opendj/config/AttributeTypePropertyDefinition.java | 18
opendj-config/src/main/java/org/forgerock/opendj/config/GenericConstraint.java | 14
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CreateSubCommandHandler.java | 12
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListenerAdaptor.java | 3
138 files changed, 550 insertions(+), 1,362 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java
index 62810ad..a78ba2d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java
@@ -12,8 +12,8 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.config;
import java.util.EnumSet;
@@ -21,14 +21,10 @@
import org.forgerock.util.Reject;
-/**
- * ACI property definition.
- */
+/** ACI property definition. */
public final class ACIPropertyDefinition extends PropertyDefinition<String> {
- /**
- * An interface for incrementally constructing ACI property definitions.
- */
+ /** An interface for incrementally constructing ACI property definitions. */
public static final class Builder extends AbstractBuilder<String, ACIPropertyDefinition> {
/** Private constructor. */
@@ -36,7 +32,6 @@
super(d, propertyName);
}
- /** {@inheritDoc} */
@Override
protected ACIPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options,
@@ -75,7 +70,6 @@
super(d, String.class, propertyName, options, adminAction, defaultBehavior);
}
- /** {@inheritDoc} */
@Override
public void validateValue(String value) {
Reject.ifNull(value);
@@ -83,7 +77,6 @@
// No additional validation required.
}
- /** {@inheritDoc} */
@Override
public String decodeValue(String value) {
Reject.ifNull(value);
@@ -101,19 +94,16 @@
throw PropertyException.illegalPropertyValueException(this, value);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitACI(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, String value, P p) {
return v.visitACI(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(String o1, String o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AbsoluteInheritedDefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AbsoluteInheritedDefaultBehaviorProvider.java
index 3dbb97f..bd16f3f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AbsoluteInheritedDefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AbsoluteInheritedDefaultBehaviorProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -53,7 +54,7 @@
this.propertyName = propertyName;
}
- /** {@inheritDoc} */
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitAbsoluteInherited(this, p);
}
@@ -90,7 +91,6 @@
return propertyName;
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
// Decode the path.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
index 14a3f0b..41d2e5c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -720,7 +720,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final String toString() {
StringBuilder builder = new StringBuilder();
@@ -920,10 +919,7 @@
apd.getRelationDefinition().getChildDefinition().reverseAggregationPropertyDefinitions.add(apd);
}
- /**
- * Recursively descend definition hierarchy to find the best match
- * definition.
- */
+ /** Recursively descend definition hierarchy to find the best match definition. */
private AbstractManagedObjectDefinition<? extends C, ? extends S> resolveManagedObjectDefinitionAux(
AbstractManagedObjectDefinition<? extends C, ? extends S> d, DefinitionResolver r) {
if (!r.matches(d)) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AdminException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AdminException.java
index 3271c63..f73d1bf 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AdminException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AdminException.java
@@ -12,22 +12,18 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.config;
import org.forgerock.i18n.LocalizableException;
import org.forgerock.i18n.LocalizableMessage;
-/**
- * Exceptions thrown when interacting with administration framework.
- */
+/** Exceptions thrown when interacting with administration framework. */
public abstract class AdminException extends Exception implements LocalizableException {
private final LocalizableMessage message;
- /**
- * Fake serialization ID.
- */
+ /** Fake serialization ID. */
private static final long serialVersionUID = 1L;
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AdministratorAction.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AdministratorAction.java
index 59d4746..83ba22d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AdministratorAction.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AdministratorAction.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -77,7 +78,6 @@
this.name = name;
}
- /** {@inheritDoc} */
@Override
public String toString() {
return name;
@@ -85,16 +85,10 @@
}
- /**
- * The managed object definition associated with this administrator
- * action.
- */
+ /** The managed object definition associated with this administrator action. */
private final AbstractManagedObjectDefinition<?, ?> definition;
- /**
- * The name of the property definition associated with this
- * administrator action.
- */
+ /** The name of the property definition associated with this administrator action. */
private final String propertyName;
/** The type of administration action. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
index d160e57..280d4fd 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
@@ -118,10 +118,7 @@
*/
private String rdName;
- /**
- * The condition which is used to determine if a referenced
- * managed object is enabled.
- */
+ /** The condition which is used to determine if a referenced managed object is enabled. */
private Condition targetIsEnabledCondition = Conditions.TRUE;
/**
@@ -189,7 +186,6 @@
this.targetNeedsEnablingCondition = condition;
}
- /** {@inheritDoc} */
@Override
protected AggregationPropertyDefinition<C, S> buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -210,9 +206,7 @@
}
- /**
- * A change listener which prevents the named component from being disabled.
- */
+ /** A change listener which prevents the named component from being disabled. */
private final class ReferentialIntegrityChangeListener implements ServerManagedObjectChangeListener<S> {
/**
@@ -230,7 +224,7 @@
this.message = message;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends S> mo) {
try {
if (targetIsEnabledCondition.evaluate(mo)) {
@@ -247,7 +241,7 @@
+ relationDefinition.getChildDefinition().getUserFriendlyName());
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(ServerManagedObject<? extends S> mo,
List<LocalizableMessage> unacceptableReasons) {
// Always prevent the referenced component from being
@@ -280,9 +274,7 @@
}
- /**
- * A delete listener which prevents the named component from being deleted.
- */
+ /** A delete listener which prevents the named component from being deleted. */
private final class ReferentialIntegrityDeleteListener implements ConfigurationDeleteListener<S> {
/** The DN of the referenced configuration entry. */
@@ -300,7 +292,7 @@
this.message = message;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationDelete(S configuration) {
// This should not happen - the
// isConfigurationDeleteAcceptable() call-back should have
@@ -316,7 +308,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationDeleteAcceptable(S configuration, List<LocalizableMessage> unacceptableReasons) {
if (configuration.dn().equals(dn)) {
// Always prevent deletion of the referenced component.
@@ -328,12 +320,9 @@
}
- /**
- * The server-side constraint handler implementation.
- */
+ /** The server-side constraint handler implementation. */
private class ServerHandler extends ServerConstraintHandler {
- /** {@inheritDoc} */
@Override
public boolean isUsable(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -370,7 +359,6 @@
return isUsable;
}
- /** {@inheritDoc} */
@Override
public void performPostAdd(ServerManagedObject<?> managedObject) throws ConfigException {
// First make sure existing listeners associated with this
@@ -426,7 +414,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void performPostDelete(ServerManagedObject<?> managedObject) throws ConfigException {
// Remove any registered delete and change listeners.
@@ -456,7 +443,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void performPostModify(ServerManagedObject<?> managedObject) throws ConfigException {
// Remove all the constraints associated with this managed
@@ -473,7 +459,6 @@
*/
private class SourceClientHandler extends ClientConstraintHandler {
- /** {@inheritDoc} */
@Override
public boolean isAddAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -516,7 +501,6 @@
return isAcceptable;
}
- /** {@inheritDoc} */
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -533,7 +517,6 @@
*/
private class TargetClientHandler extends ClientConstraintHandler {
- /** {@inheritDoc} */
@Override
public boolean isDeleteAcceptable(ManagementContext context, ManagedObjectPath<?, ?> path,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -554,7 +537,6 @@
return isAcceptable;
}
- /** {@inheritDoc} */
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -584,10 +566,7 @@
return isAcceptable;
}
- /**
- * Find all managed objects which reference the named managed
- * object using this property.
- */
+ /** Find all managed objects which reference the named managed object using this property. */
private <C1 extends ConfigurationClient> List<ManagedObject<? extends C1>> findReferences(
ManagementContext context, AbstractManagedObjectDefinition<C1, ?> mod, String name)
throws LdapException {
@@ -684,22 +663,13 @@
private static final Logger debugLogger = LoggerFactory.getLogger(AggregationPropertyDefinition.class);
- /**
- * The active server-side referential integrity change listeners
- * associated with this property.
- */
+ /** The active server-side referential integrity change listeners associated with this property. */
private final Map<DN, List<ReferentialIntegrityChangeListener>> changeListeners = new HashMap<>();
- /**
- * The active server-side referential integrity delete listeners
- * associated with this property.
- */
+ /** The active server-side referential integrity delete listeners associated with this property. */
private final Map<DN, List<ReferentialIntegrityDeleteListener>> deleteListeners = new HashMap<>();
- /**
- * The name of the managed object which is the parent of the
- * aggregated managed objects.
- */
+ /** The name of the managed object which is the parent of the aggregated managed objects. */
private ManagedObjectPath<?, ?> parentPath;
/**
@@ -714,19 +684,13 @@
*/
private final String rdName;
- /**
- * The relation in the parent managed object which contains the
- * aggregated managed objects.
- */
+ /** The relation in the parent managed object which contains the aggregated managed objects. */
private InstantiableRelationDefinition<C, S> relationDefinition;
/** The source constraint. */
private final Constraint sourceConstraint;
- /**
- * The condition which is used to determine if a referenced managed
- * object is enabled.
- */
+ /** The condition which is used to determine if a referenced managed object is enabled. */
private final Condition targetIsEnabledCondition;
/**
@@ -748,13 +712,13 @@
this.targetIsEnabledCondition = targetIsEnabledCondition;
this.sourceConstraint = new Constraint() {
- /** {@inheritDoc} */
+ @Override
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
ClientConstraintHandler handler = new SourceClientHandler();
return Collections.singleton(handler);
}
- /** {@inheritDoc} */
+ @Override
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
ServerConstraintHandler handler = new ServerHandler();
return Collections.singleton(handler);
@@ -762,19 +726,16 @@
};
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitAggregation(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, String value, P p) {
return v.visitAggregation(this, value, p);
}
- /** {@inheritDoc} */
@Override
public String decodeValue(String value) {
Reject.ifNull(value);
@@ -907,7 +868,6 @@
return targetNeedsEnablingCondition;
}
- /** {@inheritDoc} */
@Override
public String normalizeValue(String value) {
try {
@@ -918,7 +878,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
super.toString(builder);
@@ -936,7 +895,6 @@
builder.append(targetIsEnabledCondition);
}
- /** {@inheritDoc} */
@Override
public void validateValue(String value) {
try {
@@ -967,13 +925,13 @@
// for actions performed against referenced managed objects.
Constraint constraint = new Constraint() {
- /** {@inheritDoc} */
+ @Override
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
ClientConstraintHandler handler = new TargetClientHandler();
return Collections.singleton(handler);
}
- /** {@inheritDoc} */
+ @Override
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.emptyList();
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AliasDefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AliasDefaultBehaviorProvider.java
index 3797ab1..14cc35c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AliasDefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AliasDefaultBehaviorProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -32,16 +33,10 @@
*/
public final class AliasDefaultBehaviorProvider<T> extends DefaultBehaviorProvider<T> {
- /**
- * The managed object definition associated with this default
- * behavior.
- */
+ /** The managed object definition associated with this default behavior. */
private final AbstractManagedObjectDefinition<?, ?> definition;
- /**
- * The name of the property definition associated with this default
- * behavior.
- */
+ /** The name of the property definition associated with this default behavior. */
private final String propertyName;
/**
@@ -59,7 +54,7 @@
this.propertyName = propertyName;
}
- /** {@inheritDoc} */
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitAlias(this, p);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AttributeTypePropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AttributeTypePropertyDefinition.java
index 0c297bf..d790347 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AttributeTypePropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AttributeTypePropertyDefinition.java
@@ -12,8 +12,8 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.config;
import org.forgerock.util.Reject;
@@ -23,15 +23,10 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.Schema;
-/**
- * Attribute type property definition.
- */
+/** Attribute type property definition. */
public final class AttributeTypePropertyDefinition extends PropertyDefinition<AttributeType> {
- /**
- * An interface for incrementally constructing attribute type property
- * definitions.
- */
+ /** An interface for incrementally constructing attribute type property definitions. */
public static final class Builder extends AbstractBuilder<AttributeType, AttributeTypePropertyDefinition> {
/** Private constructor. */
@@ -39,7 +34,6 @@
super(d, propertyName);
}
- /** {@inheritDoc} */
@Override
protected AttributeTypePropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -69,25 +63,21 @@
super(d, AttributeType.class, propertyName, options, adminAction, defaultBehavior);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitAttributeType(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, AttributeType value, P p) {
return v.visitAttributeType(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(AttributeType o1, AttributeType o2) {
return o1.getNameOrOID().compareToIgnoreCase(o2.getNameOrOID());
}
- /** {@inheritDoc} */
@Override
public AttributeType decodeValue(String value) {
Reject.ifNull(value);
@@ -108,13 +98,11 @@
}
}
- /** {@inheritDoc} */
@Override
public String encodeValue(AttributeType value) {
return value.getNameOrOID();
}
- /** {@inheritDoc} */
@Override
public void validateValue(AttributeType value) {
Reject.ifNull(value);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/BooleanPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/BooleanPropertyDefinition.java
index 241ae9c..3b49368 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/BooleanPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/BooleanPropertyDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -22,9 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-/**
- * Boolean property definition.
- */
+/** Boolean property definition. */
public final class BooleanPropertyDefinition extends PropertyDefinition<Boolean> {
/**
@@ -39,9 +37,7 @@
VALUE_MAP.put("true", Boolean.TRUE);
}
- /**
- * An interface for incrementally constructing boolean property definitions.
- */
+ /** An interface for incrementally constructing boolean property definitions. */
public static final class Builder extends AbstractBuilder<Boolean, BooleanPropertyDefinition> {
/** Private constructor. */
@@ -49,7 +45,6 @@
super(d, propertyName);
}
- /** {@inheritDoc} */
@Override
protected BooleanPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -80,7 +75,6 @@
super(d, Boolean.class, propertyName, options, adminAction, defaultBehavior);
}
- /** {@inheritDoc} */
@Override
public void validateValue(Boolean value) {
Reject.ifNull(value);
@@ -88,7 +82,6 @@
// No additional validation required.
}
- /** {@inheritDoc} */
@Override
public Boolean decodeValue(String value) {
Reject.ifNull(value);
@@ -103,19 +96,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitBoolean(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, Boolean value, P p) {
return v.visitBoolean(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(Boolean o1, Boolean o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ClassPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ClassPropertyDefinition.java
index f67dea6..0dcc03e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ClassPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ClassPropertyDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013-2015 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -58,10 +58,7 @@
public final void addInstanceOf(String className) {
Reject.ifNull(className);
- /*
- * Do some basic checks to make sure the string representation is
- * valid.
- */
+ /* Do some basic checks to make sure the string representation is valid. */
String value = className.trim();
if (!value.matches(CLASS_RE)) {
throw new IllegalArgumentException("\"" + value + "\" is not a valid Java class name");
@@ -70,7 +67,6 @@
instanceOfInterfaces.add(value);
}
- /** {@inheritDoc} */
@Override
protected ClassPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d, String propertyName,
EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -115,19 +111,16 @@
this.instanceOfInterfaces = Collections.unmodifiableList(new LinkedList<String>(instanceOfInterfaces));
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitClass(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, String value, P p) {
return v.visitClass(this, value, p);
}
- /** {@inheritDoc} */
@Override
public String decodeValue(String value) {
Reject.ifNull(value);
@@ -182,7 +175,6 @@
return theClass.asSubclass(instanceOf);
}
- /** {@inheritDoc} */
@Override
public String normalizeValue(String value) {
Reject.ifNull(value);
@@ -190,7 +182,6 @@
return value.trim();
}
- /** {@inheritDoc} */
@Override
public void validateValue(String value) {
Reject.ifNull(value);
@@ -207,9 +198,7 @@
}
}
- /**
- * Do some basic checks to make sure the string representation is valid.
- */
+ /** Do some basic checks to make sure the string representation is valid. */
private void validateClassName(String className) {
String nvalue = className.trim();
if (!nvalue.matches(CLASS_RE)) {
@@ -217,10 +206,7 @@
}
}
- /**
- * Make sure that named class implements the interfaces named by this
- * definition.
- */
+ /** Make sure that named class implements the interfaces named by this definition. */
private Class<?> validateClassInterfaces(String className, boolean initialize) {
Class<?> theClass = loadClassForValidation(className, className, initialize);
for (String i : instanceOfInterfaces) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/Configuration.java b/opendj-config/src/main/java/org/forgerock/opendj/config/Configuration.java
index 1b0a0af..12ad34a 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/Configuration.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/Configuration.java
@@ -12,15 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
import org.forgerock.opendj.ldap.DN;
-/**
- * A common base interface for all server managed object configurations.
- */
+/** A common base interface for all server managed object configurations. */
public interface Configuration {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationClient.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationClient.java
index cc7c091..0eb4ac0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationClient.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationClient.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -22,9 +22,7 @@
import org.forgerock.opendj.config.client.OperationRejectedException;
import org.forgerock.opendj.ldap.LdapException;
-/**
- * A common base interface for all managed object configuration clients.
- */
+/** A common base interface for all managed object configuration clients. */
public interface ConfigurationClient {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
index dbdf54d..c7d592d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
@@ -74,9 +74,7 @@
*/
private static final class MyURLClassLoader extends URLClassLoader {
- /**
- * Create a class loader with the default parent class loader.
- */
+ /** Create a class loader with the default parent class loader. */
public MyURLClassLoader() {
super(new URL[0]);
}
@@ -131,9 +129,7 @@
/** Attribute name in jar's MANIFEST corresponding to the revision number. */
private static final String REVISION_NUMBER = "Revision-Number";
- /**
- * The attribute names for build information is name, version and revision number.
- */
+ /** The attribute names for build information is name, version and revision number. */
private static final String[] BUILD_INFORMATION_ATTRIBUTE_NAMES = new String[] {
Attributes.Name.EXTENSION_NAME.toString(),
Attributes.Name.IMPLEMENTATION_VERSION.toString(), REVISION_NUMBER };
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/Constraint.java b/opendj-config/src/main/java/org/forgerock/opendj/config/Constraint.java
index 9ee75cb..50eedc7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/Constraint.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/Constraint.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -44,9 +45,7 @@
*/
public abstract class Constraint {
- /**
- * Creates a new constraint.
- */
+ /** Creates a new constraint. */
protected Constraint() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DNPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DNPropertyDefinition.java
index 01adb12..908bb33 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DNPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DNPropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -22,24 +23,16 @@
import org.forgerock.opendj.ldap.DN;
-/**
- * DN property definition.
- */
+/** DN property definition. */
public final class DNPropertyDefinition extends PropertyDefinition<DN> {
- /**
- * Optional base DN which all valid values must be immediately
- * subordinate to.
- */
+ /** Optional base DN which all valid values must be immediately subordinate to. */
private final DN baseDN;
/** An interface for incrementally constructing DN property definitions. */
public static final class Builder extends AbstractBuilder<DN, DNPropertyDefinition> {
- /**
- * Optional base DN which all valid values must be immediately
- * subordinate to.
- */
+ /** Optional base DN which all valid values must be immediately subordinate to. */
private DN baseDN;
/** Private constructor. */
@@ -72,7 +65,6 @@
this.baseDN = baseDN;
}
- /** {@inheritDoc} */
@Override
protected DNPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d, String propertyName,
EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -114,7 +106,6 @@
return baseDN;
}
- /** {@inheritDoc} */
@Override
public void validateValue(DN value) {
Reject.ifNull(value);
@@ -132,7 +123,6 @@
}
}
- /** {@inheritDoc} */
@Override
public DN decodeValue(String value) {
Reject.ifNull(value);
@@ -146,19 +136,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitDN(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, DN value, P p) {
return v.visitDN(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(DN o1, DN o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DecodingException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DecodingException.java
index f4c31ad..0016d83 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DecodingException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DecodingException.java
@@ -12,20 +12,17 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
import org.forgerock.i18n.LocalizableMessage;
-/**
- * The requested managed object was found but it could not be decoded.
- */
+/** The requested managed object was found but it could not be decoded. */
public abstract class DecodingException extends OperationsException {
- /**
- * Fake serialization ID.
- */
+ /** Fake serialization ID. */
private static final long serialVersionUID = 1L;
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultBehaviorProvider.java
index b797014..d806154 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultBehaviorProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -42,9 +43,7 @@
*/
public abstract class DefaultBehaviorProvider<T> {
- /**
- * Creates a new default behavior provider.
- */
+ /** Creates a new default behavior provider. */
protected DefaultBehaviorProvider() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultManagedObject.java
index 54c249e..eceba31 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DefaultManagedObject.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -128,6 +128,7 @@
* If the property definition is not associated with this
* managed object's definition.
*/
+ @Override
public <T> SortedSet<T> getPropertyValues(PropertyDefinition<T> pd) {
// Validate the property definition.
definition.getPropertyDefinition(pd.getName());
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinedDefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinedDefaultBehaviorProvider.java
index 3fed62d..bc0429b 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinedDefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinedDefaultBehaviorProvider.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -50,7 +50,7 @@
this.values = Arrays.asList(values);
}
- /** {@inheritDoc} */
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitDefined(this, p);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java
index 28f3ffa..c132d4d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionDecodingException.java
@@ -21,15 +21,10 @@
import org.forgerock.i18n.LocalizableMessage;
-/**
- * The requested managed object was found but its type could not be determined.
- */
+/** The requested managed object was found but its type could not be determined. */
public class DefinitionDecodingException extends DecodingException {
- /**
- * An enumeration defining the reasons why the definition could not be
- * resolved.
- */
+ /** An enumeration defining the reasons why the definition could not be resolved. */
public static enum Reason {
/**
* The managed object could be found but its type resolved to an
@@ -51,9 +46,7 @@
}
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = 3459033551415663416L;
/** Create the message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
index 5560094..3f02709 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -70,10 +71,7 @@
*/
private final boolean allowUnlimited;
- /**
- * An interface for incrementally constructing duration property
- * definitions.
- */
+ /** An interface for incrementally constructing duration property definitions. */
public static final class Builder extends AbstractBuilder<Long, DurationPropertyDefinition> {
/** The base unit for this property definition. */
@@ -278,7 +276,6 @@
this.allowUnlimited = allowUnlimited;
}
- /** {@inheritDoc} */
@Override
protected DurationPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -365,7 +362,6 @@
return allowUnlimited;
}
- /** {@inheritDoc} */
@Override
public void validateValue(Long value) {
Reject.ifNull(value);
@@ -384,7 +380,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String encodeValue(Long value) {
Reject.ifNull(value);
@@ -402,7 +397,6 @@
return builder.toString();
}
- /** {@inheritDoc} */
@Override
public Long decodeValue(String value) {
Reject.ifNull(value);
@@ -436,19 +430,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitDuration(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, Long value, P p) {
return v.visitDuration(this, value, p);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
super.toString(builder);
@@ -475,7 +466,6 @@
builder.append(allowUnlimited);
}
- /** {@inheritDoc} */
@Override
public int compare(Long o1, Long o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationUnit.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationUnit.java
index 9e645b2..77cca31 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationUnit.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationUnit.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -21,9 +21,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * This enumeration defines various duration units.
- */
+/** This enumeration defines various duration units. */
public enum DurationUnit {
/** A day unit. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
index 9f45c39..70bfb2c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/EnumPropertyDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -66,7 +66,6 @@
this.enumClass = enumClass;
}
- /** {@inheritDoc} */
@Override
protected EnumPropertyDefinition<E> buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -119,19 +118,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitEnum(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, E value, P p) {
return v.visitEnum(this, value, p);
}
- /** {@inheritDoc} */
@Override
public E decodeValue(String value) {
Reject.ifNull(value);
@@ -187,7 +183,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String normalizeValue(E value) {
Reject.ifNull(value);
@@ -195,7 +190,6 @@
return value.toString().trim().toLowerCase();
}
- /** {@inheritDoc} */
@Override
public void validateValue(E value) {
Reject.ifNull(value);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/GenericConstraint.java b/opendj-config/src/main/java/org/forgerock/opendj/config/GenericConstraint.java
index 6250b01..9b14b11 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/GenericConstraint.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/GenericConstraint.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -37,9 +37,7 @@
*/
public class GenericConstraint extends Constraint {
- /**
- * The client-side constraint handler.
- */
+ /** The client-side constraint handler. */
private final class ClientHandler extends ClientConstraintHandler {
/** Private constructor. */
@@ -47,7 +45,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public boolean isAddAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -59,7 +56,6 @@
}
}
- /** {@inheritDoc} */
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -80,7 +76,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public boolean isUsable(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -124,12 +119,12 @@
this.condition = condition;
}
- /** {@inheritDoc} */
+ @Override
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
return Collections.singleton(clientHandler);
}
- /** {@inheritDoc} */
+ @Override
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.singleton(serverHandler);
}
@@ -156,7 +151,6 @@
return resource.getMessage(definition, property, locale);
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
condition.initialize(definition);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressMaskPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressMaskPropertyDefinition.java
index 1f443a0..79c405d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressMaskPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressMaskPropertyDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -23,15 +23,10 @@
import java.util.EnumSet;
-/**
- * IP address mask property definition.
- */
+/** IP address mask property definition. */
public final class IPAddressMaskPropertyDefinition extends PropertyDefinition<AddressMask> {
- /**
- * An interface for incrementally constructing IP address mask property
- * definitions.
- */
+ /** An interface for incrementally constructing IP address mask property definitions. */
public static final class Builder extends AbstractBuilder<AddressMask, IPAddressMaskPropertyDefinition> {
/** Private constructor. */
@@ -39,7 +34,6 @@
super(d, propertyName);
}
- /** {@inheritDoc} */
@Override
protected IPAddressMaskPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -70,7 +64,6 @@
super(d, AddressMask.class, propertyName, options, adminAction, defaultBehavior);
}
- /** {@inheritDoc} */
@Override
public void validateValue(AddressMask value) {
Reject.ifNull(value);
@@ -78,7 +71,6 @@
// No additional validation required.
}
- /** {@inheritDoc} */
@Override
public AddressMask decodeValue(String value) {
Reject.ifNull(value);
@@ -91,19 +83,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitIPAddressMask(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, AddressMask value, P p) {
return v.visitIPAddressMask(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(AddressMask o1, AddressMask o2) {
return o1.toString().compareTo(o2.toString());
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressPropertyDefinition.java
index e2d8fb2..823327c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/IPAddressPropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -22,15 +23,10 @@
import java.net.UnknownHostException;
import java.util.EnumSet;
-/**
- * IP address property definition.
- */
+/** IP address property definition. */
public final class IPAddressPropertyDefinition extends PropertyDefinition<InetAddress> {
- /**
- * An interface for incrementally constructing IP address property
- * definitions.
- */
+ /** An interface for incrementally constructing IP address property definitions. */
public static final class Builder extends AbstractBuilder<InetAddress, IPAddressPropertyDefinition> {
/** Private constructor. */
@@ -38,7 +34,6 @@
super(d, propertyName);
}
- /** {@inheritDoc} */
@Override
protected IPAddressPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -69,7 +64,6 @@
super(d, InetAddress.class, propertyName, options, adminAction, defaultBehavior);
}
- /** {@inheritDoc} */
@Override
public void validateValue(InetAddress value) {
Reject.ifNull(value);
@@ -77,7 +71,6 @@
// No additional validation required.
}
- /** {@inheritDoc} */
@Override
public InetAddress decodeValue(String value) {
Reject.ifNull(value);
@@ -90,7 +83,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String encodeValue(InetAddress value) {
// We should return the host name if it is available, or the IP
@@ -108,19 +100,16 @@
}
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitIPAddress(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, InetAddress value, P p) {
return v.visitIPAddress(this, value, p);
}
- /** {@inheritDoc} */
@Override
public int compare(InetAddress o1, InetAddress o2) {
return o1.getHostAddress().compareTo(o2.getHostAddress());
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/InstantiableRelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/InstantiableRelationDefinition.java
index 33a61f4..db54d8e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/InstantiableRelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/InstantiableRelationDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -61,10 +61,7 @@
/** The plural name of the relation. */
private final String pluralName;
- /**
- * The optional default managed objects associated with this
- * instantiable relation definition.
- */
+ /** The optional default managed objects associated with this instantiable relation definition. */
private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects =
new HashMap<>();
@@ -114,7 +111,6 @@
this.namingPropertyDefinition = namingPropertyDefinition;
}
- /** {@inheritDoc} */
@Override
protected InstantiableRelationDefinition<C, S> buildInstance(Common<C, S> common) {
return new InstantiableRelationDefinition<>(common, pluralName, namingPropertyDefinition,
@@ -129,10 +125,7 @@
/** The plural name of the relation. */
private final String pluralName;
- /**
- * The optional default managed objects associated with this
- * instantiable relation definition.
- */
+ /** The optional default managed objects associated with this instantiable relation definition. */
private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects;
/** Private constructor. */
@@ -145,7 +138,6 @@
this.defaultManagedObjects = defaultManagedObjects;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
return v.visitInstantiable(this, p);
@@ -226,7 +218,6 @@
return ManagedObjectDefinitionI18NResource.getInstance().getMessage(getParentDefinition(), property, locale);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
builder.append("name=");
@@ -237,7 +228,6 @@
builder.append(getChildDefinition().getName());
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
for (DefaultManagedObject<?, ?> dmo : defaultManagedObjects.values()) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
index 00daad0..192c8a6 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -48,9 +49,7 @@
*/
private final boolean allowUnlimited;
- /**
- * An interface for incrementally constructing integer property definitions.
- */
+ /** An interface for incrementally constructing integer property definitions. */
public static final class Builder extends AbstractBuilder<Integer, IntegerPropertyDefinition> {
/** The lower limit of the property value. */
@@ -120,7 +119,6 @@
this.allowUnlimited = allowUnlimited;
}
- /** {@inheritDoc} */
@Override
protected IntegerPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -216,7 +214,6 @@
return allowUnlimited;
}
- /** {@inheritDoc} */
@Override
public void validateValue(Integer value) {
Reject.ifNull(value);
@@ -234,7 +231,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String encodeValue(Integer value) {
Reject.ifNull(value);
@@ -247,7 +243,6 @@
return value.toString();
}
- /** {@inheritDoc} */
@Override
public Integer decodeValue(String value) {
Reject.ifNull(value);
@@ -272,19 +267,16 @@
return i;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitInteger(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, Integer value, P p) {
return v.visitInteger(this, value, p);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
super.toString(builder);
@@ -301,7 +293,6 @@
builder.append(allowUnlimited);
}
- /** {@inheritDoc} */
@Override
public int compare(Integer o1, Integer o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java
index f4d3f6b..ecd1154 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectAlreadyExistsException.java
@@ -24,14 +24,10 @@
*/
public final class ManagedObjectAlreadyExistsException extends OperationsException {
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = -2344653674171609366L;
- /**
- * Create a managed object already exists exception.
- */
+ /** Create a managed object already exists exception. */
public ManagedObjectAlreadyExistsException() {
super(ERR_MANAGED_OBJECT_ALREADY_EXISTS_EXCEPTION.get());
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java
index 13934a4..b9e1dc5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectNotFoundException.java
@@ -18,19 +18,13 @@
import static com.forgerock.opendj.ldap.config.ConfigMessages.*;
-/**
- * The requested managed object could not be located.
- */
+/** The requested managed object could not be located. */
public class ManagedObjectNotFoundException extends OperationsException {
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = -477551786551892978L;
- /**
- * Create a managed object not found exception.
- */
+ /** Create a managed object not found exception. */
public ManagedObjectNotFoundException() {
super(ERR_MANAGED_OBJECT_NOT_FOUND_EXCEPTION.get());
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
index dfc883b..18a1ce5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -102,9 +102,7 @@
*/
public final class ManagedObjectPath<C extends ConfigurationClient, S extends Configuration> {
- /**
- * A serialize which is used to generate the toDN representation.
- */
+ /** A serialize which is used to generate the toDN representation. */
private static final class DNSerializer implements ManagedObjectPathSerializer {
/** The current DN. */
@@ -119,7 +117,7 @@
this.profile = LDAPProfile.getInstance();
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
InstantiableRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d,
String name) {
@@ -132,7 +130,7 @@
dn = dn.child(new RDN(attrType, name));
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SetRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
// Add the RDN sequence representing the relation.
@@ -144,14 +142,14 @@
dn = dn.child(new RDN(attrType, d.getName()));
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
OptionalRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
// Add the RDN sequence representing the relation.
appendManagedObjectPathElement(r);
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SingletonRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
// Add the RDN sequence representing the relation.
@@ -170,9 +168,7 @@
}
}
- /**
- * Abstract path element.
- */
+ /** Abstract path element. */
private static abstract class Element<C extends ConfigurationClient, S extends Configuration> {
/** The type of managed object referenced by this element. */
@@ -224,9 +220,7 @@
public abstract void serialize(ManagedObjectPathSerializer serializer);
}
- /**
- * A path element representing an instantiable managed object.
- */
+ /** A path element representing an instantiable managed object. */
private static final class InstantiableElement<C extends ConfigurationClient, S extends Configuration> extends
Element<C, S> {
@@ -251,28 +245,23 @@
this.name = name;
}
- /** {@inheritDoc} */
@Override
public String getName() {
return name;
}
- /** {@inheritDoc} */
@Override
public InstantiableRelationDefinition<? super C, ? super S> getRelationDefinition() {
return r;
}
- /** {@inheritDoc} */
@Override
public void serialize(ManagedObjectPathSerializer serializer) {
serializer.appendManagedObjectPathElement(r, getManagedObjectDefinition(), name);
}
}
- /**
- * A path element representing an optional managed object.
- */
+ /** A path element representing an optional managed object. */
private static final class OptionalElement<C extends ConfigurationClient, S extends Configuration> extends
Element<C, S> {
@@ -292,22 +281,18 @@
this.r = r;
}
- /** {@inheritDoc} */
@Override
public OptionalRelationDefinition<? super C, ? super S> getRelationDefinition() {
return r;
}
- /** {@inheritDoc} */
@Override
public void serialize(ManagedObjectPathSerializer serializer) {
serializer.appendManagedObjectPathElement(r, getManagedObjectDefinition());
}
}
- /**
- * A path element representing an set managed object.
- */
+ /** A path element representing an set managed object. */
private static final class SetElement<C extends ConfigurationClient, S extends Configuration> extends
Element<C, S> {
@@ -326,22 +311,18 @@
this.r = r;
}
- /** {@inheritDoc} */
@Override
public SetRelationDefinition<? super C, ? super S> getRelationDefinition() {
return r;
}
- /** {@inheritDoc} */
@Override
public void serialize(ManagedObjectPathSerializer serializer) {
serializer.appendManagedObjectPathElement(r, getManagedObjectDefinition());
}
}
- /**
- * A path element representing a singleton managed object.
- */
+ /** A path element representing a singleton managed object. */
private static final class SingletonElement<C extends ConfigurationClient, S extends Configuration> extends
Element<C, S> {
@@ -361,22 +342,18 @@
this.r = r;
}
- /** {@inheritDoc} */
@Override
public SingletonRelationDefinition<? super C, ? super S> getRelationDefinition() {
return r;
}
- /** {@inheritDoc} */
@Override
public void serialize(ManagedObjectPathSerializer serializer) {
serializer.appendManagedObjectPathElement(r, getManagedObjectDefinition());
}
}
- /**
- * A serialize which is used to generate the toString representation.
- */
+ /** A serialize which is used to generate the toString representation. */
private static final class StringSerializer implements ManagedObjectPathSerializer {
/** Serialize to this string builder. */
@@ -387,7 +364,7 @@
this.builder = builder;
}
- /** {@inheritDoc} */
+ @Override
public <M extends ConfigurationClient, N extends Configuration> void appendManagedObjectPathElement(
InstantiableRelationDefinition<? super M, ? super N> r, AbstractManagedObjectDefinition<M, N> d,
String name) {
@@ -398,19 +375,19 @@
builder.append(name.replace("/", "//"));
}
- /** {@inheritDoc} */
+ @Override
public <M extends ConfigurationClient, N extends Configuration> void appendManagedObjectPathElement(
OptionalRelationDefinition<? super M, ? super N> r, AbstractManagedObjectDefinition<M, N> d) {
serializeElement(r, d);
}
- /** {@inheritDoc} */
+ @Override
public <M extends ConfigurationClient, N extends Configuration> void appendManagedObjectPathElement(
SingletonRelationDefinition<? super M, ? super N> r, AbstractManagedObjectDefinition<M, N> d) {
serializeElement(r, d);
}
- /** {@inheritDoc} */
+ @Override
public <M extends ConfigurationClient, N extends Configuration> void appendManagedObjectPathElement(
SetRelationDefinition<? super M, ? super N> r, AbstractManagedObjectDefinition<M, N> d) {
serializeElement(r, d);
@@ -543,10 +520,7 @@
return create(elements, lastElement);
}
- /**
- * Factory method required in order to allow generic wild-card
- * construction of new paths.
- */
+ /** Factory method required in order to allow generic wild-card construction of new paths. */
private static <C extends ConfigurationClient, S extends Configuration> ManagedObjectPath<C, S> create(
LinkedList<Element<?, ?>> elements, Element<C, S> lastElement) {
return new ManagedObjectPath<>(elements, lastElement.getRelationDefinition(),
@@ -900,7 +874,6 @@
return child(r, r.getChildDefinition());
}
- /** {@inheritDoc} */
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -956,7 +929,6 @@
return r;
}
- /** {@inheritDoc} */
@Override
public int hashCode() {
return toString().hashCode();
@@ -1106,7 +1078,6 @@
return serializer.toDN();
}
- /** {@inheritDoc} */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/OperationsException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/OperationsException.java
index 6584983..2e3a984 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/OperationsException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/OperationsException.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -24,9 +25,7 @@
*/
public abstract class OperationsException extends AdminException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 6329910102360262187L;
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/OptionalRelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/OptionalRelationDefinition.java
index 9df62bc..300609c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/OptionalRelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/OptionalRelationDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -46,10 +46,7 @@
public static final class Builder<C extends ConfigurationClient, S extends Configuration> extends
AbstractBuilder<C, S, OptionalRelationDefinition<C, S>> {
- /**
- * The optional default managed object associated with this
- * optional relation.
- */
+ /** The optional default managed object associated with this optional relation. */
private DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
/**
@@ -81,17 +78,13 @@
this.defaultManagedObject = defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
protected OptionalRelationDefinition<C, S> buildInstance(Common<C, S> common) {
return new OptionalRelationDefinition<>(common, defaultManagedObject);
}
}
- /**
- * The optional default managed object associated with this
- * optional relation.
- */
+ /** The optional default managed object associated with this optional relation. */
private final DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
/** Private constructor. */
@@ -101,7 +94,6 @@
this.defaultManagedObject = defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
return v.visitOptional(this, p);
@@ -119,7 +111,6 @@
return defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
builder.append("name=");
@@ -130,7 +121,6 @@
builder.append(getChildDefinition().getName());
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
if (defaultManagedObject != null) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
index ce1a2e2..a16c3883f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -271,6 +271,7 @@
* @return a negative integer, zero, or a positive integer as the first
* argument is less than, equal to, or greater than the second.
*/
+ @Override
public int compare(T o1, T o2) {
Reject.ifNull(o1);
Reject.ifNull(o2);
@@ -296,6 +297,7 @@
* property definition is less than, equal to, or greater than the
* specified property definition.
*/
+ @Override
public final int compareTo(PropertyDefinition<?> o) {
int rc = propertyName.compareTo(o.propertyName);
if (rc == 0) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
index 56ab0e0..9c73bbd 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -25,21 +25,13 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.util.Utils;
-/**
- * A property definition visitor which can be used to generate syntax usage
- * information.
- */
+/** A property definition visitor which can be used to generate syntax usage information. */
public final class PropertyDefinitionUsageBuilder {
- /**
- * Underlying implementation.
- */
+ /** Underlying implementation. */
private static final class MyPropertyDefinitionVisitor extends
PropertyDefinitionVisitor<LocalizableMessage, Void> {
- /**
- * Flag indicating whether detailed syntax information will be
- * generated.
- */
+ /** Flag indicating whether detailed syntax information will be generated. */
private final boolean isDetailed;
/** The formatter to use for numeric values. */
@@ -54,26 +46,22 @@
this.numberFormat.setMaximumFractionDigits(2);
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> LocalizableMessage visitAggregation(
AggregationPropertyDefinition<C, S> d, Void p) {
return LocalizableMessage.raw("NAME");
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitAttributeType(AttributeTypePropertyDefinition d, Void p) {
return LocalizableMessage.raw("OID");
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitACI(ACIPropertyDefinition d, Void p) {
return LocalizableMessage.raw("ACI");
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitBoolean(BooleanPropertyDefinition d, Void p) {
if (isDetailed) {
@@ -83,7 +71,6 @@
}
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitClass(ClassPropertyDefinition d, Void p) {
if (isDetailed && !d.getInstanceOfInterface().isEmpty()) {
@@ -93,7 +80,6 @@
}
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitDN(DNPropertyDefinition d, Void p) {
if (isDetailed && d.getBaseDN() != null) {
@@ -103,7 +89,6 @@
}
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitDuration(DurationPropertyDefinition d, Void p) {
LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
@@ -132,7 +117,6 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
@Override
public <E extends Enum<E>> LocalizableMessage visitEnum(EnumPropertyDefinition<E> d, Void p) {
if (!isDetailed) {
@@ -153,7 +137,6 @@
}
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitInteger(IntegerPropertyDefinition d, Void p) {
LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
@@ -177,19 +160,16 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitIPAddress(IPAddressPropertyDefinition d, Void p) {
return LocalizableMessage.raw("HOST_NAME");
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitIPAddressMask(IPAddressMaskPropertyDefinition d, Void p) {
return LocalizableMessage.raw("IP_ADDRESS_MASK");
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitSize(SizePropertyDefinition d, Void p) {
LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
@@ -241,7 +221,6 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitString(StringPropertyDefinition d, Void p) {
if (d.getPattern() != null) {
@@ -259,7 +238,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T> LocalizableMessage visitUnknown(PropertyDefinition<T> d, Void p) {
return LocalizableMessage.raw("?");
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionVisitor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionVisitor.java
index a92ba00..e3e2b0b 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionVisitor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionVisitor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -40,9 +41,7 @@
*/
public abstract class PropertyDefinitionVisitor<R, P> {
- /**
- * Default constructor.
- */
+ /** Default constructor. */
protected PropertyDefinitionVisitor() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java
index 5a9c75a..d12f706 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyException.java
@@ -28,9 +28,7 @@
*/
public final class PropertyException extends RuntimeException implements LocalizableException {
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = -8465109598081914482L;
/**
@@ -139,10 +137,7 @@
/** LocalizableMessage that explains the problem. */
private final LocalizableMessage message;
- /**
- * The property definition associated with the property that caused
- * the exception.
- */
+ /** The property definition associated with the property that caused the exception. */
private final PropertyDefinition<?> pd;
private PropertyException(final PropertyDefinition<?> pd, final LocalizableMessage message) {
@@ -158,7 +153,7 @@
this.pd = pd;
}
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage getMessageObject() {
return message;
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java
index 87e2520..c0fabd9 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyNotFoundException.java
@@ -27,9 +27,7 @@
*/
public class PropertyNotFoundException extends OperationsException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = -895548482881819610L;
/** The name of the property that could not be found. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyOption.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyOption.java
index 21ce8bc..be2ce9e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyOption.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyOption.java
@@ -12,14 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
-/**
- * This enumeration contains various options that can be associated with
- * property definitions.
- */
+/** This enumeration contains various options that can be associated with property definitions. */
public enum PropertyOption {
/**
* Use this option to identify properties which should be considered as
@@ -33,14 +31,10 @@
*/
HIDDEN,
- /**
- * Use this option to identify properties which must have a value.
- */
+ /** Use this option to identify properties which must have a value. */
MANDATORY,
- /**
- * Use this option to identify properties which are multi-valued.
- */
+ /** Use this option to identify properties which are multi-valued. */
MULTI_VALUED,
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
index 5255335..c34ed3f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -19,19 +20,13 @@
import java.util.Collection;
import java.util.Collections;
-/**
- * An interface which can be used to initialize the contents of a managed
- * object.
- */
+/** An interface which can be used to initialize the contents of a managed object. */
public interface PropertyProvider {
- /**
- * A property provider which always returns empty property values,
- * indicating default behavior.
- */
+ /** A property provider which always returns empty property values, indicating default behavior. */
PropertyProvider DEFAULT_PROVIDER = new PropertyProvider() {
- /** {@inheritDoc} */
+ @Override
public <T> Collection<T> getPropertyValues(PropertyDefinition<T> d) {
return Collections.<T> emptySet();
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyValueVisitor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyValueVisitor.java
index f467c67..35b42fd 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyValueVisitor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyValueVisitor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -46,9 +47,7 @@
*/
public abstract class PropertyValueVisitor<R, P> {
- /**
- * Default constructor.
- */
+ /** Default constructor. */
protected PropertyValueVisitor() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/Reference.java b/opendj-config/src/main/java/org/forgerock/opendj/config/Reference.java
index f9eda3c..c839ad5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/Reference.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/Reference.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -129,10 +129,7 @@
/** The path of the referenced managed object. */
private final ManagedObjectPath<C, S> path;
- /**
- * The instantiable relation in the parent which contains the
- * referenced managed object.
- */
+ /** The instantiable relation in the parent which contains the referenced managed object. */
private final InstantiableRelationDefinition<C, S> relation;
/** Private constructor. */
@@ -170,15 +167,12 @@
return path.toDN();
}
- /** {@inheritDoc} */
+ @Override
public String toString() {
return name;
}
- /**
- * Normalize a value using the specified naming property definition
- * if defined.
- */
+ /** Normalize a value using the specified naming property definition if defined. */
private <T> String normalizeName(PropertyDefinition<T> pd) {
if (pd != null) {
try {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
index 91fe182..952b75a 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -318,7 +318,6 @@
return common.options.contains(option);
}
- /** {@inheritDoc} */
@Override
public final String toString() {
StringBuilder builder = new StringBuilder();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationOption.java b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationOption.java
index d06679c..b1db748 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/RelationOption.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/RelationOption.java
@@ -12,14 +12,12 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
-/**
- * This enumeration contains various options that can be associated with
- * relation definitions.
- */
+/** This enumeration contains various options that can be associated with relation definitions. */
public enum RelationOption {
/**
* Use this option to identify relations which should be considered as
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProvider.java
index 18e2b8d..5c8b4af 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -67,7 +68,7 @@
this.offset = offset;
}
- /** {@inheritDoc} */
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitRelativeInherited(this, p);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SetRelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SetRelationDefinition.java
index ce7e6bb..79d1bea 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SetRelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SetRelationDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -56,10 +56,7 @@
/** The plural name of the relation. */
private final String pluralName;
- /**
- * The optional default managed objects associated with this
- * set relation definition.
- */
+ /** The optional default managed objects associated with this set relation definition. */
private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects =
new HashMap<>();
@@ -93,7 +90,6 @@
defaultManagedObject);
}
- /** {@inheritDoc} */
@Override
protected SetRelationDefinition<C, S> buildInstance(Common<C, S> common) {
return new SetRelationDefinition<>(common, pluralName, defaultManagedObjects);
@@ -104,10 +100,7 @@
/** The plural name of the relation. */
private final String pluralName;
- /**
- * The optional default managed objects associated with this
- * set relation definition.
- */
+ /** The optional default managed objects associated with this set relation definition. */
private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects;
/** Private constructor. */
@@ -118,7 +111,6 @@
this.defaultManagedObjects = defaultManagedObjects;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
return v.visitSet(this, p);
@@ -188,7 +180,6 @@
return ManagedObjectDefinitionI18NResource.getInstance().getMessage(getParentDefinition(), property, locale);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
builder.append("name=");
@@ -199,7 +190,6 @@
builder.append(getChildDefinition().getName());
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
for (DefaultManagedObject<?, ?> dmo : defaultManagedObjects.values()) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SingletonRelationDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SingletonRelationDefinition.java
index 85c070e..b54afb1 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SingletonRelationDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SingletonRelationDefinition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -46,10 +46,7 @@
public static final class Builder<C extends ConfigurationClient, S extends Configuration> extends
AbstractBuilder<C, S, SingletonRelationDefinition<C, S>> {
- /**
- * The optional default managed object associated with this
- * singleton relation.
- */
+ /** The optional default managed object associated with this singleton relation. */
private DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
/**
@@ -81,17 +78,13 @@
this.defaultManagedObject = defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
protected SingletonRelationDefinition<C, S> buildInstance(Common<C, S> common) {
return new SingletonRelationDefinition<>(common, defaultManagedObject);
}
}
- /**
- * The optional default managed object associated with this
- * singleton relation.
- */
+ /** The optional default managed object associated with this singleton relation. */
private final DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
/** Private constructor. */
@@ -101,7 +94,6 @@
this.defaultManagedObject = defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
return v.visitSingleton(this, p);
@@ -119,7 +111,6 @@
return defaultManagedObject;
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
builder.append("name=");
@@ -130,7 +121,6 @@
builder.append(getChildDefinition().getName());
}
- /** {@inheritDoc} */
@Override
protected void initialize() throws Exception {
if (defaultManagedObject != null) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
index 4483d15..5d17f8e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -46,10 +47,7 @@
*/
private final boolean allowUnlimited;
- /**
- * An interface for incrementally constructing memory size property
- * definitions.
- */
+ /** An interface for incrementally constructing memory size property definitions. */
public static final class Builder extends AbstractBuilder<Long, SizePropertyDefinition> {
/** The lower limit of the property value in bytes. */
@@ -149,7 +147,6 @@
this.allowUnlimited = allowUnlimited;
}
- /** {@inheritDoc} */
@Override
protected SizePropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d, String propertyName,
EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -213,7 +210,6 @@
return allowUnlimited;
}
- /** {@inheritDoc} */
@Override
public void validateValue(Long value) {
Reject.ifNull(value);
@@ -231,7 +227,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String encodeValue(Long value) {
Reject.ifNull(value);
@@ -253,7 +248,6 @@
return builder.toString();
}
- /** {@inheritDoc} */
@Override
public Long decodeValue(String value) {
Reject.ifNull(value);
@@ -279,19 +273,16 @@
return i;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitSize(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, Long value, P p) {
return v.visitSize(this, value, p);
}
- /** {@inheritDoc} */
@Override
public void toString(StringBuilder builder) {
super.toString(builder);
@@ -309,7 +300,6 @@
}
- /** {@inheritDoc} */
@Override
public int compare(Long o1, Long o2) {
return o1.compareTo(o2);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SizeUnit.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SizeUnit.java
index 949307e..3b0444f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SizeUnit.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SizeUnit.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -21,9 +21,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * This enumeration defines various memory size units.
- */
+/** This enumeration defines various memory size units. */
public enum SizeUnit {
/** A byte unit. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/StringPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/StringPropertyDefinition.java
index ffe69e5..3c07b25 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/StringPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/StringPropertyDefinition.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -27,29 +28,19 @@
import org.forgerock.i18n.LocalizableMessage;
-/**
- * String property definition.
- */
+/** String property definition. */
public final class StringPropertyDefinition extends PropertyDefinition<String> {
- /**
- * An interface for incrementally constructing string property definitions.
- */
+ /** An interface for incrementally constructing string property definitions. */
public static final class Builder extends AbstractBuilder<String, StringPropertyDefinition> {
- /**
- * Flag indicating whether values of this property are
- * case-insensitive.
- */
+ /** Flag indicating whether values of this property are case-insensitive. */
private boolean isCaseInsensitive = true;
/** Optional pattern which values of this property must match. */
private Pattern pattern;
- /**
- * Pattern usage which provides a user-friendly summary of the
- * pattern if present.
- */
+ /** Pattern usage which provides a user-friendly summary of the pattern if present. */
private String patternUsage;
/** Private constructor. */
@@ -95,7 +86,6 @@
}
}
- /** {@inheritDoc} */
@Override
protected StringPropertyDefinition buildInstance(AbstractManagedObjectDefinition<?, ?> d,
String propertyName, EnumSet<PropertyOption> options, AdministratorAction adminAction,
@@ -120,19 +110,13 @@
return new Builder(d, propertyName);
}
- /**
- * Flag indicating whether values of this property are
- * case-insensitive.
- */
+ /** Flag indicating whether values of this property are case-insensitive. */
private final boolean isCaseInsensitive;
/** Optional pattern which values of this property must match. */
private final Pattern pattern;
- /**
- * Pattern usage which provides a user-friendly summary of the
- * pattern if present.
- */
+ /** Pattern usage which provides a user-friendly summary of the pattern if present. */
private final String patternUsage;
/** Private constructor. */
@@ -146,19 +130,16 @@
this.patternUsage = patternUsage;
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyDefinitionVisitor<R, P> v, P p) {
return v.visitString(this, p);
}
- /** {@inheritDoc} */
@Override
public <R, P> R accept(PropertyValueVisitor<R, P> v, String value, P p) {
return v.visitString(this, value, p);
}
- /** {@inheritDoc} */
@Override
public String decodeValue(String value) {
Reject.ifNull(value);
@@ -241,7 +222,6 @@
return isCaseInsensitive;
}
- /** {@inheritDoc} */
@Override
public String normalizeValue(String value) {
Reject.ifNull(value);
@@ -253,7 +233,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void validateValue(String value) {
Reject.ifNull(value);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/Tag.java b/opendj-config/src/main/java/org/forgerock/opendj/config/Tag.java
index ab22ca7..8be84ec 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/Tag.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/Tag.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -96,12 +96,11 @@
this.name = name;
}
- /** {@inheritDoc} */
+ @Override
public final int compareTo(Tag o) {
return name.compareTo(o.name);
}
- /** {@inheritDoc} */
@Override
public final boolean equals(Object obj) {
if (this == obj) {
@@ -151,13 +150,11 @@
}
}
- /** {@inheritDoc} */
@Override
public final int hashCode() {
return name.hashCode();
}
- /** {@inheritDoc} */
@Override
public final String toString() {
return name;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/TopCfgDefn.java b/opendj-config/src/main/java/org/forgerock/opendj/config/TopCfgDefn.java
index 58cb2c1..d8a48e5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/TopCfgDefn.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/TopCfgDefn.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -44,9 +45,7 @@
return INSTANCE;
}
- /**
- * Private constructor.
- */
+ /** Private constructor. */
private TopCfgDefn() {
super("top", null);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/UndefinedDefaultBehaviorProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/UndefinedDefaultBehaviorProvider.java
index d36525a..e48c4a5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/UndefinedDefaultBehaviorProvider.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/UndefinedDefaultBehaviorProvider.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -26,14 +27,12 @@
*/
public final class UndefinedDefaultBehaviorProvider<T> extends DefaultBehaviorProvider<T> {
- /**
- * Create an undefined default behavior provider.
- */
+ /** Create an undefined default behavior provider. */
public UndefinedDefaultBehaviorProvider() {
// No implementation required.
}
- /** {@inheritDoc} */
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitUndefined(this, p);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminClientException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminClientException.java
index 3ecc597..4b409e0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminClientException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminClientException.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client;
@@ -29,9 +30,7 @@
*/
public abstract class AdminClientException extends AdminException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 4044747533980824456L;
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminSecurityException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminSecurityException.java
index 08421c9..6cf757e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminSecurityException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AdminSecurityException.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client;
@@ -25,9 +26,7 @@
*/
public abstract class AdminSecurityException extends AdminClientException {
- /**
- * Fake serialization ID.
- */
+ /** Fake serialization ID. */
private static final long serialVersionUID = 1L;
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java
index 2c290c5..ee4d7f8 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationException.java
@@ -27,14 +27,10 @@
*/
public class AuthenticationException extends AdminSecurityException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 3544797197747686958L;
- /**
- * Creates an authentication exception with a default message.
- */
+ /** Creates an authentication exception with a default message. */
public AuthenticationException() {
super(ERR_AUTHENTICATION_EXCEPTION_DEFAULT.get());
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java
index e2ae441..e5121bb 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/AuthenticationNotSupportedException.java
@@ -26,14 +26,10 @@
*/
public class AuthenticationNotSupportedException extends AdminSecurityException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 7387834052676291793L;
- /**
- * Creates an authentication not supported exception with a default message.
- */
+ /** Creates an authentication not supported exception with a default message. */
public AuthenticationNotSupportedException() {
super(ERR_AUTHENTICATION_NOT_SUPPORTED_EXCEPTION_DEFAULT.get());
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
index 88864ea..d457f67 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client;
@@ -36,9 +36,7 @@
*/
public abstract class ClientConstraintHandler {
- /**
- * Creates a new client constraint handler.
- */
+ /** Creates a new client constraint handler. */
protected ClientConstraintHandler() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java
index 69689a3..3944768 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ConcurrentModificationException.java
@@ -28,14 +28,10 @@
*/
public class ConcurrentModificationException extends OperationsException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = -1467024486347612820L;
- /**
- * Create a concurrent modification exception with a default message.
- */
+ /** Create a concurrent modification exception with a default message. */
public ConcurrentModificationException() {
super(ERR_CONCURRENT_MODIFICATION_EXCEPTION_DEFAULT.get());
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/DriverBasedManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/DriverBasedManagementContext.java
index cc2281b..1a96713 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/DriverBasedManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/DriverBasedManagementContext.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client;
@@ -33,14 +33,10 @@
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.server.config.client.RootCfgClient;
-/**
- * Driver based client management connection context.
- */
+/** Driver based client management connection context. */
public abstract class DriverBasedManagementContext implements ManagementContext {
- /**
- * Creates a new management context.
- */
+ /** Creates a new management context. */
protected DriverBasedManagementContext() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java
index abe2fdc..bc7aa98 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/IllegalManagedObjectNameException.java
@@ -35,9 +35,7 @@
*/
public class IllegalManagedObjectNameException extends OperationsException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 7491748228684293291L;
/** Create the message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java
index 067ba98..b04f483 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObjectDecodingException.java
@@ -35,9 +35,7 @@
*/
public class ManagedObjectDecodingException extends DecodingException {
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = -4268510652395945357L;
/** Create the message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
index e52b3b5..746cbdc 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client;
@@ -33,9 +33,7 @@
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.server.config.client.RootCfgClient;
-/**
- * Client management connection context.
- */
+/** Client management connection context. */
public interface ManagementContext extends Closeable {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
index 30f5fda..b727e11 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
@@ -34,9 +34,7 @@
*/
public class MissingMandatoryPropertiesException extends OperationsException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 6342522125252055588L;
/** Create the message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java
index 18a6cc8..feab0d9 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/OperationRejectedException.java
@@ -39,29 +39,17 @@
*/
public class OperationRejectedException extends AdminClientException {
- /**
- * The type of operation that caused this exception.
- */
+ /** The type of operation that caused this exception. */
public enum OperationType {
- /**
- * A managed object could not be created.
- */
+ /** A managed object could not be created. */
CREATE,
-
- /**
- * A managed object could not be deleted.
- */
+ /** A managed object could not be deleted. */
DELETE,
-
- /**
- * A managed object could not be modified.
- */
+ /** A managed object could not be modified. */
MODIFY;
}
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = 8547688890613079044L;
/** Gets the default message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/DNBuilder.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/DNBuilder.java
index 23b9e7c..8ac333c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/DNBuilder.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/DNBuilder.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.ldap;
@@ -36,9 +36,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.RDN;
-/**
- * A strategy for creating <code>DN</code>s from managed object paths.
- */
+/** A strategy for creating <code>DN</code>s from managed object paths. */
final class DNBuilder implements ManagedObjectPathSerializer {
/**
@@ -113,7 +111,7 @@
this.profile = profile;
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
InstantiableRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d, String name) {
@@ -156,7 +154,7 @@
return rdnsOfDn;
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
OptionalRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d) {
@@ -164,7 +162,7 @@
appendManagedObjectPathElement(r);
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SingletonRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d) {
@@ -172,7 +170,7 @@
appendManagedObjectPathElement(r);
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SetRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
// Add the RDN sequence representing the relation.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
index a315d4e..9e6aff1 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
@@ -67,14 +67,10 @@
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldif.ConnectionEntryReader;
-/**
- * The LDAP management context driver implementation.
- */
+/** The LDAP management context driver implementation. */
final class LDAPDriver extends Driver {
- /**
- * A visitor which is used to decode property LDAP values.
- */
+ /** A visitor which is used to decode property LDAP values. */
private static final class ValueDecoder extends PropertyDefinitionVisitor<Object, String> {
/**
* Decodes the provided property LDAP value.
@@ -100,7 +96,6 @@
// Do nothing.
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Object visitAggregation(
AggregationPropertyDefinition<C, S> d, String p) {
@@ -114,7 +109,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T> Object visitUnknown(PropertyDefinition<T> d, String p) {
// By default the property definition's decoder will do.
@@ -126,10 +120,7 @@
private final Connection connection;
- /**
- * The LDAP profile which should be used to construct LDAP
- * requests and decode LDAP responses.
- */
+ /** The LDAP profile which should be used to construct LDAP requests and decode LDAP responses. */
private final LDAPProfile profile;
/**
@@ -150,13 +141,11 @@
this.context = context;
}
- /** {@inheritDoc} */
@Override
public void close() {
connection.close();
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getManagedObject(
ManagedObjectPath<C, S> path) throws DefinitionDecodingException, ManagedObjectDecodingException,
@@ -272,14 +261,12 @@
}
}
- /** {@inheritDoc} */
@Override
public ManagedObject<RootCfgClient> getRootConfigurationManagedObject() {
return new LDAPManagedObject<>(this, RootCfgDefn.getInstance(), ManagedObjectPath.emptyPath(),
new PropertySet(), true, null);
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> String[] listManagedObjects(
ManagedObjectPath<?, ?> parent, InstantiableRelationDefinition<C, S> rd,
@@ -315,7 +302,6 @@
return children.toArray(new String[children.size()]);
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> String[] listManagedObjects(
ManagedObjectPath<?, ?> parent, SetRelationDefinition<C, S> rd,
@@ -351,7 +337,6 @@
return children.toArray(new String[children.size()]);
}
- /** {@inheritDoc} */
@Override
public boolean managedObjectExists(ManagedObjectPath<?, ?> path) throws ManagedObjectNotFoundException,
LdapException {
@@ -369,7 +354,6 @@
return entryExists(dn);
}
- /** {@inheritDoc} */
@Override
protected <C extends ConfigurationClient, S extends Configuration> void deleteManagedObject(
ManagedObjectPath<C, S> path) throws OperationRejectedException, LdapException {
@@ -387,7 +371,6 @@
}
}
- /** {@inheritDoc} */
@Override
protected LDAPManagementContext getManagementContext() {
return context;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
index 3f0d9ad..9a476dd 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.ldap;
@@ -63,9 +63,7 @@
*/
final class LDAPManagedObject<T extends ConfigurationClient> extends AbstractManagedObject<T> {
- /**
- * A visitor which is used to encode property LDAP values.
- */
+ /** A visitor which is used to encode property LDAP values. */
private static final class ValueEncoder extends PropertyValueVisitor<Object, Void> {
/** Prevent instantiation. */
@@ -73,7 +71,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Object visitAggregation(
AggregationPropertyDefinition<C, S> pd, String v, Void p) {
@@ -83,7 +80,6 @@
return reference.toDN().toString();
}
- /** {@inheritDoc} */
@Override
public <P> Object visitUnknown(PropertyDefinition<P> propertyDef, P value, Void p) {
return propertyDef.encodeValue(value);
@@ -117,7 +113,6 @@
this.driver = driver;
}
- /** {@inheritDoc} */
@Override
protected void addNewManagedObject() throws LdapException, OperationRejectedException,
ConcurrentModificationException, ManagedObjectAlreadyExistsException {
@@ -223,13 +218,11 @@
}
}
- /** {@inheritDoc} */
@Override
protected Driver getDriver() {
return driver;
}
- /** {@inheritDoc} */
@Override
protected void modifyExistingManagedObject() throws ConcurrentModificationException, OperationRejectedException,
LdapException {
@@ -265,7 +258,6 @@
}
}
- /** {@inheritDoc} */
@Override
protected <M extends ConfigurationClient> ManagedObject<M> newInstance(ManagedObjectDefinition<M, ?> d,
ManagedObjectPath<M, ?> path, PropertySet properties, boolean existsOnServer,
@@ -291,7 +283,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public boolean isModified() {
ManagedObjectDefinition<?, ?> d = getManagedObjectDefinition();
for (PropertyDefinition<?> pd : d.getAllPropertyDefinitions()) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagementContext.java
index 1438f0a..a953b78 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagementContext.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.ldap;
@@ -61,9 +61,7 @@
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.forgerock.util.Reject;
-/**
- * An LDAP management connection context.
- */
+/** An LDAP management connection context. */
public final class LDAPManagementContext extends DriverBasedManagementContext {
private static final class ManagementContextWrapper implements ManagementContext {
@@ -247,7 +245,6 @@
this.driver = driver;
}
- /** {@inheritDoc} */
@Override
protected Driver getDriver() {
return driver;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
index 7c0f984..f502405 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.spi;
@@ -65,10 +65,7 @@
*/
public abstract class AbstractManagedObject<T extends ConfigurationClient> implements ManagedObject<T> {
- /**
- * Creates any default managed objects associated with a relation
- * definition.
- */
+ /** Creates any default managed objects associated with a relation definition. */
private final class DefaultManagedObjectFactory implements RelationDefinitionVisitor<Void, Void> {
/** Possible exceptions. */
@@ -78,7 +75,6 @@
private OperationRejectedException ore;
private LdapException ere;
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Void visitInstantiable(
InstantiableRelationDefinition<C, S> rd, Void p) {
@@ -97,7 +93,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Void visitOptional(
OptionalRelationDefinition<C, S> rd, Void p) {
@@ -110,7 +105,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Void visitSingleton(
SingletonRelationDefinition<C, S> rd, Void p) {
@@ -119,7 +113,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Void visitSet(SetRelationDefinition<C, S> rd,
Void p) {
@@ -186,10 +179,7 @@
}
}
- /**
- * The managed object definition associated with this managed
- * object.
- */
+ /** The managed object definition associated with this managed object. */
private final ManagedObjectDefinition<T, ? extends Configuration> definition;
/**
@@ -234,7 +224,6 @@
this.namingPropertyDefinition = namingPropertyDefinition;
}
- /** {@inheritDoc} */
@Override
public final void commit() throws ManagedObjectAlreadyExistsException, MissingMandatoryPropertiesException,
ConcurrentModificationException, OperationRejectedException, LdapException {
@@ -305,7 +294,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration, C1 extends C> ManagedObject<C1> createChild(
InstantiableRelationDefinition<C, S> r, ManagedObjectDefinition<C1, ? extends S> d, String name,
@@ -332,7 +320,6 @@
return createNewManagedObject(d, childPath, pd, name, exceptions);
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration, C1 extends C> ManagedObject<C1> createChild(
OptionalRelationDefinition<C, S> r, ManagedObjectDefinition<C1, ? extends S> d,
@@ -342,7 +329,6 @@
return createNewManagedObject(d, childPath, null, null, exceptions);
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration, C1 extends C> ManagedObject<C1> createChild(
SetRelationDefinition<C, S> r, ManagedObjectDefinition<C1, ? extends S> d,
@@ -353,7 +339,6 @@
return createNewManagedObject(d, childPath, null, null, exceptions);
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getChild(
InstantiableRelationDefinition<C, S> r, String name) throws DefinitionDecodingException,
@@ -365,7 +350,6 @@
return ctx.getManagedObject(path.child(r, name));
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getChild(
OptionalRelationDefinition<C, S> r) throws DefinitionDecodingException, ManagedObjectDecodingException,
@@ -376,7 +360,6 @@
return ctx.getManagedObject(path.child(r));
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getChild(
SingletonRelationDefinition<C, S> r) throws DefinitionDecodingException, ManagedObjectDecodingException,
@@ -387,7 +370,6 @@
return ctx.getManagedObject(path.child(r));
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getChild(
SetRelationDefinition<C, S> r, String name) throws DefinitionDecodingException,
@@ -411,31 +393,26 @@
return ctx.getManagedObject(path.child(r, cd));
}
- /** {@inheritDoc} */
@Override
public final T getConfiguration() {
return definition.createClientConfiguration(this);
}
- /** {@inheritDoc} */
@Override
public final ManagedObjectDefinition<T, ? extends Configuration> getManagedObjectDefinition() {
return definition;
}
- /** {@inheritDoc} */
@Override
public final ManagedObjectPath<T, ? extends Configuration> getManagedObjectPath() {
return path;
}
- /** {@inheritDoc} */
@Override
public final <P> SortedSet<P> getPropertyDefaultValues(PropertyDefinition<P> pd) {
return new TreeSet<>(getProperty(pd).getDefaultValues());
}
- /** {@inheritDoc} */
@Override
public final <P> P getPropertyValue(PropertyDefinition<P> pd) {
Set<P> values = getProperty(pd).getEffectiveValues();
@@ -445,13 +422,11 @@
return null;
}
- /** {@inheritDoc} */
@Override
public final <P> SortedSet<P> getPropertyValues(PropertyDefinition<P> pd) {
return new TreeSet<>(getProperty(pd).getEffectiveValues());
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> boolean hasChild(
OptionalRelationDefinition<C, S> r) throws ConcurrentModificationException, LdapException {
@@ -464,20 +439,17 @@
}
}
- /** {@inheritDoc} */
@Override
public final boolean isPropertyPresent(PropertyDefinition<?> pd) {
return !getProperty(pd).isEmpty();
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> String[] listChildren(
InstantiableRelationDefinition<C, S> r) throws ConcurrentModificationException, LdapException {
return listChildren(r, r.getChildDefinition());
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> String[] listChildren(
InstantiableRelationDefinition<C, S> r, AbstractManagedObjectDefinition<? extends C, ? extends S> d)
@@ -491,14 +463,12 @@
}
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> String[] listChildren(
SetRelationDefinition<C, S> r) throws ConcurrentModificationException, LdapException {
return listChildren(r, r.getChildDefinition());
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> String[] listChildren(
SetRelationDefinition<C, S> r, AbstractManagedObjectDefinition<? extends C, ? extends S> d)
@@ -512,7 +482,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> void removeChild(
InstantiableRelationDefinition<C, S> r, String name) throws ManagedObjectNotFoundException,
@@ -532,7 +501,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> void removeChild(
OptionalRelationDefinition<C, S> r) throws ManagedObjectNotFoundException, OperationRejectedException,
@@ -552,7 +520,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <C extends ConfigurationClient, S extends Configuration> void removeChild(
SetRelationDefinition<C, S> r, String name) throws ManagedObjectNotFoundException,
@@ -572,7 +539,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <P> void setPropertyValue(PropertyDefinition<P> pd, P value) {
if (value != null) {
@@ -582,7 +548,6 @@
}
}
- /** {@inheritDoc} */
@Override
public final <P> void setPropertyValues(PropertyDefinition<P> pd, Collection<P> values) {
if (pd.hasOption(PropertyOption.MONITORING)) {
@@ -603,7 +568,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
@@ -717,10 +681,7 @@
ManagedObjectPath<M, ?> path, PropertySet properties, boolean existsOnServer,
PropertyDefinition<?> namingPropertyDefinition);
- /**
- * Creates a new managed object with no active values, just default
- * values.
- */
+ /** Creates a new managed object with no active values, just default values. */
private <M extends ConfigurationClient, P> ManagedObject<M> createNewManagedObject(
ManagedObjectDefinition<M, ?> d, ManagedObjectPath<M, ?> p, PropertyDefinition<P> namingPropertyDefinition,
String name, Collection<PropertyException> exceptions) {
@@ -773,10 +734,7 @@
}
}
- /**
- * Validate that a relation definition belongs to this managed
- * object.
- */
+ /** Validate that a relation definition belongs to this managed object. */
private void validateRelationDefinition(RelationDefinition<?, ?> rd) {
ManagedObjectDefinition<T, ?> d = getManagedObjectDefinition();
RelationDefinition<?, ?> tmp = d.getRelationDefinition(rd.getName());
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
index f568f93..57da00b 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.spi;
@@ -72,10 +72,7 @@
*/
private final class DefaultValueFinder<T> implements DefaultBehaviorProviderVisitor<T, Collection<T>, Void> {
- /**
- * Any exception that occurred whilst retrieving inherited default
- * values.
- */
+ /** Any exception that occurred whilst retrieving inherited default values. */
private PropertyException exception;
/** The path of the managed object containing the first property. */
@@ -96,7 +93,6 @@
this.isCreate = isCreate;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> d, Void p) {
try {
@@ -108,13 +104,11 @@
}
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAlias(AliasDefaultBehaviorProvider<T> d, Void p) {
return Collections.emptySet();
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitDefined(DefinedDefaultBehaviorProvider<T> d, Void p) {
Collection<String> stringValues = d.getDefaultValues();
@@ -132,7 +126,6 @@
return values;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d, Void p) {
try {
@@ -144,7 +137,6 @@
}
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitUndefined(UndefinedDefaultBehaviorProvider<T> d, Void p) {
return Collections.emptySet();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
index 6f5904a..4a96bad 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.spi;
@@ -85,19 +85,16 @@
activeValues.addAll(pendingValues);
}
- /** {@inheritDoc} */
@Override
public SortedSet<T> getActiveValues() {
return Collections.unmodifiableSortedSet(activeValues);
}
- /** {@inheritDoc} */
@Override
public SortedSet<T> getDefaultValues() {
return defaultValues;
}
- /** {@inheritDoc} */
@Override
public SortedSet<T> getEffectiveValues() {
SortedSet<T> values = getPendingValues();
@@ -109,25 +106,21 @@
return values;
}
- /** {@inheritDoc} */
@Override
public SortedSet<T> getPendingValues() {
return Collections.unmodifiableSortedSet(pendingValues);
}
- /** {@inheritDoc} */
@Override
public PropertyDefinition<T> getPropertyDefinition() {
return d;
}
- /** {@inheritDoc} */
@Override
public boolean isEmpty() {
return pendingValues.isEmpty();
}
- /** {@inheritDoc} */
@Override
public boolean isModified() {
return activeValues.size() != pendingValues.size()
@@ -145,13 +138,11 @@
pendingValues.addAll(c);
}
- /** {@inheritDoc} */
@Override
public String toString() {
return getEffectiveValues().toString();
}
- /** {@inheritDoc} */
@Override
public boolean wasEmpty() {
return activeValues.isEmpty();
@@ -205,7 +196,6 @@
return (Property<T>) properties.get(d);
}
- /** {@inheritDoc} */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
@@ -220,9 +210,7 @@
return builder.toString();
}
- /**
- * Makes all pending values active.
- */
+ /** Makes all pending values active. */
void commit() {
for (MyProperty<?> p : properties.values()) {
p.commit();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ANDCondition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ANDCondition.java
index 496d277..46ab82c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ANDCondition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ANDCondition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -47,7 +47,7 @@
this.conditions = Arrays.asList(conditions);
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
for (Condition condition : conditions) {
if (!condition.evaluate(context, managedObject)) {
@@ -57,7 +57,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
for (Condition condition : conditions) {
if (!condition.evaluate(managedObject)) {
@@ -67,7 +67,7 @@
return true;
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
for (Condition condition : conditions) {
condition.initialize(d);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Condition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Condition.java
index 50d412e..81e26f1 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Condition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Condition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -23,9 +23,7 @@
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.ldap.LdapException;
-/**
- * An interface for evaluating conditions.
- */
+/** An interface for evaluating conditions. */
public interface Condition {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
index 656bad5..6c25b2c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/Conditions.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -23,50 +23,43 @@
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.ldap.LdapException;
-/**
- * This class consists exclusively of static methods that operate on or return
- * conditions.
- */
+/** This class consists exclusively of static methods that operate on or return conditions. */
public final class Conditions {
- /**
- * A condition which always evaluates to <code>false</code>.
- */
+ /** A condition which always evaluates to <code>false</code>. */
public static final Condition FALSE = new Condition() {
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
return false;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
return false;
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
// No implementation required.
}
};
- /**
- * A condition which always evaluates to <code>true</code>.
- */
+ /** A condition which always evaluates to <code>true</code>. */
public static final Condition TRUE = new Condition() {
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
return true;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
return true;
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
index 3971a07..53055b9 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ContainsCondition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -53,19 +53,19 @@
this.value = value;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
SortedSet<T> values = managedObject.getPropertyValues(pd);
return values.contains(value);
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
SortedSet<T> values = managedObject.getPropertyValues(pd);
return values.contains(value);
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
// Not used.
}
@@ -100,12 +100,12 @@
this.propertyStringValue = stringValue;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
return impl.evaluate(context, managedObject);
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
return impl.evaluate(managedObject);
}
@@ -121,7 +121,7 @@
impl.setPropertyValue(managedObject);
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
// Decode the property.
buildImpl(d.getPropertyDefinition(propertyName));
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/IsPresentCondition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/IsPresentCondition.java
index a2d0dff..6cdd804 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/IsPresentCondition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/IsPresentCondition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -50,19 +50,19 @@
this.propertyName = propertyName;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
SortedSet<?> values = managedObject.getPropertyValues(pd);
return !values.isEmpty();
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
SortedSet<?> values = managedObject.getPropertyValues(pd);
return !values.isEmpty();
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
// Decode the property.
this.pd = d.getPropertyDefinition(propertyName);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/NOTCondition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/NOTCondition.java
index dc572be..f3ca88b 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/NOTCondition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/NOTCondition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -45,17 +45,17 @@
this.condition = condition;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
return !condition.evaluate(context, managedObject);
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
return !condition.evaluate(managedObject);
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
condition.initialize(d);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ORCondition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ORCondition.java
index 1371875..56e546d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ORCondition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/conditions/ORCondition.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.conditions;
@@ -47,7 +47,7 @@
this.conditions = Arrays.asList(conditions);
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ManagementContext context, ManagedObject<?> managedObject) throws LdapException {
for (Condition condition : conditions) {
if (condition.evaluate(context, managedObject)) {
@@ -57,7 +57,7 @@
return false;
}
- /** {@inheritDoc} */
+ @Override
public boolean evaluate(ServerManagedObject<?> managedObject) throws ConfigException {
for (Condition condition : conditions) {
if (condition.evaluate(managedObject)) {
@@ -67,7 +67,7 @@
return false;
}
- /** {@inheritDoc} */
+ @Override
public void initialize(AbstractManagedObjectDefinition<?, ?> d) throws Exception {
for (Condition condition : conditions) {
condition.initialize(d);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ArgumentExceptionFactory.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ArgumentExceptionFactory.java
index cf50521..c17605e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ArgumentExceptionFactory.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ArgumentExceptionFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -38,9 +38,7 @@
import com.forgerock.opendj.cli.TableBuilder;
import com.forgerock.opendj.cli.TextTablePrinter;
-/**
- * A utility class for converting various admin exception types into argument exceptions.
- */
+/** A utility class for converting various admin exception types into argument exceptions. */
public final class ArgumentExceptionFactory {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java
index 4dc93c1..06ef7c7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/BuildVersion.java
@@ -176,7 +176,7 @@
return point;
}
- /** {@inheritDoc} */
+ @Override
public boolean equals(final Object obj) {
if (this == obj) {
return true;
@@ -188,7 +188,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
public int compareTo(final BuildVersion version) {
if (major == version.major) {
if (minor == version.minor) {
@@ -219,7 +219,7 @@
return rev;
}
- /** {@inheritDoc} */
+ @Override
public int hashCode() {
return Arrays.hashCode(new int[] { major, minor, point, rev.hashCode() });
}
@@ -233,6 +233,7 @@
*
* @return The string representation of the version.
*/
+ @Override
public String toString() {
return Utils.joinAsString(".", major, minor, point, rev);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CLIProfile.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CLIProfile.java
index c20fed3..34feeaa 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CLIProfile.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CLIProfile.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -27,9 +27,7 @@
import org.forgerock.opendj.config.RelationDefinition;
import org.forgerock.opendj.config.SetRelationDefinition;
-/**
- * This class is used to access CLI profile annotations.
- */
+/** This class is used to access CLI profile annotations. */
final class CLIProfile {
/** The singleton instance. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CreateSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CreateSubCommandHandler.java
index 68c6580..3161ffa 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CreateSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/CreateSubCommandHandler.java
@@ -163,7 +163,6 @@
return properties.keySet();
}
- /** {@inheritDoc} */
@Override
@SuppressWarnings("unchecked")
public <T> Collection<T> getPropertyValues(PropertyDefinition<T> d) {
@@ -200,9 +199,7 @@
}
}
- /**
- * A help call-back which displays help about available component types.
- */
+ /** A help call-back which displays help about available component types. */
private static final class TypeHelpCallback<C extends ConfigurationClient, S extends Configuration> implements
HelpCallback {
@@ -214,7 +211,6 @@
this.d = d;
}
- /** {@inheritDoc} */
@Override
public void display(ConsoleApplication app) {
app.println(INFO_DSCFG_CREATE_TYPE_HELP_HEADING.get(d.getUserFriendlyPluralName()));
@@ -454,9 +450,7 @@
}
}
- /**
- * Check that any referenced components are enabled if required.
- */
+ /** Check that any referenced components are enabled if required. */
private static MenuResult<Void> checkReferences(ConsoleApplication app, ManagementContext context,
ManagedObject<?> mo, SubCommandHandler handler) throws ClientException {
ManagedObjectDefinition<?, ?> d = mo.getManagedObjectDefinition();
@@ -948,13 +942,11 @@
return relation;
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Integer> run(ConsoleApplication app, LDAPManagementContextFactory factory)
throws ArgumentException, ClientException {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DeleteSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DeleteSubCommandHandler.java
index 59c592a..274dfb0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DeleteSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DeleteSubCommandHandler.java
@@ -60,14 +60,10 @@
*/
final class DeleteSubCommandHandler extends SubCommandHandler {
- /**
- * The value for the long option force.
- */
+ /** The value for the long option force. */
private static final String OPTION_DSCFG_LONG_FORCE = "force";
- /**
- * The value for the short option force.
- */
+ /** The value for the short option force. */
private static final char OPTION_DSCFG_SHORT_FORCE = 'f';
/**
@@ -133,9 +129,7 @@
/** The path of the managed object. */
private final ManagedObjectPath<?, ?> path;
- /**
- * The relation which references the managed object to be deleted.
- */
+ /** The relation which references the managed object to be deleted. */
private final RelationDefinition<?, ?> relation;
/** The sub-command associated with this handler. */
@@ -176,13 +170,11 @@
return relation;
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Integer> run(ConsoleApplication app, LDAPManagementContextFactory factory)
throws ArgumentException, ClientException {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
index 75a01a0..dfc27df 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/GetPropSubCommandHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -183,13 +183,11 @@
return path.getRelationDefinition();
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Integer> run(ConsoleApplication app, LDAPManagementContextFactory factory)
throws ArgumentException, ClientException {
@@ -294,6 +292,7 @@
DefaultBehaviorProviderVisitor<T, LocalizableMessage, Void> visitor
= new DefaultBehaviorProviderVisitor<T, LocalizableMessage, Void>() {
+ @Override
public LocalizableMessage visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> d,
Void p) {
// Should not happen - inherited default values are
@@ -301,6 +300,7 @@
throw new IllegalStateException();
}
+ @Override
public LocalizableMessage visitAlias(AliasDefaultBehaviorProvider<T> d, Void p) {
if (app.isVerbose()) {
return d.getSynopsis();
@@ -308,12 +308,14 @@
return null;
}
+ @Override
public LocalizableMessage visitDefined(DefinedDefaultBehaviorProvider<T> d, Void p) {
// Should not happen - real default values are displayed as
// normal values.
throw new IllegalStateException();
}
+ @Override
public LocalizableMessage visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d,
Void p) {
// Should not happen - inherited default values are
@@ -321,6 +323,7 @@
throw new IllegalStateException();
}
+ @Override
public LocalizableMessage visitUndefined(UndefinedDefaultBehaviorProvider<T> d, Void p) {
return null;
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/HelpSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/HelpSubCommandHandler.java
index 154477c..c9d0585 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/HelpSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/HelpSubCommandHandler.java
@@ -82,19 +82,19 @@
private static class DefaultVisitor<T> implements
DefaultBehaviorProviderVisitor<T, LocalizableMessage, PropertyDefinition<T>> {
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
return INFO_DSCFG_HELP_FIELD_INHERITED_ABS.get(d.getPropertyName(), d.getManagedObjectPath()
.getRelationDefinition().getUserFriendlyName());
}
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage visitAlias(AliasDefaultBehaviorProvider<T> d, PropertyDefinition<T> p) {
return d.getSynopsis();
}
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage visitDefined(DefinedDefaultBehaviorProvider<T> d, PropertyDefinition<T> p) {
LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
PropertyValuePrinter printer = new PropertyValuePrinter(null, null, false);
@@ -111,7 +111,7 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
if (d.getRelativeOffset() == 0) {
@@ -123,15 +123,13 @@
}
}
- /** {@inheritDoc} */
+ @Override
public LocalizableMessage visitUndefined(UndefinedDefaultBehaviorProvider<T> d, PropertyDefinition<T> p) {
return INFO_DSCFG_HELP_FIELD_UNDEFINED.get();
}
}
- /**
- * Create a new default behavior printer.
- */
+ /** Create a new default behavior printer. */
public DefaultBehaviorPrinter() {
// No implementation required.
}
@@ -162,7 +160,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public <E extends Enum<E>> Void visitEnum(EnumPropertyDefinition<E> d, PrintStream p) {
displayUsage(p, INFO_DSCFG_HELP_FIELD_ENUM.get());
@@ -197,7 +194,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public Void visitString(StringPropertyDefinition d, PrintStream p) {
PropertyDefinitionUsageBuilder usageBuilder = new PropertyDefinitionUsageBuilder(false);
@@ -227,7 +223,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public <T> Void visitUnknown(PropertyDefinition<T> d, PrintStream p) {
PropertyDefinitionUsageBuilder usageBuilder = new PropertyDefinitionUsageBuilder(true);
@@ -279,38 +274,20 @@
/** Strings used in property help. */
private static final String HEADING_SEPARATOR = " : ";
-
/** Width of biggest heading (need to be careful of I18N). */
private static final int HEADING_WIDTH;
- /**
- * The value for the long option category.
- */
+ /** The value for the long option category. */
private static final String OPTION_DSCFG_LONG_CATEGORY = "category";
-
- /**
- * The value for the long option inherited.
- */
+ /** The value for the long option inherited. */
private static final String OPTION_DSCFG_LONG_INHERITED = "inherited";
-
- /**
- * The value for the long option type.
- */
+ /** The value for the long option type. */
private static final String OPTION_DSCFG_LONG_TYPE = "type";
-
- /**
- * The value for the short option category.
- */
+ /** The value for the short option category. */
private static final Character OPTION_DSCFG_SHORT_CATEGORY = 'c';
-
- /**
- * The value for the short option inherited.
- */
+ /** The value for the short option inherited. */
private static final Character OPTION_DSCFG_SHORT_INHERITED = null;
-
- /**
- * The value for the short option type.
- */
+ /** The value for the short option type. */
private static final Character OPTION_DSCFG_SHORT_TYPE = 't';
static {
@@ -577,14 +554,10 @@
return b.toString();
}
- /**
- * The argument which should be used to specify the category of managed object to be retrieved.
- */
+ /** The argument which should be used to specify the category of managed object to be retrieved. */
private final StringArgument categoryArgument;
- /**
- * A table listing all the available types of managed object indexed on their parent type.
- */
+ /** A table listing all the available types of managed object indexed on their parent type. */
private final Map<String, Map<String, AbstractManagedObjectDefinition<?, ?>>> categoryMap = new TreeMap<>();
/** The argument which should be used to display inherited properties. */
@@ -593,14 +566,10 @@
/** The sub-command associated with this handler. */
private final SubCommand subCommand;
- /**
- * A table listing all the available types of managed object indexed on their tag(s).
- */
+ /** A table listing all the available types of managed object indexed on their tag(s). */
private final Map<Tag, Map<String, AbstractManagedObjectDefinition<?, ?>>> tagMap = new HashMap<>();
- /**
- * The argument which should be used to specify the sub-type of managed object to be retrieved.
- */
+ /** The argument which should be used to specify the sub-type of managed object to be retrieved. */
private final StringArgument typeArgument;
/** Private constructor. */
@@ -634,7 +603,6 @@
setCommandBuilderUseful(false);
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
@@ -689,7 +657,6 @@
}
}
- /** {@inheritDoc} */
@Override
public MenuResult<Integer> run(ConsoleApplication app, LDAPManagementContextFactory factory)
throws ArgumentException, ClientException {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/LDAPManagementContextFactory.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/LDAPManagementContextFactory.java
index d42253a..bd97bfa 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/LDAPManagementContextFactory.java
@@ -36,9 +36,7 @@
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.ReturnCode;
-/**
- * An LDAP management context factory for the DSConfig tool.
- */
+/** An LDAP management context factory for the DSConfig tool. */
public final class LDAPManagementContextFactory {
/** The management context. */
@@ -66,9 +64,7 @@
factory = cfp.getAuthenticatedConnectionFactory();
}
- /**
- * Closes this management context.
- */
+ /** Closes this management context. */
public void close() {
closeSilently(context);
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ListSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ListSubCommandHandler.java
index 4ef9170..6793101 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ListSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/ListSubCommandHandler.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -163,13 +163,11 @@
return relation;
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Integer> run(ConsoleApplication app, LDAPManagementContextFactory factory)
throws ArgumentException, ClientException {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyEditorModification.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyEditorModification.java
index 7a6c694..8e8e774 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyEditorModification.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyEditorModification.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -31,9 +31,7 @@
* The type of the underlying property associated with the modification.
*/
final class PropertyEditorModification<T> {
- /**
- * The enumeration that describes the different types of modifications that we can have.
- */
+ /** The enumeration that describes the different types of modifications that we can have. */
enum Type {
/** The user chose to set values. */
SET,
@@ -177,7 +175,6 @@
return originalValues;
}
- /** {@inheritDoc} */
@Override
public String toString() {
return "Property name: " + getPropertyDefinition() + "\nMod type: " + getType() + "\nMod values: "
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index 55201b6..d965ac7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -73,9 +73,7 @@
import static org.forgerock.opendj.config.dsconfig.DSConfig.*;
-/**
- * Common methods used for interactively editing properties.
- */
+/** Common methods used for interactively editing properties. */
final class PropertyValueEditor {
/**
@@ -88,14 +86,11 @@
/** The aggregation property definition. */
private final AggregationPropertyDefinition<C, S> pd;
- /**
- * Creates a new component create call-back for the provided aggregation property definition.
- */
+ /** Creates a new component create call-back for the provided aggregation property definition. */
private CreateComponentCallback(AggregationPropertyDefinition<C, S> pd) {
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public MenuResult<String> invoke(ConsoleApplication app) throws ClientException {
try {
@@ -144,9 +139,7 @@
}
}
- /**
- * A help call-back which displays a description and summary of a component and its properties.
- */
+ /** A help call-back which displays a description and summary of a component and its properties. */
private static final class ComponentHelpCallback implements HelpCallback {
/** The managed object being edited. */
@@ -161,7 +154,6 @@
this.properties = c;
}
- /** {@inheritDoc} */
@Override
public void display(ConsoleApplication app) {
app.println();
@@ -171,33 +163,18 @@
}
}
- /**
- * A simple interface for querying and retrieving common default behavior properties.
- */
+ /** A simple interface for querying and retrieving common default behavior properties. */
private static final class DefaultBehaviorQuery<T> {
- /**
- * The type of default behavior.
- */
+ /** The type of default behavior. */
private enum Type {
- /**
- * Alias default behavior.
- */
+ /** Alias default behavior. */
ALIAS,
-
- /**
- * Defined default behavior.
- */
+ /** Defined default behavior. */
DEFINED,
-
- /**
- * Inherited default behavior.
- */
+ /** Inherited default behavior. */
INHERITED,
-
- /**
- * Undefined default behavior.
- */
+ /** Undefined default behavior. */
UNDEFINED;
}
@@ -214,7 +191,6 @@
DefaultBehaviorProviderVisitor<T, DefaultBehaviorQuery<T>, PropertyDefinition<T>> visitor
= new DefaultBehaviorProviderVisitor<T, DefaultBehaviorQuery<T>, PropertyDefinition<T>>() {
- /** {@inheritDoc} */
@Override
public DefaultBehaviorQuery<T> visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
@@ -226,21 +202,18 @@
return new DefaultBehaviorQuery<>(Type.INHERITED, query.getAliasDescription());
}
- /** {@inheritDoc} */
@Override
public DefaultBehaviorQuery<T> visitAlias(AliasDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
return new DefaultBehaviorQuery<>(Type.ALIAS, d.getSynopsis());
}
- /** {@inheritDoc} */
@Override
public DefaultBehaviorQuery<T> visitDefined(DefinedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
return new DefaultBehaviorQuery<>(Type.DEFINED, null);
}
- /** {@inheritDoc} */
@Override
public DefaultBehaviorQuery<T> visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
@@ -252,7 +225,6 @@
return new DefaultBehaviorQuery<>(Type.INHERITED, query.getAliasDescription());
}
- /** {@inheritDoc} */
@Override
public DefaultBehaviorQuery<T> visitUndefined(UndefinedDefaultBehaviorProvider<T> d,
PropertyDefinition<T> p) {
@@ -263,9 +235,7 @@
return pd.getDefaultBehaviorProvider().accept(visitor, pd);
}
- /**
- * The description of the behavior if it is an alias default behavior.
- */
+ /** The description of the behavior if it is an alias default behavior. */
private final LocalizableMessage aliasDescription;
/** The type of behavior. */
@@ -326,9 +296,7 @@
}
- /**
- * A property definition visitor which initializes mandatory properties.
- */
+ /** A property definition visitor which initializes mandatory properties. */
private final class MandatoryPropertyInitializer extends PropertyDefinitionVisitor<MenuResult<Void>, Void>
implements MenuCallback<Void> {
@@ -347,7 +315,6 @@
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Void> invoke(ConsoleApplication app) throws ClientException {
displayPropertyHeader(app, pd);
@@ -360,7 +327,6 @@
return result;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> MenuResult<Void> visitAggregation(
AggregationPropertyDefinition<C, S> d, Void p) {
@@ -431,7 +397,6 @@
}
}
- /** {@inheritDoc} */
@Override
public MenuResult<Void> visitBoolean(BooleanPropertyDefinition d, Void p) {
MenuBuilder<Boolean> builder = new MenuBuilder<>(app);
@@ -470,7 +435,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <E extends Enum<E>> MenuResult<Void> visitEnum(EnumPropertyDefinition<E> d, Void x) {
MenuBuilder<E> builder = new MenuBuilder<>(app);
@@ -519,7 +483,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T> MenuResult<Void> visitUnknown(PropertyDefinition<T> d, Void p) {
app.println();
@@ -541,9 +504,7 @@
}
- /**
- * A menu call-back for editing a modifiable multi-valued property.
- */
+ /** A menu call-back for editing a modifiable multi-valued property. */
private final class MultiValuedPropertyEditor extends PropertyDefinitionVisitor<MenuResult<Boolean>, Void>
implements MenuCallback<Boolean> {
@@ -564,7 +525,6 @@
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Boolean> invoke(ConsoleApplication app) throws ClientException {
displayPropertyHeader(app, pd);
@@ -576,7 +536,6 @@
return result;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> MenuResult<Boolean> visitAggregation(
final AggregationPropertyDefinition<C, S> d, Void p) {
@@ -732,7 +691,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T extends Enum<T>> MenuResult<Boolean> visitEnum(final EnumPropertyDefinition<T> d, Void p) {
final SortedSet<T> defaultValues = mo.getPropertyDefaultValues(d);
@@ -868,7 +826,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T> MenuResult<Boolean> visitUnknown(final PropertyDefinition<T> d, Void p) {
app.println();
@@ -1228,9 +1185,7 @@
}
}
- /**
- * A help call-back which displays a description and summary of a single property.
- */
+ /** A help call-back which displays a description and summary of a single property. */
private static final class PropertyHelpCallback implements HelpCallback {
/** The managed object definition. */
@@ -1245,7 +1200,6 @@
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public void display(ConsoleApplication app) {
app.println();
@@ -1255,9 +1209,7 @@
}
}
- /**
- * A menu call-back for viewing a read-only properties.
- */
+ /** A menu call-back for viewing a read-only properties. */
private final class ReadOnlyPropertyViewer extends PropertyDefinitionVisitor<MenuResult<Boolean>, Void> implements
MenuCallback<Boolean> {
@@ -1276,7 +1228,6 @@
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Boolean> invoke(ConsoleApplication app) throws ClientException {
MenuResult<Boolean> result = pd.accept(this, null);
@@ -1286,7 +1237,6 @@
return result;
}
- /** {@inheritDoc} */
@Override
public <T> MenuResult<Boolean> visitUnknown(PropertyDefinition<T> pd, Void p) {
SortedSet<T> values = mo.getPropertyValues(pd);
@@ -1336,9 +1286,7 @@
}
}
- /**
- * A menu call-back for editing a modifiable single-valued property.
- */
+ /** A menu call-back for editing a modifiable single-valued property. */
private final class SingleValuedPropertyEditor extends PropertyDefinitionVisitor<MenuResult<Boolean>, Void>
implements MenuCallback<Boolean> {
@@ -1359,7 +1307,6 @@
this.pd = pd;
}
- /** {@inheritDoc} */
@Override
public MenuResult<Boolean> invoke(ConsoleApplication app) throws ClientException {
displayPropertyHeader(app, pd);
@@ -1371,7 +1318,6 @@
return result;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> MenuResult<Boolean> visitAggregation(
AggregationPropertyDefinition<C, S> d, Void p) {
@@ -1439,7 +1385,6 @@
return runMenu(d, builder);
}
- /** {@inheritDoc} */
@Override
public MenuResult<Boolean> visitBoolean(BooleanPropertyDefinition d, Void p) {
// Construct a menu of actions.
@@ -1495,7 +1440,6 @@
return runMenu(d, builder);
}
- /** {@inheritDoc} */
@Override
public <E extends Enum<E>> MenuResult<Boolean> visitEnum(EnumPropertyDefinition<E> d, Void p) {
// Construct a menu of actions.
@@ -1545,7 +1489,6 @@
return runMenu(d, builder);
}
- /** {@inheritDoc} */
@Override
public <T> MenuResult<Boolean> visitUnknown(final PropertyDefinition<T> d, Void p) {
app.println();
@@ -1877,9 +1820,7 @@
}
}
- /**
- * The threshold above which choice menus should be displayed in multiple columns.
- */
+ /** The threshold above which choice menus should be displayed in multiple columns. */
private static final int MULTI_COLUMN_THRESHOLD = 8;
/** The application console. */
@@ -2212,9 +2153,7 @@
return mods;
}
- /**
- * Clears the list of modifications.
- */
+ /** Clears the list of modifications. */
public void resetModifications() {
mods.clear();
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
index 1b435eb..6cf7949 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -35,26 +35,15 @@
*/
final class PropertyValuePrinter {
- /**
- * Perform property type specific print formatting.
- */
+ /** Perform property type specific print formatting. */
private static final class MyPropertyValueVisitor extends PropertyValueVisitor<LocalizableMessage, Void> {
- /**
- * The requested size unit (null if the property's unit should be used).
- */
+ /** The requested size unit (null if the property's unit should be used). */
private final SizeUnit sizeUnit;
-
- /**
- * The requested time unit (null if the property's unit should be used).
- */
+ /** The requested time unit (null if the property's unit should be used). */
private final DurationUnit timeUnit;
-
- /**
- * Whether or not values should be displayed in a script-friendly manner.
- */
+ /** Whether or not values should be displayed in a script-friendly manner. */
private final boolean isScriptFriendly;
-
/** The formatter to use for numeric values. */
private final NumberFormat numberFormat;
@@ -69,13 +58,11 @@
numberFormat.setMaximumFractionDigits(2);
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitBoolean(BooleanPropertyDefinition pd, Boolean v, Void p) {
return v ? INFO_VALUE_TRUE.get() : INFO_VALUE_FALSE.get();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitDuration(DurationPropertyDefinition pd, Long v, Void p) {
if (pd.getUpperLimit() == null && (v < 0 || v == Long.MAX_VALUE)) {
@@ -104,7 +91,6 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
@Override
public LocalizableMessage visitSize(SizePropertyDefinition pd, Long v, Void p) {
if (pd.isAllowUnlimited() && v < 0) {
@@ -129,7 +115,6 @@
return builder.toMessage();
}
- /** {@inheritDoc} */
@Override
public <T> LocalizableMessage visitUnknown(PropertyDefinition<T> pd, T v, Void p) {
// For all other property definition types the default encoding
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
index 9832348..a5f0365 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
@@ -74,64 +74,31 @@
*/
final class SetPropSubCommandHandler extends SubCommandHandler {
- /**
- * Type of modification being performed.
- */
+ /** Type of modification being performed. */
private static enum ModificationType {
- /**
- * Append a single value to the property.
- */
+ /** Append a single value to the property. */
ADD,
-
- /**
- * Remove a single value from the property.
- */
+ /** Remove a single value from the property. */
REMOVE,
-
- /**
- * Append a single value to the property (first invocation removes existing values).
- */
+ /** Append a single value to the property (first invocation removes existing values). */
SET;
}
- /**
- * The value for the long option add.
- */
+ /** The value for the long option add. */
private static final String OPTION_DSCFG_LONG_ADD = "add";
-
- /**
- * The value for the long option remove.
- */
+ /** The value for the long option remove. */
private static final String OPTION_DSCFG_LONG_REMOVE = "remove";
-
- /**
- * The value for the long option reset.
- */
+ /** The value for the long option reset. */
private static final String OPTION_DSCFG_LONG_RESET = "reset";
-
- /**
- * The value for the long option set.
- */
+ /** The value for the long option set. */
private static final String OPTION_DSCFG_LONG_SET = "set";
-
- /**
- * The value for the short option add.
- */
+ /** The value for the short option add. */
private static final Character OPTION_DSCFG_SHORT_ADD = null;
-
- /**
- * The value for the short option remove.
- */
+ /** The value for the short option remove. */
private static final Character OPTION_DSCFG_SHORT_REMOVE = null;
-
- /**
- * The value for the short option reset.
- */
+ /** The value for the short option reset. */
private static final Character OPTION_DSCFG_SHORT_RESET = null;
-
- /**
- * The value for the short option set.
- */
+ /** The value for the short option set. */
private static final Character OPTION_DSCFG_SHORT_SET = null;
/**
@@ -337,9 +304,7 @@
|| (!app.isAdvancedMode() && pd.hasOption(PropertyOption.ADVANCED));
}
- /**
- * Check that any referenced components are enabled if required.
- */
+ /** Check that any referenced components are enabled if required. */
private static MenuResult<Void> checkReferences(ConsoleApplication app, ManagementContext context,
ManagedObject<?> mo, SubCommandHandler handler) throws ClientException {
ManagedObjectDefinition<?, ?> d = mo.getManagedObjectDefinition();
@@ -524,26 +489,14 @@
/** The path of the managed object. */
private final ManagedObjectPath<?, ?> path;
- /**
- * The argument which should be used to specify zero or more property value adds.
- */
+ /** The argument which should be used to specify zero or more property value adds. */
private final StringArgument propertyAddArgument;
-
- /**
- * The argument which should be used to specify zero or more property value removes.
- */
+ /** The argument which should be used to specify zero or more property value removes. */
private final StringArgument propertyRemoveArgument;
-
- /**
- * The argument which should be used to specify zero or more property value resets.
- */
+ /** The argument which should be used to specify zero or more property value resets. */
private final StringArgument propertyResetArgument;
-
- /**
- * The argument which should be used to specify zero or more property value assignments.
- */
+ /** The argument which should be used to specify zero or more property value assignments. */
private final StringArgument propertySetArgument;
-
/** The sub-command associated with this handler. */
private final SubCommand subCommand;
@@ -607,7 +560,6 @@
return path.getRelationDefinition();
}
- /** {@inheritDoc} */
@Override
public SubCommand getSubCommand() {
return subCommand;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
index 7b96ffa..8d3540f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
@@ -112,7 +112,6 @@
/** The current result. */
private MenuResult<ManagedObject<?>> result;
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
InstantiableRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d,
@@ -183,7 +182,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
OptionalRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
@@ -222,7 +220,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SetRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
@@ -307,7 +304,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SingletonRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
@@ -472,7 +468,6 @@
this.isCreate = isCreate;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
InstantiableRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d,
@@ -512,14 +507,12 @@
}
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
OptionalRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
sz--;
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SetRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
@@ -543,7 +536,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> void appendManagedObjectPathElement(
SingletonRelationDefinition<? super C, ? super S> r, AbstractManagedObjectDefinition<C, S> d) {
@@ -596,7 +588,6 @@
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public final int compareTo(SubCommandHandler o) {
String s1 = getSubCommand().getName();
@@ -605,7 +596,6 @@
return s1.compareTo(s2);
}
- /** {@inheritDoc} */
@Override
public final boolean equals(Object obj) {
if (this == obj) {
@@ -670,7 +660,6 @@
return tags;
}
- /** {@inheritDoc} */
@Override
public final int hashCode() {
return getSubCommand().getName().hashCode();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
index a05b356..449145c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandlerFactory.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -44,7 +44,7 @@
*/
private final class Visitor implements RelationDefinitionVisitor<Void, ManagedObjectPath<?, ?>> {
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> Void visitInstantiable(
InstantiableRelationDefinition<C, S> rd, ManagedObjectPath<?, ?> p) {
try {
@@ -65,7 +65,7 @@
return null;
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> Void visitOptional(
OptionalRelationDefinition<C, S> rd, ManagedObjectPath<?, ?> p) {
try {
@@ -86,7 +86,7 @@
return null;
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> Void visitSet(SetRelationDefinition<C, S> rd,
ManagedObjectPath<?, ?> p) {
try {
@@ -107,7 +107,7 @@
return null;
}
- /** {@inheritDoc} */
+ @Override
public <C extends ConfigurationClient, S extends Configuration> Void visitSingleton(
SingletonRelationDefinition<C, S> rd, ManagedObjectPath<?, ?> p) {
try {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/package-info.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/package-info.java
index 3170b39..0acf5f2 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/package-info.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/package-info.java
@@ -11,10 +11,8 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
-/**
- * This package contains the DS config.
- */
+/** This package contains the DS config. */
package org.forgerock.opendj.config.dsconfig;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/AbstractConfigListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/AbstractConfigListenerAdaptor.java
index 905ea53..d108c83 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/AbstractConfigListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/AbstractConfigListenerAdaptor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -20,14 +21,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-/**
- * Common features of config listener adaptors.
- */
+/** Common features of config listener adaptors. */
abstract class AbstractConfigListenerAdaptor {
- /**
- * Create a new config listener adaptor.
- */
+ /** Create a new config listener adaptor. */
protected AbstractConfigListenerAdaptor() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigAddListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigAddListenerAdaptor.java
index a9fd4bf..6d5f15d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigAddListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigAddListenerAdaptor.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions copyright 2015 ForgeRock AS.
+ * Portions copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -140,7 +140,7 @@
this.cachedManagedObject = null;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationAdd(Entry configEntry) {
if (optionalRelation != null) {
// Optional managed objects are located directly beneath the
@@ -174,7 +174,7 @@
return result;
}
- /** {@inheritDoc} */
+ @Override
public boolean configAddIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason) {
DN dn = configEntry.getName();
String name = dn.rdn().getFirstAVA().getAttributeValue().toString().trim();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
index 9dd19c4..e829d03 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigChangeResult.java
@@ -40,14 +40,10 @@
*/
private boolean adminActionRequired;
- /**
- * The result code to return to the client from this configuration change.
- */
+ /** The result code to return to the client from this configuration change. */
private ResultCode resultCode = ResultCode.SUCCESS;
- /**
- * Creates a new config change result object with the provided information.
- */
+ /** Creates a new config change result object with the provided information. */
public ConfigChangeResult() {
// nothing more to do
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java
index 28643cb..f51deec 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigDeleteListenerAdaptor.java
@@ -141,7 +141,6 @@
this.cachedManagedObject = null;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationDelete(Entry configEntry) {
if (optionalRelation != null) {
@@ -177,7 +176,7 @@
return result;
}
- /** {@inheritDoc} */
+ @Override
public boolean configDeleteIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason) {
DN dn = configEntry.getName();
String name = dn.rdn().getFirstAVA().getAttributeValue().toString().trim();
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigException.java
index ec530a3..8aef7e3 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigException.java
@@ -12,16 +12,14 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
import org.forgerock.i18n.LocalizableException;
import org.forgerock.i18n.LocalizableMessage;
-/**
- * Thrown during the course of interactions with the Directory Server
- * configuration.
- */
+/** Thrown during the course of interactions with the Directory Server configuration. */
public final class ConfigException extends Exception implements LocalizableException {
private static final long serialVersionUID = -540463620272921157L;
private final LocalizableMessage message;
@@ -31,6 +29,7 @@
*
* @return LocalizableMessage of the problem
*/
+ @Override
public LocalizableMessage getMessageObject() {
return message;
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java
index 5a4cd17..d029773 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConfigExceptionFactory.java
@@ -23,9 +23,7 @@
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.ldap.DN;
-/**
- * A utility class for converting admin exceptions to config exceptions.
- */
+/** A utility class for converting admin exceptions to config exceptions. */
final class ConfigExceptionFactory {
/** The singleton instance. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java
index b4ef85e..2bd6e82 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ConstraintViolationException.java
@@ -34,9 +34,7 @@
*/
public class ConstraintViolationException extends DecodingException {
- /**
- * Serialization ID.
- */
+ /** Serialization ID. */
private static final long serialVersionUID = -4902443848460011875L;
/** The server managed object. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/DNBuilder.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/DNBuilder.java
index 2c515a3..ac35548 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/DNBuilder.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/DNBuilder.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -21,9 +22,7 @@
import org.forgerock.opendj.config.RelationDefinition;
import org.forgerock.opendj.ldap.DN;
-/**
- * A factory class for creating <code>DN</code>s from managed object paths.
- */
+/** A factory class for creating <code>DN</code>s from managed object paths. */
final class DNBuilder {
/**
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/DelayedConfigAddListener.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/DelayedConfigAddListener.java
index 67f80f5..6ca2a25 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/DelayedConfigAddListener.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/DelayedConfigAddListener.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2015 ForgeRock AS.
+ * Portions copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -100,7 +100,6 @@
this.delayedDeleteListener = deleteListener;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationAdd(Entry configEntry) {
if (configEntry.getName().equals(child)) {
@@ -129,7 +128,6 @@
return new ConfigChangeResult();
}
- /** {@inheritDoc} */
@Override
public boolean configAddIsAcceptable(Entry configEntry, LocalizableMessageBuilder unacceptableReason) {
// Always acceptable.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
index 469ab17..006da25 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -39,9 +40,7 @@
*/
public abstract class ServerConstraintHandler {
- /**
- * Creates a new server constraint handler.
- */
+ /** Creates a new server constraint handler. */
protected ServerConstraintHandler() {
// No implementation required.
}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
index 78b3a28..10844b7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
@@ -952,7 +952,6 @@
registerDeleteListener(baseDN, adaptor);
}
- /** {@inheritDoc} */
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
@@ -1181,10 +1180,7 @@
}
}
- /**
- * Register a delayed listener with the nearest existing parent
- * entry to the provided base DN.
- */
+ /** Register a delayed listener with the nearest existing parent entry to the provided base DN. */
private void registerDelayedListener(DN baseDN, ConfigAddListener delayedListener) throws ConfigException {
DN currentDN = baseDN.parent();
DN previousDN = currentDN;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListenerAdaptor.java
index f875a06..d52fa09 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectAddListenerAdaptor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -44,7 +45,7 @@
this.listener = listener;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationAdd(ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationAdd(mo.getConfiguration());
}
@@ -59,7 +60,7 @@
return listener;
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationAddAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons) {
return listener.isConfigurationAddAcceptable(mo.getConfiguration(), unacceptableReasons);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListenerAdaptor.java
index 78fcb98..5aff2bc 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectChangeListenerAdaptor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -44,7 +45,6 @@
this.listener = listener;
}
- /** {@inheritDoc} */
@Override
public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationChange(mo.getConfiguration());
@@ -60,7 +60,6 @@
return listener;
}
- /** {@inheritDoc} */
@Override
public boolean isConfigurationChangeAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java
index 0da655b..250c104 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDecodingException.java
@@ -36,9 +36,7 @@
*/
public class ServerManagedObjectDecodingException extends DecodingException {
- /**
- * Version ID required by serializable classes.
- */
+ /** Version ID required by serializable classes. */
private static final long serialVersionUID = 1598401431084729853L;
/** Create the message. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListenerAdaptor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListenerAdaptor.java
index 2190da8..f04ab20 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListenerAdaptor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObjectDeleteListenerAdaptor.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -44,7 +45,7 @@
this.listener = listener;
}
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationDelete(ServerManagedObject<? extends T> mo) {
return listener.applyConfigurationDelete(mo.getConfiguration());
}
@@ -59,7 +60,7 @@
return listener;
}
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationDeleteAcceptable(ServerManagedObject<? extends T> mo,
List<LocalizableMessage> unacceptableReasons) {
return listener.isConfigurationDeleteAcceptable(mo.getConfiguration(), unacceptableReasons);
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
index 9c39c74..baa9ce5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
@@ -70,9 +70,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Server management connection context.
- */
+/** Server management connection context. */
public final class ServerManagementContext {
/**
@@ -87,10 +85,7 @@
/** Any exception that occurred whilst retrieving inherited default values. */
private PropertyException exception;
- /**
- * Optional new configuration entry which does not yet exist in
- * the configuration back-end.
- */
+ /** Optional new configuration entry which does not yet exist in the configuration back-end. */
private final Entry newConfigEntry;
/** The path of the managed object containing the next property. */
@@ -104,7 +99,6 @@
this.newConfigEntry = newConfigEntry;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> d, Void p) {
try {
@@ -116,13 +110,11 @@
}
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAlias(AliasDefaultBehaviorProvider<T> d, Void p) {
return Collections.emptySet();
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitDefined(DefinedDefaultBehaviorProvider<T> d, Void p) {
Collection<String> stringValues = d.getDefaultValues();
@@ -140,7 +132,6 @@
return values;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d, Void p) {
try {
@@ -152,7 +143,6 @@
}
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitUndefined(UndefinedDefaultBehaviorProvider<T> d, Void p) {
return Collections.emptySet();
@@ -248,7 +238,6 @@
this.entry = entry;
}
- /** {@inheritDoc} */
@Override
public boolean matches(AbstractManagedObjectDefinition<?, ?> d) {
String oc = LDAPProfile.getInstance().getObjectClass(d);
@@ -264,9 +253,7 @@
}
}
- /**
- * A visitor which is used to decode property LDAP values.
- */
+ /** A visitor which is used to decode property LDAP values. */
private static final class ValueDecoder extends PropertyDefinitionVisitor<Object, String> {
/**
@@ -292,7 +279,6 @@
// Do nothing.
}
- /** {@inheritDoc} */
@Override
public <C extends ConfigurationClient, S extends Configuration> Object visitAggregation(
AggregationPropertyDefinition<C, S> d, String p) {
@@ -306,7 +292,6 @@
}
}
- /** {@inheritDoc} */
@Override
public <T> Object visitUnknown(PropertyDefinition<T> d, String p) {
// By default the property definition's decoder will do.
@@ -316,9 +301,7 @@
private static final Logger debugLogger = LoggerFactory.getLogger(ServerManagementContext.class);
- /**
- * The root server managed object, lazily initialized.
- */
+ /** The root server managed object, lazily initialized. */
private volatile ServerManagedObject<RootCfg> root;
/** Repository of configuration entries. */
@@ -752,10 +735,7 @@
return configRepository;
}
- /**
- * Gets a config entry required for a managed object and throws a
- * config exception on failure.
- */
+ /** Gets a config entry required for a managed object and throws a config exception on failure. */
private Entry getManagedObjectConfigEntry(DN dn) throws ConfigException {
Entry configEntry;
try {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
index 7c5a80e..bc7a7bb 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/spi/ConfigurationRepository.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server.spi;
@@ -22,9 +22,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
-/**
- * Provides configuration entries and listener registration on the entries.
- */
+/** Provides configuration entries and listener registration on the entries. */
public interface ConfigurationRepository {
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java b/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
index 776ba60..21c4e92 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -26,16 +27,12 @@
import org.forgerock.opendj.server.config.server.RootCfg;
import org.testng.annotations.Test;
-/**
- * An abstract class that all admin unit tests should extend.
- */
+/** An abstract class that all admin unit tests should extend. */
@SuppressWarnings("javadoc")
@Test(groups = { "precommit", "admin" }, singleThreaded = true)
public abstract class AdminTestCase extends ConfigTestCase {
- /**
- * Create a mock of ConfigurationRepository with provided entries registered.
- */
+ /** Create a mock of ConfigurationRepository with provided entries registered. */
protected final ConfigurationRepository createConfigRepositoryWithEntries(final Entry...entries) throws Exception {
ConfigurationRepository configRepository = mock(ConfigurationRepository.class);
for (Entry entry : entries) {
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigTestCase.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigTestCase.java
index 1f62eea..9ae74d6 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigTestCase.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigTestCase.java
@@ -11,16 +11,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
import org.forgerock.testng.ForgeRockTestCase;
import org.testng.annotations.Test;
-/**
- * An abstract class that all unit tests should extend.
- */
+/** An abstract class that all unit tests should extend. */
@Test(groups = { "precommit", "config" })
public abstract class ConfigTestCase extends ForgeRockTestCase {
// no implementation
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
index bcd4d82..786a049 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -71,7 +71,6 @@
private static final long serialVersionUID = 1L;
- /** {@inheritDoc} */
@Override
public Object answer(InvocationOnMock invocation) {
try {
@@ -110,9 +109,7 @@
return definitionClass.getMethod(invokedMethodName.replaceAll("^is", "get") + "PropertyDefinition");
}
- /**
- * Returns the type of values returned by the property.
- */
+ /** Returns the type of values returned by the property. */
private Class<?> getPropertyReturnType(Method getPropertyDefMethod) {
Class<?> returnClass = getPropertyDefMethod.getReturnType();
return ((ParameterizedType) returnClass.getGenericSuperclass())
@@ -182,23 +179,19 @@
this.propertyDef = propertyDef;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider<T> provider, Void p) {
// not handled
return null;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitAlias(AliasDefaultBehaviorProvider<T> provider, Void p) {
// not handled
return null;
}
- /**
- * Returns the default value for the property as a collection.
- */
+ /** Returns the default value for the property as a collection. */
@Override
public Collection<T> visitDefined(DefinedDefaultBehaviorProvider<T> provider, Void p) {
SortedSet<T> values = new TreeSet<>();
@@ -208,14 +201,12 @@
return values;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider<T> d, Void p) {
// not handled
return null;
}
- /** {@inheritDoc} */
@Override
public Collection<T> visitUndefined(UndefinedDefaultBehaviorProvider<T> d, Void p) {
// not handled
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java
index 81f576e..ca29270 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -29,9 +29,7 @@
import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.testng.annotations.Test;
-/**
- * Test case to ensure that ConfigurationMock class is correct.
- */
+/** Test case to ensure that ConfigurationMock class is correct. */
@SuppressWarnings("javadoc")
public class ConfigurationMockTest extends ConfigTestCase {
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java
index 16455b2..8f839f8 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -210,6 +211,7 @@
builder.setAllowUnlimited(true);
DurationPropertyDefinition def = buildTestDefinition(builder);
PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {
+ @Override
public Boolean visitDuration(DurationPropertyDefinition d, Void o) {
return true;
}
@@ -253,6 +255,7 @@
DurationPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Long>() {
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<Long, R, P> v, P p) {
return null;
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
index 93bd7ed..03bef6f 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -44,18 +45,14 @@
assertNotNull(builder);
}
- /**
- * Tests that exception thrown when no enum class specified by builder.
- */
+ /** Tests that exception thrown when no enum class specified by builder. */
@Test
public void testBuildInstance() {
EnumPropertyDefinition<?> def = builder.getInstance();
assertEquals(def.getEnumClass(), TestEnum.class);
}
- /**
- * Tests that exception thrown when no enum class specified by builder.
- */
+ /** Tests that exception thrown when no enum class specified by builder. */
@Test(expectedExceptions = { IllegalStateException.class })
public void testBuildInstanceWithoutEnumClassSpecified() {
EnumPropertyDefinition.Builder<TestEnum> localBuilder = EnumPropertyDefinition.createBuilder(
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
index 8812785..d7f38a8 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -166,6 +167,7 @@
builder.setAllowUnlimited(true);
IntegerPropertyDefinition propertyDef = buildTestDefinition(builder);
PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {
+ @Override
public Boolean visitInteger(IntegerPropertyDefinition d, Void o) {
return true;
}
@@ -200,6 +202,7 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Integer>() {
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<Integer, R, P> v, P p) {
return null;
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java b/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java
index b191e47..14ce78b 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java
@@ -12,23 +12,19 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
-/**
- * A mock LDAP profile wrapper for testing purposes.
- */
+/** A mock LDAP profile wrapper for testing purposes. */
public final class MockLDAPProfile extends LDAPProfile.Wrapper {
- /**
- * Creates a new mock LDAP profile.
- */
+ /** Creates a new mock LDAP profile. */
public MockLDAPProfile() {
// No implementation required.
}
- /** {@inheritDoc} */
@Override
public String getAttributeName(AbstractManagedObjectDefinition<?, ?> d, PropertyDefinition<?> pd) {
@@ -70,7 +66,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public String getRelationChildRDNType(InstantiableRelationDefinition<?, ?> r) {
if (r == TestCfg.getTestOneToManyParentRelationDefinition()
@@ -80,7 +75,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public String getObjectClass(AbstractManagedObjectDefinition<?, ?> d) {
if (d == TestParentCfgDefn.getInstance()) {
@@ -93,7 +87,6 @@
}
}
- /** {@inheritDoc} */
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
if (r == TestCfg.getTestOneToManyParentRelationDefinition()) {
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
index b3494ea..dfd67ea 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -45,22 +45,27 @@
public void testAccept() {
defaultBehaviorProvider.accept(new DefaultBehaviorProviderVisitor<Boolean, Object, Object>() {
+ @Override
public Object visitAbsoluteInherited(AbsoluteInheritedDefaultBehaviorProvider d, Object o) {
return null;
}
+ @Override
public Object visitAlias(AliasDefaultBehaviorProvider d, Object o) {
return null;
}
+ @Override
public Object visitDefined(DefinedDefaultBehaviorProvider d, Object o) {
return null;
}
+ @Override
public Object visitRelativeInherited(RelativeInheritedDefaultBehaviorProvider d, Object o) {
return null;
}
+ @Override
public Object visitUndefined(UndefinedDefaultBehaviorProvider d, Object o) {
return null;
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java
index 8ba4d29..45a2f7d 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -186,6 +187,7 @@
builder.setAllowUnlimited(true);
SizePropertyDefinition propertyDef = buildTestDefinition(builder);
PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {
+ @Override
public Boolean visitSize(SizePropertyDefinition d, Void o) {
return true;
}
@@ -219,6 +221,7 @@
SizePropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Long>() {
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<Long, R, P> v, P p) {
return null;
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
index 272a41b..7c9562a 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -20,20 +20,13 @@
import org.forgerock.opendj.server.config.meta.RootCfgDefn;
-/**
- * Common methods for hooking in the test components.
- */
+/** Common methods for hooking in the test components. */
public final class TestCfg {
- /**
- * A one-to-many relation between the root and test-parent components.
- */
+ /** A one-to-many relation between the root and test-parent components. */
private static final InstantiableRelationDefinition<TestParentCfgClient, TestParentCfg> RD_TEST_ONE_TO_MANY_PARENT;
- /**
- * A one-to-zero-or-one relation between the root and a test-parent
- * component.
- */
+ /** A one-to-zero-or-one relation between the root and a test-parent component. */
// @Checkstyle:off
private static final OptionalRelationDefinition<TestParentCfgClient, TestParentCfg>
RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT;
@@ -83,9 +76,7 @@
ManagedObjectDefinitionI18NResource.getInstance().setResourceBundle(definition, resourceBundle);
}
- /**
- * Deregisters the test configurations from the administration framework.
- */
+ /** Deregisters the test configurations from the administration framework. */
public static synchronized void cleanup() {
LDAPProfile.getInstance().popWrapper();
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java
index b891950..00de25d 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -34,6 +35,7 @@
*
* @return Returns the configuration class associated with this Test Child.
*/
+ @Override
Class<? extends TestChildCfg> configurationClass();
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java
index 1d69c8a..3d9f0c3 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -35,6 +36,7 @@
* @return Returns the configuration definition associated with this Test
* Child.
*/
+ @Override
ManagedObjectDefinition<? extends TestChildCfgClient, ? extends TestChildCfg> definition();
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java
index 34a461b..3c93a6e 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -105,10 +105,7 @@
INSTANCE.registerPropertyDefinition(PROPDEF_MANDATORY_CLASS_PROPERTY);
}
- /**
- * Build the "mandatory-read-only-attribute-type-property" property
- * definition.
- */
+ /** Build the "mandatory-read-only-attribute-type-property" property definition. */
static {
AttributeTypePropertyDefinition.Builder builder = AttributeTypePropertyDefinition.createBuilder(INSTANCE,
"mandatory-read-only-attribute-type-property");
@@ -158,24 +155,22 @@
return INSTANCE;
}
- /**
- * Private constructor.
- */
+ /** Private constructor. */
private TestChildCfgDefn() {
super("test-child", null);
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfgClient createClientConfiguration(ManagedObject<? extends TestChildCfgClient> impl) {
return new TestChildCfgClientImpl(impl);
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfg createServerConfiguration(ServerManagedObject<? extends TestChildCfg> impl) {
return new TestChildCfgServerImpl(impl);
}
- /** {@inheritDoc} */
+ @Override
public Class<TestChildCfg> getServerConfigurationClass() {
return TestChildCfg.class;
}
@@ -255,9 +250,7 @@
return PROPDEF_OPTIONAL_MULTI_VALUED_DN_PROPERTY2;
}
- /**
- * Managed object client implementation.
- */
+ /** Managed object client implementation. */
private static class TestChildCfgClientImpl implements TestChildCfgClient {
/** Private implementation. */
@@ -268,77 +261,77 @@
this.impl = impl;
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<String> getAggregationProperty() {
return impl.getPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setAggregationProperty(Collection<String> values) {
impl.setPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition(), values);
}
- /** {@inheritDoc} */
+ @Override
public Boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryBooleanProperty(boolean value) {
impl.setPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryClassProperty(String value) {
impl.setPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryReadOnlyAttributeTypeProperty(AttributeType value) throws PropertyException {
impl.setPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty1() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setOptionalMultiValuedDNProperty1(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition(), values);
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty2() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setOptionalMultiValuedDNProperty2(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition(), values);
}
- /** {@inheritDoc} */
+ @Override
public ManagedObjectDefinition<? extends TestChildCfgClient, ? extends TestChildCfg> definition() {
return INSTANCE;
}
- /** {@inheritDoc} */
+ @Override
public PropertyProvider properties() {
return impl;
}
- /** {@inheritDoc} */
+ @Override
public void commit() throws ManagedObjectAlreadyExistsException, MissingMandatoryPropertiesException,
ConcurrentModificationException, OperationRejectedException, LdapException {
impl.commit();
@@ -346,9 +339,7 @@
}
- /**
- * Managed object server implementation.
- */
+ /** Managed object server implementation. */
private static class TestChildCfgServerImpl implements TestChildCfg {
/** Private implementation. */
@@ -359,52 +350,52 @@
this.impl = impl;
}
- /** {@inheritDoc} */
+ @Override
public void addChangeListener(ConfigurationChangeListener<TestChildCfg> listener) {
impl.registerChangeListener(listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeChangeListener(ConfigurationChangeListener<TestChildCfg> listener) {
impl.deregisterChangeListener(listener);
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<String> getAggregationProperty() {
return impl.getPropertyValues(INSTANCE.getAggregationPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty1() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty1PropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty2() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNProperty2PropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public Class<? extends TestChildCfg> configurationClass() {
return TestChildCfg.class;
}
- /** {@inheritDoc} */
+ @Override
public DN dn() {
return impl.getDN();
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
index 9a02fa9..ed98f59 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -37,6 +38,7 @@
*
* @return Returns the configuration class associated with this Test Parent.
*/
+ @Override
Class<? extends TestParentCfg> configurationClass();
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
index 3250002..36594aa 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -41,6 +41,7 @@
* @return Returns the configuration definition associated with this Test
* Parent.
*/
+ @Override
ManagedObjectDefinition<? extends TestParentCfgClient, ? extends TestParentCfg> definition();
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
index 49876bf..567c7bc 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -91,10 +91,7 @@
INSTANCE.registerPropertyDefinition(PD_MANDATORY_CLASS_PROPERTY);
}
- /**
- * Build the "mandatory-read-only-attribute-type-property" property
- * definition.
- */
+ /** Build the "mandatory-read-only-attribute-type-property" property definition. */
static {
AttributeTypePropertyDefinition.Builder builder = AttributeTypePropertyDefinition.createBuilder(INSTANCE,
"mandatory-read-only-attribute-type-property");
@@ -148,24 +145,22 @@
return INSTANCE;
}
- /**
- * Private constructor.
- */
+ /** Private constructor. */
private TestParentCfgDefn() {
super("test-parent", null);
}
- /** {@inheritDoc} */
+ @Override
public TestParentCfgClient createClientConfiguration(ManagedObject<? extends TestParentCfgClient> impl) {
return new TestParentCfgClientImpl(impl);
}
- /** {@inheritDoc} */
+ @Override
public TestParentCfg createServerConfiguration(ServerManagedObject<? extends TestParentCfg> impl) {
return new TestParentCfgServerImpl(impl);
}
- /** {@inheritDoc} */
+ @Override
public Class<TestParentCfg> getServerConfigurationClass() {
return TestParentCfg.class;
}
@@ -235,9 +230,7 @@
return RD_OPTIONAL_TEST_CHILD;
}
- /**
- * Managed object client implementation.
- */
+ /** Managed object client implementation. */
private static class TestParentCfgClientImpl implements TestParentCfgClient {
/** Private implementation. */
@@ -248,107 +241,107 @@
this.impl = impl;
}
- /** {@inheritDoc} */
+ @Override
public Boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryBooleanProperty(boolean value) {
impl.setPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryClassProperty(String value) {
impl.setPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setMandatoryReadOnlyAttributeTypeProperty(AttributeType value) throws PropertyException {
impl.setPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition(), value);
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public void setOptionalMultiValuedDNProperty(Collection<DN> values) {
impl.setPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition(), values);
}
- /** {@inheritDoc} */
+ @Override
public String[] listTestChildren() throws ConcurrentModificationException, LdapException {
return impl.listChildren(INSTANCE.getTestChildrenRelationDefinition());
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfgClient getTestChild(String name) throws DefinitionDecodingException,
ManagedObjectDecodingException, ManagedObjectNotFoundException, ConcurrentModificationException,
LdapException {
return impl.getChild(INSTANCE.getTestChildrenRelationDefinition(), name).getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public <M extends TestChildCfgClient> M createTestChild(ManagedObjectDefinition<M, ? extends TestChildCfg> d,
String name, Collection<PropertyException> exceptions) throws IllegalManagedObjectNameException {
return impl.createChild(INSTANCE.getTestChildrenRelationDefinition(), d, name, exceptions)
.getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public void removeTestChild(String name) throws ManagedObjectNotFoundException,
ConcurrentModificationException, OperationRejectedException, LdapException {
impl.removeChild(INSTANCE.getTestChildrenRelationDefinition(), name);
}
- /** {@inheritDoc} */
+ @Override
public boolean hasOptionalTestChild() throws ConcurrentModificationException, LdapException {
return impl.hasChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfgClient getOptionalChild() throws DefinitionDecodingException,
ManagedObjectDecodingException, ManagedObjectNotFoundException, ConcurrentModificationException,
LdapException {
return impl.getChild(INSTANCE.getOptionalTestChildRelationDefinition()).getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public <M extends TestChildCfgClient> M createOptionalTestChild(
ManagedObjectDefinition<M, ? extends TestChildCfg> d, Collection<PropertyException> exceptions) {
return impl.createChild(INSTANCE.getOptionalTestChildRelationDefinition(), d, exceptions)
.getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public void removeOptionalTestChild() throws ManagedObjectNotFoundException, ConcurrentModificationException,
OperationRejectedException, LdapException {
impl.removeChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
- /** {@inheritDoc} */
+ @Override
public ManagedObjectDefinition<? extends TestParentCfgClient, ? extends TestParentCfg> definition() {
return INSTANCE;
}
- /** {@inheritDoc} */
+ @Override
public PropertyProvider properties() {
return impl;
}
- /** {@inheritDoc} */
+ @Override
public void commit() throws ManagedObjectAlreadyExistsException, MissingMandatoryPropertiesException,
ConcurrentModificationException, OperationRejectedException, LdapException {
impl.commit();
@@ -356,9 +349,7 @@
}
- /**
- * Managed object server implementation.
- */
+ /** Managed object server implementation. */
private static class TestParentCfgServerImpl implements TestParentCfg {
/** Private implementation. */
@@ -369,105 +360,105 @@
this.impl = impl;
}
- /** {@inheritDoc} */
+ @Override
public void addChangeListener(ConfigurationChangeListener<TestParentCfg> listener) {
impl.registerChangeListener(listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeChangeListener(ConfigurationChangeListener<TestParentCfg> listener) {
impl.deregisterChangeListener(listener);
}
- /** {@inheritDoc} */
+ @Override
public boolean isMandatoryBooleanProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryBooleanPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public String getMandatoryClassProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryClassPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public AttributeType getMandatoryReadOnlyAttributeTypeProperty() {
return impl.getPropertyValue(INSTANCE.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public SortedSet<DN> getOptionalMultiValuedDNProperty() {
return impl.getPropertyValues(INSTANCE.getOptionalMultiValuedDNPropertyPropertyDefinition());
}
- /** {@inheritDoc} */
+ @Override
public String[] listTestChildren() {
return impl.listChildren(INSTANCE.getTestChildrenRelationDefinition());
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfg getTestChild(String name) throws ConfigException {
return impl.getChild(INSTANCE.getTestChildrenRelationDefinition(), name).getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public void addTestChildAddListener(ConfigurationAddListener<TestChildCfg> listener) throws ConfigException {
impl.registerAddListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeTestChildAddListener(ConfigurationAddListener<TestChildCfg> listener) {
impl.deregisterAddListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void addTestChildDeleteListener(ConfigurationDeleteListener<TestChildCfg> listener)
throws ConfigException {
impl.registerDeleteListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeTestChildDeleteListener(ConfigurationDeleteListener<TestChildCfg> listener) {
impl.deregisterDeleteListener(INSTANCE.getTestChildrenRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public boolean hasOptionalTestChild() {
return impl.hasChild(INSTANCE.getOptionalTestChildRelationDefinition());
}
- /** {@inheritDoc} */
+ @Override
public TestChildCfg getOptionalTestChild() throws ConfigException {
return impl.getChild(INSTANCE.getOptionalTestChildRelationDefinition()).getConfiguration();
}
- /** {@inheritDoc} */
+ @Override
public void addOptionalTestChildAddListener(ConfigurationAddListener<TestChildCfg> listener)
throws ConfigException {
impl.registerAddListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeOptionalTestChildAddListener(ConfigurationAddListener<TestChildCfg> listener) {
impl.deregisterAddListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void addOptionalChildTestDeleteListener(ConfigurationDeleteListener<TestChildCfg> listener)
throws ConfigException {
impl.registerDeleteListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public void removeOptionalTestChildDeleteListener(ConfigurationDeleteListener<TestChildCfg> listener) {
impl.deregisterDeleteListener(INSTANCE.getOptionalTestChildRelationDefinition(), listener);
}
- /** {@inheritDoc} */
+ @Override
public Class<? extends TestParentCfg> configurationClass() {
return TestParentCfg.class;
}
- /** {@inheritDoc} */
+ @Override
public DN dn() {
return impl.getDN();
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java
index 152c37b..16d46dc 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2011-2015 ForgeRock AS.
+ * Portions copyright 2011-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -66,7 +66,7 @@
private static final List<String> CLASS_OBJECT_CLASS_EXCEPTIONS = Arrays.asList(new String[] {
"org.forgerock.opendj.config.std.meta.RootCfgDefn", "org.forgerock.opendj.config.std.meta.GlobalCfgDefn", });
- // TODO : does not work because can't retrieve object class objects
+ /** TODO : does not work because can't retrieve object class objects */
@Test(enabled = false, dataProvider = "enumerateManageObjectDefns")
public void validateConfigObjectDefinitions(AbstractManagedObjectDefinition<?, ?> objectDef) {
String objName = objectDef.getName();
@@ -108,10 +108,7 @@
// e.g. "prop-name-ending-with-enabled"
});
- /**
- * Exceptions to properties not starting with the name of their config
- * object.
- */
+ /** Exceptions to properties not starting with the name of their config object. */
private static final List<String> OBJECT_PREFIX_PROPERTY_EXCEPTIONS = Arrays.asList(new String[] { "backend-id",
"plugin-type", "replication-server-id", "network-group-id", "workflow-id", "workflow-element-id",
"workflow-element"
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
index 2b9c8d8..c710270 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
@@ -161,9 +161,7 @@
TestCfg.setUp();
}
- /**
- * Tears down test environment.
- */
+ /** Tears down test environment. */
@AfterClass
public void tearDown() {
TestCfg.cleanup();
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockConstraint.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockConstraint.java
index 38d28ef..6aea957 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockConstraint.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockConstraint.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.client.ldap;
@@ -28,18 +28,12 @@
import org.forgerock.opendj.config.server.ServerConstraintHandler;
import org.forgerock.opendj.ldap.LdapException;
-/**
- * A mock constraint which can be configured to refuse various types of
- * operation.
- */
+/** A mock constraint which can be configured to refuse various types of operation. */
public final class MockConstraint extends Constraint {
- /**
- * Mock client constraint handler.
- */
+ /** Mock client constraint handler. */
private class Handler extends ClientConstraintHandler {
- /** {@inheritDoc} */
@Override
public boolean isAddAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -50,7 +44,6 @@
return allowAdds;
}
- /** {@inheritDoc} */
@Override
public boolean isDeleteAcceptable(ManagementContext context, ManagedObjectPath<?, ?> path,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -61,7 +54,6 @@
return allowDeletes;
}
- /** {@inheritDoc} */
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
@@ -99,12 +91,12 @@
this.allowDeletes = allowDeletes;
}
- /** {@inheritDoc} */
+ @Override
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
return Collections.<ClientConstraintHandler> singleton(new Handler());
}
- /** {@inheritDoc} */
+ @Override
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.emptySet();
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
index dd46322..7267b2f 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions copyright 2013-2015 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -54,37 +54,35 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-/**
- * Test cases for aggregations on the server-side.
- */
+/** Test cases for aggregations on the server-side. */
@Test(singleThreaded = true)
@SuppressWarnings("javadoc")
public final class AggregationServerTest extends AdminTestCase {
- /**
- * Dummy change listener for triggering change constraint call-backs.
- */
+ /** Dummy change listener for triggering change constraint call-backs. */
private static final class DummyChangeListener implements ConfigurationChangeListener<TestChildCfg> {
+ @Override
public ConfigChangeResult applyConfigurationChange(TestChildCfg configuration) {
return new ConfigChangeResult();
}
+ @Override
public boolean isConfigurationChangeAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
return true;
}
}
- /**
- * Dummy delete listener for triggering delete constraint call-backs.
- */
+ /** Dummy delete listener for triggering delete constraint call-backs. */
private static final class DummyDeleteListener implements ConfigurationDeleteListener<TestChildCfg> {
+ @Override
public ConfigChangeResult applyConfigurationDelete(TestChildCfg configuration) {
return new ConfigChangeResult();
}
+ @Override
public boolean isConfigurationDeleteAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
return true;
@@ -213,16 +211,11 @@
// @Checkstyle:on
// @Checkstyle:off
- /**
- * The default test child configuration "aggregation-property" property
- * definition.
- */
+ /** The default test child configuration "aggregation-property" property definition. */
private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg>
aggregationPropertyDefinitionDefault;
- /**
- * An aggregation where the target must be enabled if the source is enabled.
- */
+ /** An aggregation where the target must be enabled if the source is enabled. */
private AggregationPropertyDefinition<ConnectionHandlerCfgClient, ConnectionHandlerCfg>
aggregationPropertyDefinitionTargetAndSourceMustBeEnabled;
@@ -578,9 +571,7 @@
TestCfg.addConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled.getSourceConstraint());
}
- /**
- * Put back the default aggregation definition.
- */
+ /** Put back the default aggregation definition. */
private void putBackDefaultAggregationDefinitionFromTargetAndSourceEnabled() {
TestCfg.removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled.getSourceConstraint());
TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
@@ -598,9 +589,7 @@
TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled.getSourceConstraint());
}
- /**
- * Put back the default aggregation definition.
- */
+ /** Put back the default aggregation definition. */
private void putBackDefaultAggregationDefinitionFromTargetEnabled() {
TestCfg.removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled.getSourceConstraint());
TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java
index 9d70e99..6937915 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2015 ForgeRock AS.
+ * Portions copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -43,18 +43,18 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-/**
- * Test cases for constraints on the server-side.
- */
+/** Test cases for constraints on the server-side. */
@SuppressWarnings("javadoc")
public final class ConstraintTest extends AdminTestCase {
private static class AddListener implements ConfigurationAddListener<TestChildCfg> {
+ @Override
public ConfigChangeResult applyConfigurationAdd(TestChildCfg configuration) {
return new ConfigChangeResult();
}
+ @Override
public boolean isConfigurationAddAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
return true;
@@ -63,10 +63,12 @@
private static class DeleteListener implements ConfigurationDeleteListener<TestChildCfg> {
+ @Override
public ConfigChangeResult applyConfigurationDelete(TestChildCfg configuration) {
return new ConfigChangeResult();
}
+ @Override
public boolean isConfigurationDeleteAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
return true;
@@ -76,10 +78,12 @@
private static class ChangeListener implements ConfigurationChangeListener<TestChildCfg> {
+ @Override
public ConfigChangeResult applyConfigurationChange(TestChildCfg configuration) {
return new ConfigChangeResult();
}
+ @Override
public boolean isConfigurationChangeAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
return true;
@@ -104,10 +108,7 @@
"objectclass: ds-cfg-branch",
"cn: test children");
- /**
- * Parent 1 - uses default values for
- * optional-multi-valued-dn-property.
- */
+ /** Parent 1 - uses default values for optional-multi-valued-dn-property. */
private static final Entry TEST_PARENT_1 = LDIF.makeEntry(
"dn: cn=test parent 1,cn=test parents,cn=config",
"objectclass: top",
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java
index 487df8e..4026ecb 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -66,6 +66,7 @@
final SingletonRelationDefinition<TestChildCfgClient, TestChildCfg> relationDef = builder.getInstance();
LDAPProfile.Wrapper wrapper = new LDAPProfile.Wrapper() {
+ @Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
return (r == relationDef) ? "cn=singleton-test-child" : null;
}
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java
index 1894376..5cdb349 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2015 ForgeRock AS.
+ * Portions copyright 2015-2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -47,15 +47,14 @@
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
-/**
- * Test default behavior on the server side, by checking values of configuration objects.
- */
+/** Test default behavior on the server side, by checking values of configuration objects. */
public final class DefaultBehaviorTest extends AdminTestCase {
private static class TestConfigurationAddListener implements ConfigurationAddListener<TestChildCfg> {
private TestChildCfg childCfg;
+ @Override
public ConfigChangeResult applyConfigurationAdd(TestChildCfg configuration) {
return new ConfigChangeResult();
}
@@ -67,6 +66,7 @@
return childCfg;
}
+ @Override
public boolean isConfigurationAddAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
childCfg = configuration;
@@ -78,6 +78,7 @@
private TestChildCfg childCfg;
+ @Override
public ConfigChangeResult applyConfigurationChange(TestChildCfg configuration) {
return new ConfigChangeResult();
}
@@ -89,6 +90,7 @@
return childCfg;
}
+ @Override
public boolean isConfigurationChangeAcceptable(TestChildCfg configuration,
List<LocalizableMessage> unacceptableReasons) {
childCfg = configuration;
@@ -243,10 +245,7 @@
Arrays.asList("dc=default value p2v1,dc=com", "dc=default value p2v2,dc=com") } };
}
- /**
- * Test that a child config have correct values when accessed from its
- * parent config.
- */
+ /** Test that a child config have correct values when accessed from its parent config. */
@Test(dataProvider = "childConfigurationsValues")
public void testChildValues(Entry testParent, Entry testBaseChild, Entry testChild,
List<String> valuesForOptionalDNProperty1, List<String> valuesForOptionalDNProperty2) throws Exception {
@@ -262,10 +261,7 @@
valuesForOptionalDNProperty2);
}
- /**
- * Test that a child config have correct values when accessed through an add
- * listener.
- */
+ /** Test that a child config have correct values when accessed through an add listener. */
@Test(dataProvider = "childConfigurationsValues")
public void testAddListenerChildValues(Entry testParent, Entry testBaseChild, Entry testChild,
List<String> valuesForOptionalDNProperty1, List<String> valuesForOptionalDNProperty2) throws Exception {
@@ -343,9 +339,7 @@
{ TEST_PARENT_2, Arrays.asList("dc=default value p2v1,dc=com", "dc=default value p2v2,dc=com") } };
}
- /**
- * Tests that parent configuration has correct values.
- */
+ /** Tests that parent configuration has correct values. */
@Test(dataProvider = "parentConfigurationsValues")
public void testParentValues(Entry parentEntry, List<String> valuesForOptionalDNProperty) throws Exception {
ConfigurationRepository configRepository = createConfigRepositoryWithEntries(parentEntry);
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java
index be70aab..4ede6bc 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -62,9 +63,7 @@
"cn: test parents");
}
- /**
- * Create a mock of ConfigurationRepository with provided DNs registered.
- */
+ /** Create a mock of ConfigurationRepository with provided DNs registered. */
private ConfigurationRepository createConfigRepositoryWithDNs(DN... dns) throws ConfigException {
ConfigurationRepository configRepository = mock(ConfigurationRepository.class);
for (DN dn : dns) {
@@ -73,10 +72,7 @@
return configRepository;
}
- /**
- * Register a listener for test parent entry and return the actual
- * registered listener.
- */
+ /** Register a listener for test parent entry and return the actual registered listener. */
private ConfigAddListener registerAddListenerForTestParent(ConfigurationRepository configRepository,
ServerManagedObject<RootCfg> root, ConfigurationAddListener<TestParentCfg> parentListener) throws Exception {
root.registerAddListener(TestCfg.getTestOneToManyParentRelationDefinition(), parentListener);
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java
index b44987e..9687503 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -25,18 +26,12 @@
import org.forgerock.opendj.ldap.DN;
import org.testng.Assert;
-/**
- * A mock constraint which can be configured to refuse various types of
- * operation.
- */
+/** A mock constraint which can be configured to refuse various types of operation. */
public final class MockConstraint extends Constraint {
- /**
- * Mock server constraint handler.
- */
+ /** Mock server constraint handler. */
private class MockConstraintHandler extends ServerConstraintHandler {
- /** {@inheritDoc} */
@Override
public boolean isDeleteAllowed(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -47,7 +42,6 @@
return isDeleteAllowed;
}
- /** {@inheritDoc} */
@Override
public boolean isUsable(ServerManagedObject<?> managedObject,
Collection<LocalizableMessage> unacceptableReasons) throws ConfigException {
@@ -58,7 +52,6 @@
return isUsable;
}
- /** {@inheritDoc} */
@Override
public void performPostAdd(ServerManagedObject<?> managedObject) throws ConfigException {
// Make sure that the associated config entry exists.
@@ -66,7 +59,6 @@
Assert.assertTrue(configRepository.hasEntry(targetDN));
}
- /** {@inheritDoc} */
@Override
public void performPostDelete(ServerManagedObject<?> managedObject) throws ConfigException {
// Make sure that the associated config entry does not exist.
@@ -74,7 +66,6 @@
Assert.assertTrue(configRepository.hasEntry(targetDN));
}
- /** {@inheritDoc} */
@Override
public void performPostModify(ServerManagedObject<?> managedObject) throws ConfigException {
// Make sure that the associated config entry exists.
@@ -108,12 +99,12 @@
this.configRepository = configRepository;
}
- /** {@inheritDoc} */
+ @Override
public Collection<ClientConstraintHandler> getClientConstraintHandlers() {
return Collections.emptySet();
}
- /** {@inheritDoc} */
+ @Override
public Collection<ServerConstraintHandler> getServerConstraintHandlers() {
return Collections.<ServerConstraintHandler> singleton(new MockConstraintHandler());
}
--
Gitblit v1.10.0