From e0e6d30a905e47931a89b7e9063d752a6f28106d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 05 Feb 2014 22:45:49 +0000
Subject: [PATCH] OPENDJ-1235: Migrate configuration framework

---
 opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

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 712b90b..1e68ac5 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
@@ -52,7 +52,6 @@
 import org.forgerock.opendj.config.ManagedObjectPath;
 import org.forgerock.opendj.config.OptionalRelationDefinition;
 import org.forgerock.opendj.config.PropertyDefinition;
-import org.forgerock.opendj.config.PropertyDefinitionsOptions;
 import org.forgerock.opendj.config.PropertyNotFoundException;
 import org.forgerock.opendj.config.PropertyOption;
 import org.forgerock.opendj.config.RelationDefinition;
@@ -137,7 +136,7 @@
 
             for (String stringValue : stringValues) {
                 try {
-                    values.add(nextProperty.decodeValue(stringValue, propertyDefOptions));
+                    values.add(nextProperty.decodeValue(stringValue));
                 } catch (PropertyException e) {
                     exception = PropertyException.defaultBehaviorException(nextProperty, e);
                     break;
@@ -227,7 +226,7 @@
                     Collection<T> tmp = find(target, pd2);
                     Collection<T> values = new ArrayList<T>(tmp.size());
                     for (T value : tmp) {
-                        pd1.validateValue(value, propertyDefOptions);
+                        pd1.validateValue(value);
                         values.add(value);
                     }
                     return values;
@@ -253,16 +252,11 @@
         }
     };
 
-    private final PropertyDefinitionsOptions propertyDefOptions;
-
     /**
      * Creates a new abstract driver.
-     *
-     * @param propertyDefOptions
-     *            Decoding options for property definitions values.
      */
-    protected Driver(PropertyDefinitionsOptions propertyDefOptions) {
-        this.propertyDefOptions = propertyDefOptions;
+    protected Driver() {
+       // Do nothing.
     }
 
     /**

--
Gitblit v1.10.0