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/InstantiableRelationDefinition.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
index 970f316..779ae76 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
@@ -48,7 +48,7 @@
* definition refers to.
*/
public final class InstantiableRelationDefinition<C extends ConfigurationClient, S extends Configuration> extends
- RelationDefinition<C, S> {
+ RelationDefinition<C, S> {
/**
* An interface for incrementally constructing instantiable relation
@@ -62,7 +62,7 @@
* relation definition refers to.
*/
public static final class Builder<C extends ConfigurationClient, S extends Configuration> extends
- AbstractBuilder<C, S, InstantiableRelationDefinition<C, S>> {
+ AbstractBuilder<C, S, InstantiableRelationDefinition<C, S>> {
// The optional naming property definition.
private PropertyDefinition<?> namingPropertyDefinition = null;
@@ -72,7 +72,8 @@
// The optional default managed objects associated with this
// instantiable relation definition.
- private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects = new HashMap<String, DefaultManagedObject<? extends C, ? extends S>>();
+ private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects =
+ new HashMap<String, DefaultManagedObject<? extends C, ? extends S>>();
/**
* Creates a new builder which can be used to incrementally build an
@@ -88,7 +89,7 @@
* The child managed object definition.
*/
public Builder(AbstractManagedObjectDefinition<?, ?> pd, String name, String pluralName,
- AbstractManagedObjectDefinition<C, S> cd) {
+ AbstractManagedObjectDefinition<C, S> cd) {
super(pd, name, cd);
this.pluralName = pluralName;
}
@@ -103,7 +104,7 @@
* The default managed object.
*/
public void setDefaultManagedObject(String name,
- DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
+ DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
this.defaultManagedObjects.put(name, defaultManagedObject);
}
@@ -126,7 +127,7 @@
@Override
protected InstantiableRelationDefinition<C, S> buildInstance(Common<C, S> common) {
return new InstantiableRelationDefinition<C, S>(common, pluralName, namingPropertyDefinition,
- defaultManagedObjects);
+ defaultManagedObjects);
}
}
@@ -143,8 +144,8 @@
// Private constructor.
private InstantiableRelationDefinition(Common<C, S> common, String pluralName,
- PropertyDefinition<?> namingPropertyDefinition,
- Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects) {
+ PropertyDefinition<?> namingPropertyDefinition,
+ Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects) {
super(common);
this.pluralName = pluralName;
this.namingPropertyDefinition = namingPropertyDefinition;
@@ -170,8 +171,7 @@
* If there is no default managed object associated with the
* provided name.
*/
- public DefaultManagedObject<? extends C, ? extends S> getDefaultManagedObject(String name)
- throws IllegalArgumentException {
+ public DefaultManagedObject<? extends C, ? extends S> getDefaultManagedObject(String name) {
if (!defaultManagedObjects.containsKey(name)) {
throw new IllegalArgumentException("unrecognized default managed object \"" + name + "\"");
}
--
Gitblit v1.10.0