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/client/ldap/LDAPManagedObject.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
index 8d66bd2..f785f2e 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
@@ -54,7 +54,6 @@
import org.opends.server.admin.Reference;
import org.opends.server.admin.RelationDefinition;
import org.opends.server.admin.SetRelationDefinition;
-import org.opends.server.admin.UnknownPropertyDefinitionException;
import org.opends.server.admin.client.ConcurrentModificationException;
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.OperationRejectedException;
@@ -99,9 +98,8 @@
* {@inheritDoc}
*/
@Override
- public <PD> Object visitUnknown(PropertyDefinition<PD> pd, PD v, Void p)
- throws UnknownPropertyDefinitionException {
- return pd.encodeValue(v);
+ public <P> Object visitUnknown(PropertyDefinition<P> propertyDef, P value, Void p) {
+ return propertyDef.encodeValue(value);
}
}
@@ -295,18 +293,18 @@
}
// Encode a property into LDAP string values.
- private <PD> void encodeProperty(Attribute attribute, PropertyDefinition<PD> propertyDef) {
+ private <P> void encodeProperty(Attribute attribute, PropertyDefinition<P> propertyDef) {
PropertyValueVisitor<Object, Void> visitor = new ValueEncoder();
- Property<PD> property = getProperty(propertyDef);
+ Property<P> property = getProperty(propertyDef);
if (propertyDef.hasOption(PropertyOption.MANDATORY)) {
// For mandatory properties we fall-back to the default values
// if defined which can sometimes be the case e.g when a
// mandatory property is overridden.
- for (PD value : property.getEffectiveValues()) {
+ for (P value : property.getEffectiveValues()) {
attribute.add(propertyDef.accept(visitor, value, null));
}
} else {
- for (PD value : property.getPendingValues()) {
+ for (P value : property.getPendingValues()) {
attribute.add(propertyDef.accept(visitor, value, null));
}
}
--
Gitblit v1.10.0