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/StringPropertyDefinition.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 20b5b96..e76b29d 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
@@ -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.Locale;
@@ -203,7 +204,7 @@
@Override
public String decodeValue(String value)
throws IllegalPropertyValueStringException {
- ensureNotNull(value);
+ ifNull(value);
try {
validateValue(value);
@@ -306,7 +307,7 @@
@Override
public String normalizeValue(String value)
throws IllegalPropertyValueException {
- ensureNotNull(value);
+ ifNull(value);
if (isCaseInsensitive()) {
return value.trim().toLowerCase();
@@ -322,7 +323,7 @@
*/
@Override
public void validateValue(String value) throws IllegalPropertyValueException {
- ensureNotNull(value);
+ ifNull(value);
if (pattern != null) {
Matcher matcher = pattern.matcher(value);
--
Gitblit v1.10.0