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/SimpleAttributeMapper.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
index 74ba121..8d6a1c5 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
@@ -11,11 +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.byteStringToJson;
+import static org.forgerock.opendj.rest2ldap.Utils.toFilter;
import static org.forgerock.opendj.rest2ldap.Utils.toLowerCase;
import java.util.Collections;
@@ -26,10 +27,10 @@
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.ByteString;
import org.forgerock.opendj.ldap.Entry;
+import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.Function;
import org.forgerock.opendj.ldap.Functions;
@@ -104,13 +105,29 @@
* {@inheritDoc}
*/
@Override
- public void getLDAPAttributes(final JsonPointer jsonAttribute, final Set<String> ldapAttributes) {
- if (attributeMatchesPointer(jsonAttribute)) {
+ public void getLDAPAttributes(final Context c, final JsonPointer jsonAttribute,
+ final Set<String> ldapAttributes) {
+ if (jsonAttribute.isEmpty() || matches(jsonAttribute)) {
ldapAttributes.add(ldapAttributeName);
}
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public void getLDAPFilter(final Context c, final FilterType type,
+ final JsonPointer jsonAttribute, final String operator, final Object valueAssertion,
+ final ResultHandler<Filter> h) {
+ if (matches(jsonAttribute)) {
+ h.handleResult(toFilter(c, type, ldapAttributeName, valueAssertion));
+ } else {
+ // This attribute mapper cannot handle the provided filter component.
+ h.handleResult(null);
+ }
+ }
+
+ /**
* Prevents the LDAP attribute from being updated.
*
* @param readOnly
@@ -141,12 +158,11 @@
* {@inheritDoc}
*/
@Override
- public void toJSON(final ServerContext c, final Entry e,
- final ResultHandler<Map<String, Object>> h) {
+ public void toJSON(final Context c, final Entry e, final ResultHandler<Map<String, Object>> h) {
final Attribute a = e.getAttribute(ldapAttributeName);
if (a != null) {
- final Function<ByteString, ?, Void> f = decoder == null ? Functions.fixedFunction(
- byteStringToJson(), a) : decoder;
+ final Function<ByteString, ?, Void> f =
+ decoder == null ? Functions.fixedFunction(byteStringToJson(), a) : decoder;
final Object value;
if (forceSingleValued || a.getAttributeDescription().getAttributeType().isSingleValue()) {
value = a.parse().as(f, defaultValue);
@@ -163,15 +179,14 @@
* {@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 boolean attributeMatchesPointer(final JsonPointer resourceAttribute) {
- return resourceAttribute.isEmpty()
- || toLowerCase(resourceAttribute.get(0)).equals(normalizedJsonAttributeName);
+ private boolean matches(final JsonPointer jsonAttribute) {
+ return !jsonAttribute.isEmpty()
+ && toLowerCase(jsonAttribute.get(0)).equals(normalizedJsonAttributeName);
}
}
--
Gitblit v1.10.0