From 4355ed2b03fb949638055db26a075e1c3d084906 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Jun 2013 07:55:49 +0000
Subject: [PATCH] OPENDJ-960 (CR-1858) Rest2LDAP - Validate http-config.json file
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index b03538a..dbdb736 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -16,9 +16,9 @@
package org.forgerock.opendj.rest2ldap;
-import static org.forgerock.opendj.ldap.requests.Requests.newSearchRequest;
-import static org.forgerock.opendj.ldap.schema.CoreSchema.getEntryUUIDAttributeType;
-import static org.forgerock.opendj.rest2ldap.ReadOnUpdatePolicy.CONTROLS;
+import static org.forgerock.opendj.ldap.requests.Requests.*;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
+import static org.forgerock.opendj.rest2ldap.ReadOnUpdatePolicy.*;
import static org.forgerock.opendj.rest2ldap.Utils.ensureNotNull;
import java.util.ArrayList;
@@ -575,11 +575,16 @@
* @throws IllegalArgumentException
* If the configuration is invalid.
*/
- public static ConnectionFactory configureConnectionFactory(final JsonValue configuration,
+ public static ConnectionFactory configureConnectionFactory(JsonValue configuration,
final String name) {
+ configuration = configuration.recordKeyAccesses();
final JsonValue normalizedConfiguration =
normalizeConnectionFactory(configuration, name, 0);
- return configureConnectionFactory(normalizedConfiguration);
+ final ConnectionFactory connectionFactory =
+ configureConnectionFactory(normalizedConfiguration);
+ // we are now done reading the config,
+ configuration.verifyAllKeysAccessed();
+ return connectionFactory;
}
public static AttributeMapper constant(final Object value) {
--
Gitblit v1.10.0