From db786032bf45be89c4a893281911364d158cfb6e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 20 Oct 2012 10:10:53 +0000
Subject: [PATCH] Update to use new json-resource 2.0 APIs.
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DefaultAttributeMapper.java | 69 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DefaultAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DefaultAttributeMapper.java
index 45f5ead..36e2c57 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DefaultAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DefaultAttributeMapper.java
@@ -27,47 +27,32 @@
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.resource.provider.Context;
/**
*
*/
public final class DefaultAttributeMapper implements AttributeMapper {
+ private final Map<String, String> excludedAttributes = new LinkedHashMap<String, String>();
// All user attributes by default.
private final Map<String, String> includedAttributes = new LinkedHashMap<String, String>();
- private final Map<String, String> excludedAttributes = new LinkedHashMap<String, String>();
public DefaultAttributeMapper() {
// No implementation required.
}
- public DefaultAttributeMapper includeAttribute(String... attributes) {
- for (String attribute : attributes) {
- includedAttributes.put(toLowerCase(attribute), attribute);
- }
- return this;
- }
-
- public DefaultAttributeMapper excludeAttribute(String... attributes) {
- for (String attribute : attributes) {
+ public DefaultAttributeMapper excludeAttribute(final String... attributes) {
+ for (final String attribute : attributes) {
excludedAttributes.put(toLowerCase(attribute), attribute);
}
return this;
}
- public void getLDAPAttributes(Set<String> ldapAttributes) {
- if (!includedAttributes.isEmpty()) {
- ldapAttributes.addAll(includedAttributes.values());
- } else {
- // All user attributes.
- ldapAttributes.add("*");
- }
- }
-
- public void getLDAPAttributes(JsonPointer jsonAttribute, Set<String> ldapAttributes) {
+ public void getLDAPAttributes(final JsonPointer jsonAttribute, final Set<String> ldapAttributes) {
switch (jsonAttribute.size()) {
case 0:
// Requested everything.
@@ -79,7 +64,7 @@
}
break;
default:
- String name = jsonAttribute.get(0);
+ final String name = jsonAttribute.get(0);
if (isIncludedAttribute(name)) {
ldapAttributes.add(name);
}
@@ -87,19 +72,41 @@
}
}
- public void toJson(Context c, Entry e, AttributeMapperCompletionHandler<Map<String, Object>> h) {
- Map<String, Object> result = new LinkedHashMap<String, Object>(e.getAttributeCount());
- for (Attribute a : e.getAllAttributes()) {
- String name = getAttributeName(a);
+ public void getLDAPAttributes(final Set<String> ldapAttributes) {
+ if (!includedAttributes.isEmpty()) {
+ ldapAttributes.addAll(includedAttributes.values());
+ } else {
+ // All user attributes.
+ ldapAttributes.add("*");
+ }
+ }
+
+ public DefaultAttributeMapper includeAttribute(final String... attributes) {
+ for (final String attribute : attributes) {
+ includedAttributes.put(toLowerCase(attribute), attribute);
+ }
+ return this;
+ }
+
+ public void toJson(final ServerContext c, final Entry e,
+ final ResultHandler<Map<String, Object>> h) {
+ final Map<String, Object> result = new LinkedHashMap<String, Object>(e.getAttributeCount());
+ for (final Attribute a : e.getAllAttributes()) {
+ final String name = getAttributeName(a);
if (isIncludedAttribute(name)) {
result.put(name, attributeToJson(a));
}
}
- h.onSuccess(result);
+ h.handleResult(result);
}
- private boolean isIncludedAttribute(String name) {
- String lowerName = toLowerCase(name);
+ public void toLDAP(final ServerContext c, final JsonValue v,
+ final ResultHandler<List<Attribute>> h) {
+ // TODO:
+ }
+
+ private boolean isIncludedAttribute(final String name) {
+ final String lowerName = toLowerCase(name);
// Ignore the requested attribute if it has been excluded.
if (excludedAttributes.containsKey(lowerName)) {
@@ -113,8 +120,4 @@
return false;
}
-
- public void toLDAP(Context c, JsonValue v, AttributeMapperCompletionHandler<List<Attribute>> h) {
- // TODO:
- }
}
--
Gitblit v1.10.0