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/extensions/StaticGroup.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index 1bf784f..fd3a659 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -70,7 +70,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.Validator.*;
+import static org.forgerock.util.Reject.*;
@@ -140,7 +140,7 @@
super();
- ensureNotNull(groupEntryDN, memberAttributeType, memberDNs);
+ ifNull(groupEntryDN, memberAttributeType, memberDNs);
this.groupEntryDN = groupEntryDN;
this.memberAttributeType = memberAttributeType;
@@ -170,7 +170,7 @@
public StaticGroup newInstance(Entry groupEntry)
throws DirectoryException
{
- ensureNotNull(groupEntry);
+ ifNull(groupEntry);
// Determine whether it is a groupOfNames, groupOfEntries or
@@ -300,7 +300,7 @@
@Override()
public boolean isGroupDefinition(Entry entry)
{
- ensureNotNull(entry);
+ ifNull(entry);
// FIXME -- This needs to exclude enhanced groups once we have support for
//them.
@@ -404,7 +404,7 @@
public void addNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
- ensureNotNull(nestedGroupDN);
+ ifNull(nestedGroupDN);
synchronized (this)
{
@@ -465,7 +465,7 @@
public void removeNestedGroup(DN nestedGroupDN)
throws UnsupportedOperationException, DirectoryException
{
- ensureNotNull(nestedGroupDN);
+ ifNull(nestedGroupDN);
synchronized (this)
{
@@ -672,7 +672,7 @@
public void addMember(Entry userEntry)
throws UnsupportedOperationException, DirectoryException
{
- ensureNotNull(userEntry);
+ ifNull(userEntry);
synchronized (this)
{
@@ -729,7 +729,7 @@
public void removeMember(DN userDN)
throws UnsupportedOperationException, DirectoryException
{
- ensureNotNull(userDN);
+ ifNull(userDN);
ByteString userDNString = ByteString.valueOf(userDN.toNormalizedString());
synchronized (this)
--
Gitblit v1.10.0