From 8dd4c87972373e0eb1c074905819ae51187f98ad Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 21 Oct 2016 09:55:23 +0000
Subject: [PATCH] OPENDJ-3414 Support deep querying of LDAP attributes having JSON syntax
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
index d902445..65572d5 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
@@ -79,7 +79,6 @@
import org.forgerock.opendj.ldap.SSLContextBuilder;
import org.forgerock.opendj.ldap.requests.BindRequest;
import org.forgerock.opendj.ldap.requests.Requests;
-import org.forgerock.opendj.rest2ldap.schema.JsonSchema;
import org.forgerock.services.context.Context;
import org.forgerock.util.Options;
import org.forgerock.util.promise.Promise;
@@ -358,12 +357,10 @@
.isMultiValued(mapper.get("isMultiValued").defaultTo(false).asBoolean())
.writability(parseWritability(mapper));
case "json":
- return simple(mapper.get("ldapAttribute").defaultTo(defaultLdapAttribute).required().asString())
+ return json(mapper.get("ldapAttribute").defaultTo(defaultLdapAttribute).required().asString())
.defaultJsonValue(mapper.get("defaultJsonValue").getObject())
.isRequired(mapper.get("isRequired").defaultTo(false).asBoolean())
.isMultiValued(mapper.get("isMultiValued").defaultTo(false).asBoolean())
- .encoder(JsonSchema.jsonToByteString())
- .decoder(JsonSchema.byteStringToJson())
.jsonSchema(mapper.isDefined("schema") ? mapper.get("schema") : null)
.writability(parseWritability(mapper));
case "reference":
--
Gitblit v1.10.0