From cc436fb6ca1ea44d70f62777855fd4f21b4e50bc Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 19 Dec 2013 14:51:01 +0000
Subject: [PATCH] Minor refactoring: remove Validator class and use forgerock-util Reject instead.

---
 opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
index caa8f8d..ea150d0 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
@@ -34,8 +34,7 @@
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizableMessageBuilder;
-
-import com.forgerock.opendj.util.Validator;
+import org.forgerock.util.Reject;
 
 /**
  * This exception is thrown when the client or server refuses to create, delete,
@@ -77,8 +76,8 @@
 
     // Gets the default message.
     private static LocalizableMessage getDefaultMessage(Collection<LocalizableMessage> messages) {
-        Validator.ensureNotNull(messages);
-        Validator.ensureTrue(!messages.isEmpty(), "Messages should not be empty");
+        Reject.ifNull(messages);
+        Reject.ifFalse(!messages.isEmpty(), "Messages should not be empty");
 
         if (messages.size() == 1) {
             return ERR_OPERATION_REJECTED_EXCEPTION_SINGLE.get(messages.iterator().next());

--
Gitblit v1.10.0