From d89aacc0431eab3dce367e8fe9575eb8f83aa535 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 08 Feb 2013 11:37:59 +0000
Subject: [PATCH] Checkpoint changes: clean up APIs, separate out MVCC and naming strategies.
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 7fa9bac..43c47a5 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
@@ -31,6 +31,7 @@
import org.forgerock.json.resource.ResourceException;
import org.forgerock.json.resource.ResultHandler;
import org.forgerock.opendj.ldap.Attribute;
+import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.Function;
@@ -85,12 +86,11 @@
}
// @Checkstyle:off
- private static final Function<ByteString, Object, Attribute> BYTESTRING_TO_JSON =
- new Function<ByteString, Object, Attribute>() {
+ private static final Function<ByteString, Object, AttributeDescription> BYTESTRING_TO_JSON =
+ new Function<ByteString, Object, AttributeDescription>() {
@Override
- public Object apply(final ByteString value, final Attribute a) {
- final Syntax syntax =
- a.getAttributeDescription().getAttributeType().getSyntax();
+ 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);
} else if (syntax.equals(getIntegerSyntax())) {
@@ -112,7 +112,8 @@
}
static Object attributeToJson(final Attribute a) {
- final Function<ByteString, Object, Void> f = Functions.fixedFunction(BYTESTRING_TO_JSON, a);
+ final Function<ByteString, Object, Void> f =
+ Functions.fixedFunction(BYTESTRING_TO_JSON, a.getAttributeDescription());
final boolean isSingleValued =
a.getAttributeDescription().getAttributeType().isSingleValue();
return isSingleValued ? a.parse().as(f) : asList(a.parse().asSetOf(f));
@@ -120,7 +121,7 @@
// @Checkstyle:on
- static Function<ByteString, Object, Attribute> byteStringToJson() {
+ static Function<ByteString, Object, AttributeDescription> byteStringToJson() {
return BYTESTRING_TO_JSON;
}
--
Gitblit v1.10.0