From 844b130eaf083825f96357b5243dd4481c587f3e 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-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
index 0cc68bd..0a441de 100644
--- a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
+++ b/opendj-sdk/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) {
--
Gitblit v1.10.0