From 507e00fb190713b1654579123d284bcd3d750abe Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 10 Apr 2013 10:31:19 +0000
Subject: [PATCH] Partial fix for OPENDJ-693: Implement modify/update support
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java
index 70f699a..02cc5d6 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java
@@ -21,9 +21,9 @@
import org.forgerock.json.fluent.JsonPointer;
import org.forgerock.json.fluent.JsonValue;
import org.forgerock.json.resource.ResultHandler;
-import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.Filter;
+import org.forgerock.opendj.ldap.Modification;
/**
* An attribute mapper is responsible for converting JSON values to and from
@@ -56,7 +56,8 @@
* The set into which the required LDAP attribute names should be
* put.
*/
- abstract void getLDAPAttributes(Context c, JsonPointer jsonAttribute, Set<String> ldapAttributes);
+ abstract void getLDAPAttributes(Context c, JsonPointer path, JsonPointer subPath,
+ Set<String> ldapAttributes);
/**
* Transforms the provided REST comparison filter parameters to an LDAP
@@ -86,7 +87,7 @@
* @param h
* The result handler.
*/
- abstract void getLDAPFilter(Context c, FilterType type, JsonPointer jsonAttribute,
+ abstract void getLDAPFilter(Context c, JsonPointer path, JsonPointer subPath, FilterType type,
String operator, Object valueAssertion, ResultHandler<Filter> h);
/**
@@ -113,7 +114,7 @@
* @param h
* The result handler.
*/
- abstract void toJSON(Context c, Entry e, ResultHandler<JsonValue> h);
+ abstract void toJSON(Context c, JsonPointer path, Entry e, ResultHandler<JsonValue> h);
/**
* Maps a JSON value to one or more LDAP attributes, invoking a completion
@@ -139,7 +140,8 @@
* @param h
* The result handler.
*/
- abstract void toLDAP(Context c, JsonValue v, ResultHandler<List<Attribute>> h);
+ abstract void toLDAP(Context c, JsonPointer path, Entry e, JsonValue v,
+ ResultHandler<List<Modification>> h);
// TODO: methods for obtaining schema information (e.g. name, description,
// type information).
--
Gitblit v1.10.0