From bbf61700f00b42853eb36ddf6b8da975faae4542 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 22 Jun 2016 17:31:07 +0000
Subject: [PATCH] Minor code cleanup
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index 967b0b3..328d7e5 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -26,10 +26,10 @@
import static org.forgerock.opendj.ldap.requests.Requests.newSearchRequest;
import static org.forgerock.opendj.ldap.schema.CoreSchema.getEntryUUIDAttributeType;
import static org.forgerock.opendj.rest2ldap.ReadOnUpdatePolicy.CONTROLS;
-import static org.forgerock.opendj.rest2ldap.Utils.ensureNotNull;
import static org.forgerock.opendj.rest2ldap.Utils.newBadRequestException;
import static org.forgerock.opendj.rest2ldap.Utils.newLocalizedIllegalArgumentException;
import static org.forgerock.opendj.rest2ldap.Utils.newJsonValueException;
+import static org.forgerock.util.Reject.checkNotNull;
import static org.forgerock.util.time.Duration.*;
import static org.forgerock.opendj.ldap.KeyManagers.useSingleCertificate;
@@ -77,6 +77,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.util.Options;
+import org.forgerock.util.Reject;
import org.forgerock.util.time.Duration;
/** Provides core factory methods and builders for constructing LDAP resource collections. */
@@ -158,7 +159,7 @@
* @return A reference to this LDAP resource collection builder.
*/
public Builder baseDN(final DN dn) {
- ensureNotNull(dn);
+ Reject.ifNull(dn);
this.baseDN = dn;
return this;
}
@@ -180,7 +181,7 @@
* @return The new LDAP resource collection.
*/
public CollectionResourceProvider build() {
- ensureNotNull(baseDN);
+ Reject.ifNull(baseDN);
if (rootMapper == null) {
throw new IllegalStateException(ERR_CONFIG_NO_MAPPINGS_PROVIDED.get().toString());
}
@@ -282,7 +283,7 @@
* @return A reference to this LDAP resource collection builder.
*/
public Builder readOnUpdatePolicy(final ReadOnUpdatePolicy policy) {
- this.readOnUpdatePolicy = ensureNotNull(policy);
+ this.readOnUpdatePolicy = checkNotNull(policy);
return this;
}
@@ -296,7 +297,7 @@
* @return A reference to this LDAP resource collection builder.
*/
public Builder schema(final Schema schema) {
- this.schema = ensureNotNull(schema);
+ this.schema = checkNotNull(schema);
return this;
}
@@ -645,7 +646,7 @@
if (this.dnAttribute.equals(idAttribute)) {
throw newLocalizedIllegalArgumentException(ERR_CONFIG_NAMING_STRATEGY_DN_AND_ID_NOT_DIFFERENT.get());
}
- this.idAttribute = ensureNotNull(idAttribute);
+ this.idAttribute = checkNotNull(idAttribute);
this.isServerProvided = isServerProvided;
}
--
Gitblit v1.10.0