Simplify config framework exception hierarchy by removing and pulling up th...

Matthew Swift

18.58.2014 a94c41b1759c23f849376a5f5448bc6e819f1c11

 opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java

@@ -233,15 +233,15 @@
        Reject.ifNull(value);

        if (!allowUnlimited && value < lowerLimit) {
            throw new IllegalPropertyValueException(this, value);
            throw PropertyException.illegalPropertyValueException(this, value);

            // unlimited allowed
        } else if (value >= 0 && value < lowerLimit) {
            throw new IllegalPropertyValueException(this, value);
            throw PropertyException.illegalPropertyValueException(this, value);
        }

        if ((upperLimit != null) && (value > upperLimit)) {
            throw new IllegalPropertyValueException(this, value);
            throw PropertyException.illegalPropertyValueException(this, value);
        }
    }

@@ -279,13 +279,13 @@
        try {
            i = Integer.valueOf(value);
        } catch (NumberFormatException e) {
            throw new IllegalPropertyValueStringException(this, value);
            throw PropertyException.illegalPropertyValueException(this, value);
        }

        try {
            validateValue(i, options);
        } catch (IllegalPropertyValueException e) {
            throw new IllegalPropertyValueStringException(this, value);
        } catch (PropertyException e) {
            throw PropertyException.illegalPropertyValueException(this, value);
        }

        return i;