From 16869da731710f4c3754c7b229fa7346211a25a4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 01 Feb 2013 14:57:43 +0000
Subject: [PATCH] Pull EntryContainer into LDAPCollectionResourceProvider until layering is better understood.
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java
index 5fc4644..fec587e 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java
@@ -69,20 +69,20 @@
if (jsonAttribute.size() == 1 && jsonAttribute.get(0).equalsIgnoreCase(jsonAttributeName)) {
final Filter filter;
if (type == FilterType.PRESENT) {
- filter = c.getConfig().getTrueFilter();
+ filter = c.getConfig().trueFilter();
} else if (jsonAttributeValue instanceof String && valueAssertion instanceof String) {
final String v1 = toLowerCase((String) jsonAttributeValue);
final String v2 = toLowerCase((String) valueAssertion);
switch (type) {
case CONTAINS:
filter =
- v1.contains(v2) ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.contains(v2) ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
case STARTS_WITH:
filter =
- v1.startsWith(v2) ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.startsWith(v2) ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
default:
filter = compare(c, type, v1, v2);
@@ -98,7 +98,7 @@
filter = compare(c, type, v1, v2);
} else {
// This attribute mapper is a candidate but it does not match.
- filter = c.getConfig().getFalseFilter();
+ filter = c.getConfig().falseFilter();
}
h.handleResult(filter);
} else {
@@ -130,30 +130,30 @@
final Filter filter;
switch (type) {
case EQUAL_TO:
- filter = v1.equals(v2) ? c.getConfig().getTrueFilter() : c.getConfig().getFalseFilter();
+ filter = v1.equals(v2) ? c.getConfig().trueFilter() : c.getConfig().falseFilter();
break;
case GREATER_THAN:
filter =
- v1.compareTo(v2) > 0 ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.compareTo(v2) > 0 ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
case GREATER_THAN_OR_EQUAL_TO:
filter =
- v1.compareTo(v2) >= 0 ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.compareTo(v2) >= 0 ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
case LESS_THAN:
filter =
- v1.compareTo(v2) < 0 ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.compareTo(v2) < 0 ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
case LESS_THAN_OR_EQUAL_TO:
filter =
- v1.compareTo(v2) <= 0 ? c.getConfig().getTrueFilter() : c.getConfig()
- .getFalseFilter();
+ v1.compareTo(v2) <= 0 ? c.getConfig().trueFilter() : c.getConfig()
+ .falseFilter();
break;
default:
- filter = c.getConfig().getFalseFilter(); // Not supported.
+ filter = c.getConfig().falseFilter(); // Not supported.
break;
}
return filter;
--
Gitblit v1.10.0