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/ComplexAttributeMapper.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ComplexAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ComplexAttributeMapper.java
index a5e5705..78a6672 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ComplexAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ComplexAttributeMapper.java
@@ -34,7 +34,7 @@
* An attribute mapper which maps a single JSON attribute to the result of
* another attribute mapper.
*/
-public class ComplexAttributeMapper implements AttributeMapper {
+final class ComplexAttributeMapper extends AttributeMapper {
private final String jsonAttributeName;
private final AttributeMapper mapper;
@@ -50,17 +50,14 @@
* The mapper which should be used to provide the contents of the
* complex attribute.
*/
- public ComplexAttributeMapper(final String jsonAttributeName, final AttributeMapper mapper) {
+ ComplexAttributeMapper(final String jsonAttributeName, final AttributeMapper mapper) {
this.jsonAttributeName = jsonAttributeName;
this.mapper = mapper;
this.normalizedJsonAttributeName = toLowerCase(jsonAttributeName);
}
- /**
- * {@inheritDoc}
- */
@Override
- public void getLDAPAttributes(final Context c, final JsonPointer jsonAttribute,
+ void getLDAPAttributes(final Context c, final JsonPointer jsonAttribute,
final Set<String> ldapAttributes) {
if (jsonAttribute.isEmpty() || matches(jsonAttribute)) {
final JsonPointer relativePointer = jsonAttribute.relativePointer();
@@ -68,13 +65,9 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
- public void getLDAPFilter(final Context c, final FilterType type,
- final JsonPointer jsonAttribute, final String operator, final Object valueAssertion,
- final ResultHandler<Filter> h) {
+ void getLDAPFilter(final Context c, final FilterType type, final JsonPointer jsonAttribute,
+ final String operator, final Object valueAssertion, final ResultHandler<Filter> h) {
if (matches(jsonAttribute)) {
final JsonPointer relativePointer = jsonAttribute.relativePointer();
mapper.getLDAPFilter(c, type, relativePointer, operator, valueAssertion, h);
@@ -84,12 +77,8 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
- public void toJSON(final Context c, final Entry e,
- final ResultHandler<Map<String, Object>> h) {
+ void toJSON(final Context c, final Entry e, final ResultHandler<Map<String, Object>> h) {
final ResultHandler<Map<String, Object>> wrapper =
new ResultHandler<Map<String, Object>>() {
@@ -108,12 +97,8 @@
mapper.toJSON(c, e, wrapper);
}
- /**
- * {@inheritDoc}
- */
@Override
- public void toLDAP(final Context c, final JsonValue v,
- final ResultHandler<List<Attribute>> h) {
+ void toLDAP(final Context c, final JsonValue v, final ResultHandler<List<Attribute>> h) {
// TODO Auto-generated method stub
}
--
Gitblit v1.10.0