From a08c81f677247ec9eb7721a86250c663065e9930 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 22 Jun 2016 22:12:03 +0000
Subject: [PATCH] OPENDJ-2871 Add support for sub-resources and inheritance
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java
index 433d4f2..27c586f 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java
@@ -33,6 +33,13 @@
import org.forgerock.util.promise.Promises;
final class Utils {
+ private static final AsyncFunction<LdapException, Response, NeverThrowsException> HANDLE_CONNECTION_FAILURE =
+ new AsyncFunction<LdapException, Response, NeverThrowsException>() {
+ @Override
+ public Promise<Response, NeverThrowsException> apply(final LdapException exception) {
+ return asErrorResponse(exception);
+ }
+ };
private Utils() { }
@@ -58,19 +65,13 @@
}
static AsyncFunction<LdapException, Response, NeverThrowsException> handleConnectionFailure() {
- return new AsyncFunction<LdapException, Response, NeverThrowsException>() {
- @Override
- public Promise<Response, NeverThrowsException> apply(final LdapException exception) {
- return asErrorResponse(exception);
- }
- };
+ return HANDLE_CONNECTION_FAILURE;
}
static Promise<Response, NeverThrowsException> asErrorResponse(final Throwable t) {
final ResourceException e = asResourceException(t);
- final Response response = new Response()
- .setStatus(Status.valueOf(e.getCode()))
- .setEntity(e.toJsonValue().getObject());
+ final Response response = new Response().setStatus(Status.valueOf(e.getCode()))
+ .setEntity(e.toJsonValue() .getObject());
if (response.getStatus() == Status.UNAUTHORIZED) {
response.getHeaders().put("WWW-Authenticate", "Basic");
}
--
Gitblit v1.10.0