From 0155864359332b5e8af8134c6d5bb95439bbd560 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 23 Sep 2016 19:37:12 +0000
Subject: [PATCH] Fix build after COMMONS-122 Remove set backing-implementation of JsonValue
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java | 2 +-
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java | 3 +--
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java | 3 ++-
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java | 3 ++-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
index dc6400b..5ded770 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
@@ -178,7 +178,7 @@
final JsonValue firstItem = value.get(value.keys().iterator().next());
// assume all items have the same schema
jsonSchema.put("items", toJsonSchema(firstItem));
- if (value.isSet()) {
+ if (value.getObject() instanceof Set) {
jsonSchema.put("uniqueItems", true);
}
return jsonSchema;
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 2f414c7..b62d40a 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
@@ -13,7 +13,6 @@
*
* Copyright 2015-2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.rest2ldap;
import static org.forgerock.http.handler.Handlers.chainOf;
@@ -310,7 +309,7 @@
@VisibleForTesting
ConditionalFilter buildOAuth2Filter(final JsonValue config) throws HttpApplicationException {
final String realm = config.get(REALM).defaultTo("no_realm").asString();
- final Set<String> scopes = config.get(SCOPES).required().asSet(String.class);
+ final Set<String> scopes = config.get(SCOPES).required().as(setOf(String.class));
final AccessTokenResolver resolver =
createCachedTokenResolverIfNeeded(config, parseUnderlyingResolver(config));
final String resolverName = config.get(RESOLVER_CONFIG_OBJECT).asString();
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java
index 2683a40..4776a05 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java
@@ -16,6 +16,7 @@
package org.forgerock.opendj.rest2ldap.authz;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
+import static org.forgerock.json.JsonValueFunctions.*;
import static org.forgerock.opendj.ldap.requests.Requests.newSingleEntrySearchRequest;
import static org.forgerock.opendj.rest2ldap.authz.Utils.close;
import static org.forgerock.opendj.rest2ldap.authz.Utils.newAccessTokenException;
@@ -84,7 +85,7 @@
}
return new AccessTokenInfo(accessToken, token,
- accessToken.get("scope").required().asSet(String.class),
+ accessToken.get("scope").required().as(setOf(String.class)),
Long.parseLong(getRequiredFirstValue(accessToken.get("expireTime"))));
}
}, new Function<LdapException, AccessTokenInfo, AccessTokenException>() {
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java
index 5a96b5a..6a85f8d 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java
@@ -15,6 +15,7 @@
*/
package org.forgerock.opendj.rest2ldap.authz;
+import static org.forgerock.json.JsonValueFunctions.*;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
import static org.forgerock.opendj.rest2ldap.authz.Utils.newAccessTokenException;
import static org.forgerock.util.Reject.checkNotNull;
@@ -55,7 +56,7 @@
try {
final AccessTokenInfo result = new AccessTokenInfo(accessToken, token,
- accessToken.get("scope").required().asSet(String.class),
+ accessToken.get("scope").required().as(setOf(String.class)),
accessToken.get("expireTime").required().asLong());
return newResultPromise(result);
} catch (final JsonValueException e) {
--
Gitblit v1.10.0