From 4ba67b612ac446dd8e0a83689983499491324eef Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 11 Feb 2013 14:13:31 +0000
Subject: [PATCH] Fix OPENDJ-691: Implement add/create support
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
index 43c47a5..e230bf4 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
@@ -15,6 +15,13 @@
*/
package org.forgerock.opendj.rest2ldap;
+import static javax.xml.bind.DatatypeConverter.parseDateTime;
+import static javax.xml.bind.DatatypeConverter.printDateTime;
+import static org.forgerock.opendj.ldap.Functions.byteStringToBoolean;
+import static org.forgerock.opendj.ldap.Functions.byteStringToGeneralizedTime;
+import static org.forgerock.opendj.ldap.Functions.byteStringToLong;
+import static org.forgerock.opendj.ldap.Functions.byteStringToString;
+import static org.forgerock.opendj.ldap.Functions.fixedFunction;
import static org.forgerock.opendj.ldap.schema.CoreSchema.getBooleanSyntax;
import static org.forgerock.opendj.ldap.schema.CoreSchema.getGeneralizedTimeSyntax;
import static org.forgerock.opendj.ldap.schema.CoreSchema.getIntegerSyntax;
@@ -26,8 +33,6 @@
import java.util.Locale;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.xml.bind.DatatypeConverter;
-
import org.forgerock.json.resource.ResourceException;
import org.forgerock.json.resource.ResultHandler;
import org.forgerock.opendj.ldap.Attribute;
@@ -35,7 +40,8 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.Function;
-import org.forgerock.opendj.ldap.Functions;
+import org.forgerock.opendj.ldap.GeneralizedTime;
+import org.forgerock.opendj.ldap.LinkedAttribute;
import org.forgerock.opendj.ldap.schema.Syntax;
/**
@@ -85,24 +91,45 @@
}
- // @Checkstyle:off
private static final Function<ByteString, Object, AttributeDescription> BYTESTRING_TO_JSON =
new Function<ByteString, Object, AttributeDescription>() {
@Override
public Object apply(final ByteString value, final AttributeDescription ad) {
final Syntax syntax = ad.getAttributeType().getSyntax();
if (syntax.equals(getBooleanSyntax())) {
- return Functions.byteStringToBoolean().apply(value, null);
+ return byteStringToBoolean().apply(value, null);
} else if (syntax.equals(getIntegerSyntax())) {
- return Functions.byteStringToLong().apply(value, null);
+ return byteStringToLong().apply(value, null);
} else if (syntax.equals(getGeneralizedTimeSyntax())) {
- return DatatypeConverter.printDateTime(Functions
- .byteStringToGeneralizedTime().apply(value, null).toCalendar());
+ return printDateTime(byteStringToGeneralizedTime().apply(value, null)
+ .toCalendar());
} else if (syntax.isHumanReadable()) {
- return Functions.byteStringToString().apply(value, null);
+ return byteStringToString().apply(value, null);
} else {
// Base 64 encoded binary.
- return DatatypeConverter.printBase64Binary(value.toByteArray());
+ return value.toBase64String();
+ }
+ }
+ };
+
+ private static final Function<Object, ByteString, AttributeDescription> JSON_TO_BYTESTRING =
+ new Function<Object, ByteString, AttributeDescription>() {
+ @Override
+ public ByteString apply(final Object value, final AttributeDescription ad) {
+ if (isJSONPrimitive(value)) {
+ final Syntax syntax = ad.getAttributeType().getSyntax();
+ if (syntax.equals(getGeneralizedTimeSyntax())) {
+ return ByteString.valueOf(GeneralizedTime.valueOf(parseDateTime(value
+ .toString())));
+ } else if (syntax.isHumanReadable()) {
+ return ByteString.valueOf(value);
+ } else {
+ // Base 64 encoded binary.
+ return ByteString.valueOfBase64(value.toString());
+ }
+ } else {
+ throw new IllegalArgumentException("Unrecognized type of JSON value: "
+ + value.getClass().getName());
}
}
};
@@ -113,14 +140,12 @@
static Object attributeToJson(final Attribute a) {
final Function<ByteString, Object, Void> f =
- Functions.fixedFunction(BYTESTRING_TO_JSON, a.getAttributeDescription());
+ fixedFunction(BYTESTRING_TO_JSON, a.getAttributeDescription());
final boolean isSingleValued =
a.getAttributeDescription().getAttributeType().isSingleValue();
return isSingleValued ? a.parse().as(f) : asList(a.parse().asSetOf(f));
}
- // @Checkstyle:on
-
static Function<ByteString, Object, AttributeDescription> byteStringToJson() {
return BYTESTRING_TO_JSON;
}
@@ -143,6 +168,34 @@
return a.getAttributeDescription().withoutOption("binary").toString();
}
+ static boolean isJSONPrimitive(final Object value) {
+ return value instanceof String || value instanceof Boolean || value instanceof Number;
+ }
+
+ static Attribute jsonToAttribute(final Object value, final AttributeDescription ad) {
+ return jsonToAttribute(value, ad, fixedFunction(jsonToByteString(), ad));
+ }
+
+ static Attribute jsonToAttribute(final Object value, final AttributeDescription ad,
+ final Function<Object, ByteString, Void> f) {
+ if (isJSONPrimitive(value)) {
+ return new LinkedAttribute(ad, f.apply(value, null));
+ } else if (value instanceof Collection<?>) {
+ final Attribute a = new LinkedAttribute(ad);
+ for (final Object o : (Collection<?>) value) {
+ a.add(f.apply(o, null));
+ }
+ return a;
+ } else {
+ throw new IllegalArgumentException("Unrecognized type of JSON value: "
+ + value.getClass().getName());
+ }
+ }
+
+ static Function<Object, ByteString, AttributeDescription> jsonToByteString() {
+ return JSON_TO_BYTESTRING;
+ }
+
static Filter toFilter(final Context c, final FilterType type, final String ldapAttribute,
final Object valueAssertion) {
final String v = String.valueOf(valueAssertion);
--
Gitblit v1.10.0