From b0a81eda9a0b2717e90dee49af53adc71f7cc3dc Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 31 Jan 2013 18:01:23 +0000
Subject: [PATCH] Fix OPENDJ-690: Rest2LDAP - Implement basic search support
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 8 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 1468b9c..5fc4644 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
@@ -11,10 +11,12 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2012 ForgeRock AS.
+ * Copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.rest2ldap;
+import static org.forgerock.opendj.rest2ldap.Utils.toLowerCase;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -23,15 +25,14 @@
import org.forgerock.json.fluent.JsonPointer;
import org.forgerock.json.fluent.JsonValue;
import org.forgerock.json.resource.ResultHandler;
-import org.forgerock.json.resource.ServerContext;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.Entry;
+import org.forgerock.opendj.ldap.Filter;
/**
* An attribute mapper which maps a single JSON attribute to a fixed value.
*/
public class ConstantAttributeMapper implements AttributeMapper {
-
private final String jsonAttributeName;
private final Object jsonAttributeValue;
@@ -53,7 +54,8 @@
* {@inheritDoc}
*/
@Override
- public void getLDAPAttributes(final JsonPointer jsonAttribute, final Set<String> ldapAttributes) {
+ public void getLDAPAttributes(final Context c, final JsonPointer jsonAttribute,
+ final Set<String> ldapAttributes) {
// Nothing to do.
}
@@ -61,8 +63,55 @@
* {@inheritDoc}
*/
@Override
- public void toJSON(final ServerContext c, final Entry e,
- final ResultHandler<Map<String, Object>> h) {
+ public void getLDAPFilter(final Context c, final FilterType type,
+ final JsonPointer jsonAttribute, final String operator, final Object valueAssertion,
+ final ResultHandler<Filter> h) {
+ if (jsonAttribute.size() == 1 && jsonAttribute.get(0).equalsIgnoreCase(jsonAttributeName)) {
+ final Filter filter;
+ if (type == FilterType.PRESENT) {
+ filter = c.getConfig().getTrueFilter();
+ } 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();
+ break;
+ case STARTS_WITH:
+ filter =
+ v1.startsWith(v2) ? c.getConfig().getTrueFilter() : c.getConfig()
+ .getFalseFilter();
+ break;
+ default:
+ filter = compare(c, type, v1, v2);
+ break;
+ }
+ } else if (jsonAttributeValue instanceof Number && valueAssertion instanceof Number) {
+ final Double v1 = ((Number) jsonAttributeValue).doubleValue();
+ final Double v2 = ((Number) valueAssertion).doubleValue();
+ filter = compare(c, type, v1, v2);
+ } else if (jsonAttributeValue instanceof Boolean && valueAssertion instanceof Boolean) {
+ final Boolean v1 = (Boolean) jsonAttributeValue;
+ final Boolean v2 = (Boolean) valueAssertion;
+ filter = compare(c, type, v1, v2);
+ } else {
+ // This attribute mapper is a candidate but it does not match.
+ filter = c.getConfig().getFalseFilter();
+ }
+ h.handleResult(filter);
+ } else {
+ // This attribute mapper cannot handle the provided filter component.
+ h.handleResult(null);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void toJSON(final Context c, final Entry e, final ResultHandler<Map<String, Object>> h) {
// FIXME: how do we know if the user requested it???
h.handleResult(Collections.singletonMap(jsonAttributeName, jsonAttributeValue));
@@ -72,10 +121,42 @@
* {@inheritDoc}
*/
@Override
- public void toLDAP(final ServerContext c, final JsonValue v,
- final ResultHandler<List<Attribute>> h) {
+ public void toLDAP(final Context c, final JsonValue v, final ResultHandler<List<Attribute>> h) {
// TODO Auto-generated method stub
+ }
+ private <T extends Comparable<T>> Filter compare(Context c, final FilterType type, final T v1,
+ final T v2) {
+ final Filter filter;
+ switch (type) {
+ case EQUAL_TO:
+ filter = v1.equals(v2) ? c.getConfig().getTrueFilter() : c.getConfig().getFalseFilter();
+ break;
+ case GREATER_THAN:
+ filter =
+ v1.compareTo(v2) > 0 ? c.getConfig().getTrueFilter() : c.getConfig()
+ .getFalseFilter();
+ break;
+ case GREATER_THAN_OR_EQUAL_TO:
+ filter =
+ v1.compareTo(v2) >= 0 ? c.getConfig().getTrueFilter() : c.getConfig()
+ .getFalseFilter();
+ break;
+ case LESS_THAN:
+ filter =
+ v1.compareTo(v2) < 0 ? c.getConfig().getTrueFilter() : c.getConfig()
+ .getFalseFilter();
+ break;
+ case LESS_THAN_OR_EQUAL_TO:
+ filter =
+ v1.compareTo(v2) <= 0 ? c.getConfig().getTrueFilter() : c.getConfig()
+ .getFalseFilter();
+ break;
+ default:
+ filter = c.getConfig().getFalseFilter(); // Not supported.
+ break;
+ }
+ return filter;
}
}
--
Gitblit v1.10.0