From 0ca095370a648a30730ed9cb7d4dda1d9bd10334 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 22 Jun 2016 17:31:07 +0000
Subject: [PATCH] OPENDJ-3036 Renamed various classes and methods to camel-case
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLdapPropertyMapper.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLdapPropertyMapper.java
similarity index 91%
rename from opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
rename to opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLdapPropertyMapper.java
index d211438..66fb8d1 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLdapPropertyMapper.java
@@ -19,7 +19,7 @@
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.forgerock.opendj.ldap.Attributes.emptyAttribute;
-import static org.forgerock.opendj.rest2ldap.Rest2LDAP.asResourceException;
+import static org.forgerock.opendj.rest2ldap.Rest2Ldap.asResourceException;
import static org.forgerock.opendj.rest2ldap.Utils.isNullOrEmpty;
import static org.forgerock.opendj.rest2ldap.Utils.newBadRequestException;
import static org.forgerock.opendj.rest2ldap.Utils.newNotSupportedException;
@@ -47,17 +47,17 @@
import org.forgerock.util.promise.Promises;
/**
- * An abstract LDAP attribute mapper which provides a simple mapping from a JSON
+ * An abstract LDAP property mapper which provides a simple mapping from a JSON
* value to a single LDAP attribute.
*/
-abstract class AbstractLDAPAttributeMapper<T extends AbstractLDAPAttributeMapper<T>> extends AttributeMapper {
- List<Object> defaultJSONValues = emptyList();
+abstract class AbstractLdapPropertyMapper<T extends AbstractLdapPropertyMapper<T>> extends PropertyMapper {
+ List<Object> defaultJsonValues = emptyList();
final AttributeDescription ldapAttributeName;
private boolean isRequired;
private boolean isSingleValued;
private WritabilityPolicy writabilityPolicy = READ_WRITE;
- AbstractLDAPAttributeMapper(final AttributeDescription ldapAttributeName) {
+ AbstractLdapPropertyMapper(final AttributeDescription ldapAttributeName) {
this.ldapAttributeName = ldapAttributeName;
}
@@ -65,7 +65,7 @@
* Indicates that the LDAP attribute is mandatory and must be provided
* during create requests.
*
- * @return This attribute mapper.
+ * @return This property mapper.
*/
public final T isRequired() {
this.isRequired = true;
@@ -76,7 +76,7 @@
* Indicates that multi-valued LDAP attribute should be represented as a
* single-valued JSON value, rather than an array of values.
*
- * @return This attribute mapper.
+ * @return This property mapper.
*/
public final T isSingleValued() {
this.isSingleValued = true;
@@ -89,7 +89,7 @@
*
* @param policy
* The writability policy.
- * @return This attribute mapper.
+ * @return This property mapper.
*/
public final T writability(final WritabilityPolicy policy) {
this.writabilityPolicy = policy;
@@ -103,7 +103,7 @@
@Override
Promise<List<Attribute>, ResourceException> create(
final Connection connection, final JsonPointer path, final JsonValue v) {
- return getNewLDAPAttributes(connection, path, v).then(
+ return getNewLdapAttributes(connection, path, v).then(
new Function<Attribute, List<Attribute>, ResourceException>() {
@Override
public List<Attribute> apply(Attribute newLDAPAttribute) throws ResourceException {
@@ -125,13 +125,13 @@
}
@Override
- void getLDAPAttributes(final Connection connection, final JsonPointer path,
- final JsonPointer subPath, final Set<String> ldapAttributes) {
+ void getLdapAttributes(final Connection connection, final JsonPointer path,
+ final JsonPointer subPath, final Set<String> ldapAttributes) {
ldapAttributes.add(ldapAttributeName.toString());
}
- abstract Promise<Attribute, ResourceException> getNewLDAPAttributes(Connection connection, JsonPointer path,
- List<Object> newValues);
+ abstract Promise<Attribute, ResourceException> getNewLdapAttributes(Connection connection, JsonPointer path,
+ List<Object> newValues);
abstract T getThis();
@@ -197,7 +197,7 @@
default:
/*
* The patch operation targets the child of a sub-field. This is
- * not possible for a LDAP attribute mapper.
+ * not possible for a LDAP property mapper.
*/
throw newBadRequestException(ERR_UNRECOGNIZED_FIELD.get(path.child(field.get(0))));
}
@@ -237,7 +237,7 @@
singletonList(new Modification(modType, emptyAttribute(ldapAttributeName))));
}
} else {
- return getNewLDAPAttributes(connection, path, newValues)
+ return getNewLdapAttributes(connection, path, newValues)
.then(new Function<Attribute, List<Modification>, ResourceException>() {
@Override
public List<Modification> apply(final Attribute value) {
@@ -255,7 +255,7 @@
@Override
Promise<List<Modification>, ResourceException> update(final Connection connection, final JsonPointer path,
final Entry e, final JsonValue v) {
- return getNewLDAPAttributes(connection, path, v).then(
+ return getNewLdapAttributes(connection, path, v).then(
new Function<Attribute, List<Modification>, ResourceException>() {
@Override
public List<Modification> apply(final Attribute newLDAPAttribute) throws ResourceException {
@@ -337,17 +337,17 @@
}
}
- private Promise<Attribute, ResourceException> getNewLDAPAttributes(final Connection connection,
- final JsonPointer path, final JsonValue v) {
+ private Promise<Attribute, ResourceException> getNewLdapAttributes(final Connection connection,
+ final JsonPointer path, final JsonValue v) {
try {
// Ensure that the value is of the correct type.
checkSchema(path, v);
- final List<Object> newValues = asList(v, defaultJSONValues);
+ final List<Object> newValues = asList(v, defaultJsonValues);
if (newValues.isEmpty()) {
// Skip sub-class implementation if there are no values.
return Promises.newResultPromise(emptyAttribute(ldapAttributeName));
} else {
- return getNewLDAPAttributes(connection, path, newValues);
+ return getNewLdapAttributes(connection, path, newValues);
}
} catch (final Exception ex) {
return Promises.newExceptionPromise(asResourceException(ex));
--
Gitblit v1.10.0