From 3d2247dc6913a8ab1fd570e6db4c38a3f6460039 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 29 Jan 2015 10:33:47 +0000
Subject: [PATCH] AutoRefactor'ed code cleanups
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java | 10 +++++-----
opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java | 12 ++++++------
opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java | 6 +++---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 9 +++++----
opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java | 6 +++---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java | 6 +++---
6 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
index fe64f74..84e1639 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
@@ -344,10 +344,10 @@
* changetype, so only use it if a newSuperior element has been
* provided, but use modrdn elsewhere.
*/
- if (change.getNewSuperior() == null) {
- writeLine("changetype: modrdn");
- } else {
+ if (change.getNewSuperior() != null) {
writeLine("changetype: moddn");
+ } else {
+ writeLine("changetype: modrdn");
}
writeKeyAndValue("newrdn", change.getNewRDN().toString());
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
index 62b7c09..d3a1e30 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
@@ -660,10 +660,10 @@
if ((openPos > 0 && newLine.charAt(openPos - 1) != '\\') || (openPos == 0)) {
final String constantName = newLine.substring(openPos + 1, closePos).toLowerCase();
final String constantValue = constants.get(constantName);
- if (constantValue == null) {
- warnings.add(WARN_ENTRY_GENERATOR_WARNING_UNDEFINED_CONSTANT.get(constantName, lineNumber));
- } else {
+ if (constantValue != null) {
lineBuffer.replace(openPos, closePos + 1, constantValue);
+ } else {
+ warnings.add(WARN_ENTRY_GENERATOR_WARNING_UNDEFINED_CONSTANT.get(constantName, lineNumber));
}
}
if (openPos >= 0) {
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 244a954..f901442 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -148,11 +148,12 @@
Promise<BindResult, LdapException> returnedPromise;
if (filter != null && baseDN != null) {
if (sr == null) {
- if (dataSources == null) {
- sr = Requests.newSearchRequest(baseDN, scope, filter, attributes);
+ if (dataSources != null) {
+ final String newBaseDN = String.format(baseDN, data);
+ final String newFilter = String.format(filter, data);
+ sr = Requests.newSearchRequest(newBaseDN, scope, newFilter, attributes);
} else {
- sr = Requests.newSearchRequest(String.format(baseDN, data), scope,
- String.format(filter, data), attributes);
+ sr = Requests.newSearchRequest(baseDN, scope, filter, attributes);
}
sr.setDereferenceAliasesPolicy(dereferencesAliasesPolicy);
} else if (dataSources != null) {
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java
index c5f0c30..436545e 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java
@@ -135,14 +135,14 @@
final Object value = principals.get(key);
if (isJSONPrimitive(value)) {
values[i] = String.valueOf(value);
- } else if (value == null) {
- throw new ForbiddenException(i18n(
- "The request could not be authorized because the required "
- + "security principal '%s' could not be determined", key));
- } else {
+ } else if (value != null) {
throw new ForbiddenException(i18n(
"The request could not be authorized because the required "
+ "security principal '%s' had an invalid data type", key));
+ } else {
+ throw new ForbiddenException(i18n(
+ "The request could not be authorized because the required "
+ + "security principal '%s' could not be determined", key));
}
}
return values;
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
index 6f29d77..b4b743d 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
@@ -266,10 +266,10 @@
private void completeIfNecessary() {
if (pendingSearches.decrementAndGet() == 0) {
- if (exception.get() == null) {
- h.handleResult(newLDAPAttribute);
- } else {
+ if (exception.get() != null) {
h.handleError(exception.get());
+ } else {
+ h.handleResult(newLDAPAttribute);
}
}
}
diff --git a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
index d19295a..6b176a7 100644
--- a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
+++ b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
@@ -168,10 +168,10 @@
*/
public static org.opends.server.types.SearchScope to(
final org.forgerock.opendj.ldap.SearchScope searchScope) {
- if (searchScope == null) {
- return null;
+ if (searchScope != null) {
+ return org.opends.server.types.SearchScope.values()[searchScope.intValue()];
}
- return org.opends.server.types.SearchScope.values()[searchScope.intValue()];
+ return null;
}
/**
@@ -436,10 +436,10 @@
*/
public static org.forgerock.opendj.ldap.SearchScope from(
final org.opends.server.types.SearchScope searchScope) {
- if (searchScope == null) {
- return null;
+ if (searchScope != null) {
+ return org.forgerock.opendj.ldap.SearchScope.values().get(searchScope.intValue());
}
- return org.forgerock.opendj.ldap.SearchScope.values().get(searchScope.intValue());
+ return null;
}
/**
--
Gitblit v1.10.0