From 8643a9160860e31611f034467f702eb3a712eb34 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 14:33:23 +0000
Subject: [PATCH] Replace org.opends.server.util.Validator class by org.forgerock.util.Reject class from forgerock-util module
---
opendj3-server-dev/src/server/org/opends/server/admin/ClassPropertyDefinition.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/ClassPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/ClassPropertyDefinition.java
index 5f7c366..41aa111 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/ClassPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/ClassPropertyDefinition.java
@@ -22,14 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.admin;
-import static org.opends.server.util.Validator.ensureNotNull;
+import static org.forgerock.util.Reject.ifNull;
import java.util.Collections;
import java.util.EnumSet;
@@ -84,7 +84,7 @@
* implement.
*/
public final void addInstanceOf(String className) {
- ensureNotNull(className);
+ ifNull(className);
/*
* Do some basic checks to make sure the string representation is valid.
@@ -245,7 +245,7 @@
@Override
public String decodeValue(String value)
throws IllegalPropertyValueStringException {
- ensureNotNull(value);
+ ifNull(value);
try {
validateValue(value);
@@ -293,7 +293,7 @@
public <T> Class<? extends T> loadClass(String className,
Class<T> instanceOf) throws IllegalPropertyValueException,
ClassCastException {
- ensureNotNull(className, instanceOf);
+ ifNull(className, instanceOf);
// Make sure that the named class is valid.
validateClassName(className);
@@ -311,7 +311,7 @@
@Override
public String normalizeValue(String value)
throws IllegalPropertyValueException {
- ensureNotNull(value);
+ ifNull(value);
return value.trim();
}
@@ -324,7 +324,7 @@
@Override
public void validateValue(String value)
throws IllegalPropertyValueException {
- ensureNotNull(value);
+ ifNull(value);
// Always make sure the name is a valid class name.
validateClassName(value);
--
Gitblit v1.10.0