From 412ae6d1bcb1d8f7d404fbd7babfe5510042cee8 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 11 Sep 2015 20:28:39 +0000
Subject: [PATCH] OPENDJ-1666 Code cleanup
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java | 29 +++------
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java | 2
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java | 40 ++++++------
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java | 18 +++---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 34 +++--------
5 files changed, 50 insertions(+), 73 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
index a641e85..dc1faca 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
@@ -90,17 +90,17 @@
filter = toFilter(v1.startsWith(v2));
break;
default:
- filter = compare(c, type, v1, v2);
+ filter = compare(type, v1, v2);
break;
}
} else if (value.isNumber() && valueAssertion instanceof Number) {
final Double v1 = value.asDouble();
final Double v2 = ((Number) valueAssertion).doubleValue();
- filter = compare(c, type, v1, v2);
+ filter = compare(type, v1, v2);
} else if (value.isBoolean() && valueAssertion instanceof Boolean) {
final Boolean v1 = value.asBoolean();
final Boolean v2 = (Boolean) valueAssertion;
- filter = compare(c, type, v1, v2);
+ filter = compare(type, v1, v2);
} else {
// This attribute mapper is a candidate but it does not match.
filter = alwaysFalse();
@@ -134,30 +134,21 @@
}
}
- private <T extends Comparable<T>> Filter compare(final Context c, final FilterType type,
- final T v1, final T v2) {
- final Filter filter;
+ private <T extends Comparable<T>> Filter compare(final FilterType type, final T v1, final T v2) {
switch (type) {
case EQUAL_TO:
- filter = toFilter(v1.equals(v2));
- break;
+ return toFilter(v1.equals(v2));
case GREATER_THAN:
- filter = toFilter(v1.compareTo(v2) > 0);
- break;
+ return toFilter(v1.compareTo(v2) > 0);
case GREATER_THAN_OR_EQUAL_TO:
- filter = toFilter(v1.compareTo(v2) >= 0);
- break;
+ return toFilter(v1.compareTo(v2) >= 0);
case LESS_THAN:
- filter = toFilter(v1.compareTo(v2) < 0);
- break;
+ return toFilter(v1.compareTo(v2) < 0);
case LESS_THAN_OR_EQUAL_TO:
- filter = toFilter(v1.compareTo(v2) <= 0);
- break;
+ return toFilter(v1.compareTo(v2) <= 0);
default:
- filter = alwaysFalse(); // Not supported.
- break;
+ return alwaysFalse(); // Not supported.
}
- return filter;
}
}
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
index a98e100..a8f99bd 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
@@ -118,7 +118,7 @@
try {
final ByteString va =
valueAssertion != null ? encoder().apply(valueAssertion) : null;
- h.handleResult(toFilter(c, type, ldapAttributeName.toString(), va));
+ h.handleResult(toFilter(type, ldapAttributeName.toString(), va));
} catch (final Exception e) {
// Invalid assertion value - bad request.
h.handleError(new BadRequestException(i18n(
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
index 0cc68bd..0a441de 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
@@ -266,42 +266,28 @@
return value ? Filter.alwaysTrue() : Filter.alwaysFalse();
}
- static Filter toFilter(final Context c, final FilterType type, final String ldapAttribute,
- final ByteString valueAssertion) {
- final Filter filter;
+ static Filter toFilter(final FilterType type, final String ldapAttribute, final ByteString valueAssertion) {
switch (type) {
case CONTAINS:
- filter =
- Filter.substrings(ldapAttribute, null, Collections.singleton(valueAssertion),
- null);
- break;
+ return Filter.substrings(ldapAttribute, null, Collections.singleton(valueAssertion), null);
case STARTS_WITH:
- filter = Filter.substrings(ldapAttribute, valueAssertion, null, null);
- break;
+ return Filter.substrings(ldapAttribute, valueAssertion, null, null);
case EQUAL_TO:
- filter = Filter.equality(ldapAttribute, valueAssertion);
- break;
+ return Filter.equality(ldapAttribute, valueAssertion);
case GREATER_THAN:
- filter = Filter.greaterThan(ldapAttribute, valueAssertion);
- break;
+ return Filter.greaterThan(ldapAttribute, valueAssertion);
case GREATER_THAN_OR_EQUAL_TO:
- filter = Filter.greaterOrEqual(ldapAttribute, valueAssertion);
- break;
+ return Filter.greaterOrEqual(ldapAttribute, valueAssertion);
case LESS_THAN:
- filter = Filter.lessThan(ldapAttribute, valueAssertion);
- break;
+ return Filter.lessThan(ldapAttribute, valueAssertion);
case LESS_THAN_OR_EQUAL_TO:
- filter = Filter.lessOrEqual(ldapAttribute, valueAssertion);
- break;
+ return Filter.lessOrEqual(ldapAttribute, valueAssertion);
case PRESENT:
- filter = Filter.present(ldapAttribute);
- break;
+ return Filter.present(ldapAttribute);
case EXTENDED:
default:
- filter = alwaysFalse(); // Not supported.
- break;
+ return alwaysFalse(); // Not supported.
}
- return filter;
}
static String toLowerCase(final String s) {
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java
index fbf4a8e..6311a92 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/BasicRequestsTest.java
@@ -618,29 +618,29 @@
}
private Builder builder(final List<Request> requests) throws IOException {
- return Rest2LDAP.builder().ldapConnectionFactory(getConnectionFactory(requests)).baseDN(
- "dc=test").useEtagAttribute().useClientDNNaming("uid").readOnUpdatePolicy(
- ReadOnUpdatePolicy.CONTROLS).authorizationPolicy(AuthorizationPolicy.NONE)
+ return Rest2LDAP.builder()
+ .ldapConnectionFactory(getConnectionFactory(requests))
+ .baseDN("dc=test")
+ .useEtagAttribute()
+ .useClientDNNaming("uid")
+ .readOnUpdatePolicy(ReadOnUpdatePolicy.CONTROLS)
+ .authorizationPolicy(AuthorizationPolicy.NONE)
.additionalLDAPAttribute("objectClass", "top", "person")
.mapper(object()
.attribute("schemas", constant(asList("urn:scim:schemas:core:1.0")))
- .attribute(
- "_id",
- simple("uid").isSingleValued().isRequired().writability(
- WritabilityPolicy.CREATE_ONLY)).attribute(
- "name",
- object().attribute("displayName",
- simple("cn").isSingleValued().isRequired()).attribute(
- "surname", simple("sn").isSingleValued().isRequired()))
- .attribute(
- "_rev",
- simple("etag").isSingleValued().isRequired().writability(
- WritabilityPolicy.READ_ONLY)).attribute("description",
- simple("description")).attribute(
- "singleNumber",
- simple("singleNumber").decoder(byteStringToInteger())
- .isSingleValued()).attribute("multiNumber",
- simple("multiNumber").decoder(byteStringToInteger())));
+ .attribute("_id", simple("uid").isSingleValued()
+ .isRequired()
+ .writability(WritabilityPolicy.CREATE_ONLY))
+ .attribute("name", object().attribute("displayName", simple("cn").isSingleValued()
+ .isRequired())
+ .attribute("surname", simple("sn").isSingleValued().isRequired()))
+ .attribute("_rev", simple("etag").isSingleValued()
+ .isRequired()
+ .writability(WritabilityPolicy.READ_ONLY))
+ .attribute("description", simple("description"))
+ .attribute("singleNumber", simple("singleNumber").decoder(byteStringToInteger())
+ .isSingleValued())
+ .attribute("multiNumber", simple("multiNumber").decoder(byteStringToInteger())));
}
private void checkResourcesAreEqual(final Resource actual, final JsonValue expected) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
index c24a344..950b5c5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
@@ -190,11 +190,11 @@
ctx.connection = new SdkConnectionAdapter(clientConnection);
- final String[] userPassword = extractUsernamePassword(request);
- if (userPassword != null && userPassword.length == 2)
+ final String[] userCredentials = extractUsernamePassword(request);
+ if (userCredentials != null && userCredentials.length == 2)
{
- ctx.userName = userPassword[0];
- ctx.password = userPassword[1];
+ ctx.userName = userCredentials[0];
+ ctx.password = userCredentials[1];
ctx.asyncContext = getAsyncContext(request);
newRootConnection().searchSingleEntryAsync(buildSearchRequest(ctx.userName)).thenAsync(
@@ -419,10 +419,10 @@
String httpBasicAuthHeader = request.getHeader(HTTP_BASIC_AUTH_HEADER);
if (httpBasicAuthHeader != null)
{
- String[] userPassword = parseUsernamePassword(httpBasicAuthHeader);
- if (userPassword != null)
+ String[] userCredentials = parseUsernamePassword(httpBasicAuthHeader);
+ if (userCredentials != null)
{
- return userPassword;
+ return userCredentials;
}
}
}
@@ -525,8 +525,8 @@
{
// Example usage of base64:
// Base64("Aladdin:open sesame") = "QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
- String userPassword = new String(Base64.decode(base64UserPassword));
- String[] split = userPassword.split(":");
+ String userCredentials = new String(Base64.decode(base64UserPassword));
+ String[] split = userCredentials.split(":");
if (split.length == 2)
{
return split;
--
Gitblit v1.10.0