From efa949b25f472d7e4c39733678d8f0e5229f8201 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 26 Dec 2013 15:31:32 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework
---
opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java | 238 ++++++++++++++++++++++++++---------------------------------
1 files changed, 105 insertions(+), 133 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
index c1b525c..8631a66 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
@@ -26,158 +26,130 @@
package org.opends.server.admin;
-
-
/**
- * A managed object composite relationship definition which represents
- * a composition of a single managed object (i.e. the managed object
- * must be present).
+ * A managed object composite relationship definition which represents a
+ * composition of a single managed object (i.e. the managed object must be
+ * present).
*
* @param <C>
- * The type of client managed object configuration that this
- * relation definition refers to.
+ * The type of client managed object configuration that this relation
+ * definition refers to.
* @param <S>
- * The type of server managed object configuration that this
- * relation definition refers to.
+ * The type of server managed object configuration that this relation
+ * definition refers to.
*/
-public final class SingletonRelationDefinition
- <C extends ConfigurationClient, S extends Configuration>
- extends RelationDefinition<C, S> {
+public final class SingletonRelationDefinition<C extends ConfigurationClient, S extends Configuration> extends
+ RelationDefinition<C, S> {
- /**
- * An interface for incrementally constructing singleton relation
- * definitions.
- *
- * @param <C>
- * The type of client managed object configuration that
- * this relation definition refers to.
- * @param <S>
- * The type of server managed object configuration that
- * this relation definition refers to.
- */
- public static final class Builder
- <C extends ConfigurationClient, S extends Configuration>
- extends AbstractBuilder<C, S, SingletonRelationDefinition<C, S>> {
+ /**
+ * An interface for incrementally constructing singleton relation
+ * definitions.
+ *
+ * @param <C>
+ * The type of client managed object configuration that this
+ * relation definition refers to.
+ * @param <S>
+ * The type of server managed object configuration that this
+ * relation definition refers to.
+ */
+ 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.
+ private DefaultManagedObject<? extends C, ? extends S> defaultManagedObject = null;
+
+ /**
+ * Creates a new builder which can be used to incrementally build an
+ * singleton relation definition.
+ *
+ * @param pd
+ * The parent managed object definition.
+ * @param name
+ * The name of the relation.
+ * @param cd
+ * The child managed object definition.
+ */
+ // @Checkstyle:ignore
+ public Builder(AbstractManagedObjectDefinition<?, ?> pd, String name, AbstractManagedObjectDefinition<C, S> cd) {
+ super(pd, name, cd);
+ }
+
+ /**
+ * Sets the optional default managed object associated with this
+ * singleton relation definition.
+ *
+ * @param defaultManagedObject
+ * The default managed object or <code>null</code> if there
+ * is no default managed object defined for this relation
+ * definition.
+ */
+ public void setDefaultManagedObject(DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
+ this.defaultManagedObject = defaultManagedObject;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected SingletonRelationDefinition<C, S> buildInstance(Common<C, S> common) {
+ return new SingletonRelationDefinition<C, S>(common, defaultManagedObject);
+ }
+
+ }
// The optional default managed object associated with this
// singleton relation.
- private DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject = null;
+ private final DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
-
-
- /**
- * Creates a new builder which can be used to incrementally build
- * an singleton relation definition.
- *
- * @param pd
- * The parent managed object definition.
- * @param name
- * The name of the relation.
- * @param cd
- * The child managed object definition.
- */
- public Builder(AbstractManagedObjectDefinition<?, ?> pd, String name,
- AbstractManagedObjectDefinition<C, S> cd) {
- super(pd, name, cd);
- }
-
-
-
- /**
- * Sets the optional default managed object associated with this
- * singleton relation definition.
- *
- * @param defaultManagedObject
- * The default managed object or <code>null</code> if
- * there is no default managed object defined for this
- * relation definition.
- */
- public void setDefaultManagedObject(
+ // Private constructor.
+ private SingletonRelationDefinition(Common<C, S> common,
DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
- this.defaultManagedObject = defaultManagedObject;
+ super(common);
+ this.defaultManagedObject = defaultManagedObject;
}
-
-
/**
* {@inheritDoc}
*/
@Override
- protected SingletonRelationDefinition<C, S> buildInstance(
- Common<C, S> common) {
- return new SingletonRelationDefinition<C, S>(common,
- defaultManagedObject);
+ public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
+ return v.visitSingleton(this, p);
}
- }
-
-
-
- // The optional default managed object associated with this
- // singleton relation.
- private final DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject;
-
-
-
- // Private constructor.
- private SingletonRelationDefinition(Common<C, S> common,
- DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
- super(common);
- this.defaultManagedObject = defaultManagedObject;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public <R, P> R accept(RelationDefinitionVisitor<R, P> v, P p) {
- return v.visitSingleton(this, p);
- }
-
-
-
- /**
- * Gets the optional default managed object associated with this
- * singleton relation definition.
- *
- * @return Returns the default managed object or <code>null</code>
- * if there is no default managed object defined for this
- * relation definition.
- */
- public DefaultManagedObject<? extends C, ? extends S>
- getDefaultManagedObject() {
- return defaultManagedObject;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void toString(StringBuilder builder) {
- builder.append("name=");
- builder.append(getName());
- builder.append(" type=singleton parent=");
- builder.append(getParentDefinition().getName());
- builder.append(" child=");
- builder.append(getChildDefinition().getName());
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void initialize() throws Exception {
- if (defaultManagedObject != null) {
- defaultManagedObject.initialize();
+ /**
+ * Gets the optional default managed object associated with this singleton
+ * relation definition.
+ *
+ * @return Returns the default managed object or <code>null</code> if there
+ * is no default managed object defined for this relation
+ * definition.
+ */
+ public DefaultManagedObject<? extends C, ? extends S> getDefaultManagedObject() {
+ return defaultManagedObject;
}
- }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void toString(StringBuilder builder) {
+ builder.append("name=");
+ builder.append(getName());
+ builder.append(" type=singleton parent=");
+ builder.append(getParentDefinition().getName());
+ builder.append(" child=");
+ builder.append(getChildDefinition().getName());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void initialize() throws Exception {
+ if (defaultManagedObject != null) {
+ defaultManagedObject.initialize();
+ }
+ }
}
--
Gitblit v1.10.0