From 58ffacee660a4eb792f49dd311a4e2ddda05afad Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 25 May 2012 22:12:32 +0000
Subject: [PATCH] Checkpoint local changes: add more attribute mapping support.

---
 opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AttributeMapper.java |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 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 47acac8..e906357 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
@@ -32,33 +32,19 @@
 public interface AttributeMapper {
 
     /**
-     * Adds the names of the all the LDAP attributes required by this attribute
-     * mapper to the provided set.
-     * <p>
-     * Implementations should only add the names of attributes found in the LDAP
-     * entry directly associated with the resource.
-     *
-     * @param ldapAttributes
-     *            The set into which the required LDAP attribute names should be
-     *            put.
-     */
-    void getLDAPAttributes(Set<String> ldapAttributes);
-
-    /**
      * Adds the names of the LDAP attributes required by this attribute mapper
      * which are associated with the provided resource attribute to the provided
      * set.
      * <p>
      * Implementations should only add the names of attributes found in the LDAP
      * entry directly associated with the resource.
-     *
+     * @param jsonAttribute
+     *            The name of the resource attribute requested by the client.
      * @param ldapAttributes
      *            The set into which the required LDAP attribute names should be
      *            put.
-     * @param resourceAttribute
-     *            The name of the resource attribute requested by the client.
      */
-    void getLDAPAttributes(Set<String> ldapAttributes, JsonPointer resourceAttribute);
+    void getLDAPAttributes(JsonPointer jsonAttribute, Set<String> ldapAttributes);
 
     /**
      * Transforms attributes contained in the provided LDAP entry to JSON

--
Gitblit v1.10.0