From d46701cdbecec6f6c10f57432f3e6a484752f42c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 18 Jan 2014 00:55:24 +0000
Subject: [PATCH] Simplify config framework exception hierarchy by removing and pulling up the following exceptions:
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index f2aa533..99bb0dc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -30,6 +30,7 @@
import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.admin.PropertyException.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.*;
import java.util.Collection;
@@ -50,9 +51,8 @@
import org.opends.server.admin.AggregationPropertyDefinition;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.ConfigurationClient;
-import org.opends.server.admin.DefaultBehaviorException;
+import org.opends.server.admin.PropertyException;
import org.opends.server.admin.DefinitionDecodingException;
-import org.opends.server.admin.IllegalPropertyValueStringException;
import org.opends.server.admin.InstantiableRelationDefinition;
import org.opends.server.admin.ManagedObjectAlreadyExistsException;
import org.opends.server.admin.ManagedObjectDefinition;
@@ -62,8 +62,6 @@
import org.opends.server.admin.OptionalRelationDefinition;
import org.opends.server.admin.PropertyDefinition;
import org.opends.server.admin.PropertyDefinitionUsageBuilder;
-import org.opends.server.admin.PropertyException;
-import org.opends.server.admin.PropertyIsSingleValuedException;
import org.opends.server.admin.PropertyOption;
import org.opends.server.admin.PropertyProvider;
import org.opends.server.admin.RelationDefinition;
@@ -214,7 +212,7 @@
T value;
try {
value = pd.decodeValue(s);
- } catch (IllegalPropertyValueStringException e) {
+ } catch (PropertyException e) {
throw ArgumentExceptionFactory.adaptPropertyException(e, d);
}
@@ -225,7 +223,7 @@
values.add(value);
if (values.size() > 1 && !pd.hasOption(PropertyOption.MULTI_VALUED)) {
- PropertyException e = new PropertyIsSingleValuedException(pd);
+ PropertyException e = propertyIsSingleValuedException(pd);
throw ArgumentExceptionFactory.adaptPropertyException(e, d);
}
@@ -541,8 +539,8 @@
// Now create the component.
// FIXME: handle default value exceptions?
- List<DefaultBehaviorException> exceptions =
- new LinkedList<DefaultBehaviorException>();
+ List<PropertyException> exceptions =
+ new LinkedList<PropertyException>();
app.println();
app.println();
ManagedObject<? extends C> mo =
@@ -848,7 +846,7 @@
ConsoleApplication app, final ManagedObject<?> parent,
final InstantiableRelationDefinition<C, S> irelation,
final ManagedObjectDefinition<? extends C, ? extends S> d,
- final List<DefaultBehaviorException> exceptions) throws CLIException {
+ final List<PropertyException> exceptions) throws CLIException {
ValidationCallback<ManagedObject<? extends C>> validator =
new ValidationCallback<ManagedObject<? extends C>>() {
@@ -1293,8 +1291,8 @@
namingPropertyDefinition, propertyArgs);
ManagedObject<? extends C> child;
- List<DefaultBehaviorException> exceptions =
- new LinkedList<DefaultBehaviorException>();
+ List<PropertyException> exceptions =
+ new LinkedList<PropertyException>();
boolean isNameProvidedInteractively = false;
String providedNamingArgName = null;
if (relation instanceof InstantiableRelationDefinition) {
--
Gitblit v1.10.0