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/Rest2LdapHttpApplication.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java
similarity index 98%
rename from opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
rename to opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java
index 5727ba4..d5f56be 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java
@@ -25,7 +25,7 @@
import static org.forgerock.json.JsonValueFunctions.duration;
import static org.forgerock.json.JsonValueFunctions.enumConstant;
import static org.forgerock.json.JsonValueFunctions.setOf;
-import static org.forgerock.opendj.rest2ldap.Rest2LDAP.configureConnectionFactory;
+import static org.forgerock.opendj.rest2ldap.Rest2Ldap.configureConnectionFactory;
import static org.forgerock.opendj.rest2ldap.Utils.newLocalizedIllegalArgumentException;
import static org.forgerock.opendj.rest2ldap.Utils.newJsonValueException;
import static org.forgerock.opendj.rest2ldap.authz.AuthenticationStrategies.*;
@@ -98,7 +98,7 @@
import org.forgerock.util.time.TimeService;
/** Rest2ldap HTTP application. */
-public class Rest2LDAPHttpApplication implements HttpApplication {
+public class Rest2LdapHttpApplication implements HttpApplication {
private static final String DEFAULT_ROOT_FACTORY = "root";
private static final String DEFAULT_BIND_FACTORY = "bind";
@@ -168,7 +168,7 @@
/**
* Default constructor called by the HTTP Framework which will use the default configuration file location.
*/
- public Rest2LDAPHttpApplication() {
+ public Rest2LdapHttpApplication() {
this.configurationUrl = getClass().getResource("/opendj-rest2ldap-config.json");
this.schema = Schema.getDefaultSchema();
}
@@ -181,7 +181,7 @@
* @param schema
* The {@link Schema} used to perform DN validations
*/
- public Rest2LDAPHttpApplication(final URL configurationURL, final Schema schema) {
+ public Rest2LdapHttpApplication(final URL configurationURL, final Schema schema) {
this.configurationUrl = checkNotNull(configurationURL, "configurationURL cannot be null");
this.schema = checkNotNull(schema, "schema cannot be null");
}
@@ -216,7 +216,7 @@
final Router router = new Router();
for (final String mappingUrl : mappings.keys()) {
final JsonValue mapping = mappings.get(mappingUrl);
- router.addRoute(Router.uriTemplate(mappingUrl), Rest2LDAP.builder().configureMapping(mapping).build());
+ router.addRoute(Router.uriTemplate(mappingUrl), Rest2Ldap.builder().configureMapping(mapping).build());
}
return router;
}
@@ -503,7 +503,7 @@
case SEARCH:
return buildSearchThenBindStrategy(config);
case SASL_PLAIN:
- return buildSASLBindStrategy(config);
+ return buildSaslBindStrategy(config);
default:
throw newLocalizedIllegalArgumentException(ERR_CONFIG_UNSUPPORTED_BIND_STRATEGY.get(
strategy, BindStrategy.listValues()));
@@ -517,7 +517,7 @@
schema);
}
- private AuthenticationStrategy buildSASLBindStrategy(JsonValue config) {
+ private AuthenticationStrategy buildSaslBindStrategy(JsonValue config) {
return newSASLPlainStrategy(
getConnectionFactory(config.get("ldapConnectionFactory").defaultTo(DEFAULT_BIND_FACTORY).asString()),
schema, parseUserNameTemplate(config.get(AUTHZID_TEMPLATE).defaultTo("u:%s")));
--
Gitblit v1.10.0