From fb7bab895bca6c06521b4371ff67523d4b1941ba Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 23 Jun 2016 00:21:25 +0000
Subject: [PATCH] OPENDJ-3036 Fix inconsistent field naming in Rest2Ldap config files
---
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
index 7953a1e..84ff78b 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
@@ -303,12 +303,12 @@
final JsonValue openAm = configuration.get("openam");
return new OpenAmAccessTokenResolver(newHttpClientHandler(openAm),
TimeService.SYSTEM,
- openAm.get("endpointURL").required().asString());
+ openAm.get("endpointUrl").required().asString());
case CTS:
final JsonValue cts = configuration.get("cts").required();
return newCtsAccessTokenResolver(
getConnectionFactory(cts.get("ldapConnectionFactory").defaultTo(DEFAULT_ROOT_FACTORY).asString()),
- cts.get("baseDN").required().asString());
+ cts.get("baseDn").required().asString());
case FILE:
return newFileAccessTokenResolver(configuration.get("file").get("folderPath").required().asString());
default:
@@ -320,7 +320,7 @@
private AccessTokenResolver parseRfc7662Resolver(final JsonValue configuration) throws HttpApplicationException {
final JsonValue rfc7662 = configuration.get("rfc7662").required();
- final String introspectionEndPointURL = rfc7662.get("endpointURL").required().asString();
+ final String introspectionEndPointURL = rfc7662.get("endpointUrl").required().asString();
try {
return newRfc7662AccessTokenResolver(newHttpClientHandler(rfc7662),
new URI(introspectionEndPointURL),
@@ -448,7 +448,7 @@
private AuthenticationStrategy buildSimpleBindStrategy(final JsonValue config) {
return newSimpleBindStrategy(getConnectionFactory(config.get("ldapConnectionFactory")
.defaultTo(DEFAULT_BIND_FACTORY).asString()),
- parseUserNameTemplate(config.get("bindDNTemplate").defaultTo("%s")),
+ parseUserNameTemplate(config.get("bindDnTemplate").defaultTo("%s")),
schema);
}
@@ -461,10 +461,10 @@
private AuthenticationStrategy buildSearchThenBindStrategy(JsonValue config) {
return newSearchThenBindStrategy(
getConnectionFactory(
- config.get("searchLDAPConnectionFactory").defaultTo(DEFAULT_ROOT_FACTORY).asString()),
+ config.get("searchLdapConnectionFactory").defaultTo(DEFAULT_ROOT_FACTORY).asString()),
getConnectionFactory(
- config.get("bindLDAPConnectionFactory").defaultTo(DEFAULT_BIND_FACTORY).asString()),
- DN.valueOf(config.get("baseDN").required().asString(), schema),
+ config.get("bindLdapConnectionFactory").defaultTo(DEFAULT_BIND_FACTORY).asString()),
+ DN.valueOf(config.get("baseDn").required().asString(), schema),
SearchScope.valueOf(config.get("scope").required().asString().toLowerCase()),
parseUserNameTemplate(config.get("filterTemplate").required()));
}
--
Gitblit v1.10.0