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/admin/StringPropertyDefinition.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/StringPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/StringPropertyDefinition.java
index e76b29d..9e95f9b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/StringPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/StringPropertyDefinition.java
@@ -203,13 +203,13 @@
*/
@Override
public String decodeValue(String value)
- throws IllegalPropertyValueStringException {
+ throws PropertyException {
ifNull(value);
try {
validateValue(value);
- } catch (IllegalPropertyValueException e) {
- throw new IllegalPropertyValueStringException(this, value);
+ } catch (PropertyException e) {
+ throw PropertyException.illegalPropertyValueException(this, value);
}
return value;
@@ -306,7 +306,7 @@
*/
@Override
public String normalizeValue(String value)
- throws IllegalPropertyValueException {
+ throws PropertyException {
ifNull(value);
if (isCaseInsensitive()) {
@@ -322,13 +322,13 @@
* {@inheritDoc}
*/
@Override
- public void validateValue(String value) throws IllegalPropertyValueException {
+ public void validateValue(String value) throws PropertyException {
ifNull(value);
if (pattern != null) {
Matcher matcher = pattern.matcher(value);
if (!matcher.matches()) {
- throw new IllegalPropertyValueException(this, value);
+ throw PropertyException.illegalPropertyValueException(this, value);
}
}
}
--
Gitblit v1.10.0