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/EnumPropertyDefinition.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/EnumPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/EnumPropertyDefinition.java
index f5760e5..d7664c3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/EnumPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/EnumPropertyDefinition.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2014 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -29,7 +30,7 @@
 
 
 
-import static org.opends.server.util.Validator.ensureNotNull;
+import static org.forgerock.util.Reject.ifNull;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -179,7 +180,7 @@
   @Override
   public E decodeValue(String value)
       throws IllegalPropertyValueStringException {
-    ensureNotNull(value);
+    ifNull(value);
 
     String nvalue = value.trim().toLowerCase();
     E eValue = decodeMap.get(nvalue);
@@ -254,7 +255,7 @@
   @Override
   public String normalizeValue(E value)
       throws IllegalPropertyValueException {
-    ensureNotNull(value);
+    ifNull(value);
 
     return value.toString().trim().toLowerCase();
   }
@@ -267,7 +268,7 @@
   @Override
   public void validateValue(E value)
       throws IllegalPropertyValueException {
-    ensureNotNull(value);
+    ifNull(value);
 
     // No additional validation required.
   }

--
Gitblit v1.10.0