From 766d36ff97398486c95ba122a602807bced03642 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 21 Sep 2016 07:29:47 +0000
Subject: [PATCH] Consequence of CHF-47 Make Response constructor require a Status
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/InternalProxyAuthzFilter.java | 3 +--
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java | 4 ++--
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java | 3 +--
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/DirectConnectionFilterTest.java | 2 +-
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/ProxiedAuthV2FilterTest.java | 15 ++++++++++-----
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
index 274fb14..7cd737e 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
@@ -266,8 +266,7 @@
try {
authz.put(template.getSecurityContextID(), template.formatAsAuthzId(token.asJsonValue()));
} catch (final IllegalArgumentException e) {
- return newResultPromise(new Response().setStatus(Status.INTERNAL_SERVER_ERROR)
- .setCause(e));
+ return newResultPromise(new Response(Status.INTERNAL_SERVER_ERROR).setCause(e));
}
final Context securityContext = new SecurityContext(context, token.getToken(), authz);
return next.handle(securityContext, request);
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 27c586f..7607593 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
@@ -70,8 +70,7 @@
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(Status.valueOf(e.getCode())).setEntity(e.toJsonValue() .getObject());
if (response.getStatus() == Status.UNAUTHORIZED) {
response.getHeaders().put("WWW-Authenticate", "Basic");
}
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/DirectConnectionFilterTest.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/DirectConnectionFilterTest.java
index 67903c6..436183b 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/DirectConnectionFilterTest.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/DirectConnectionFilterTest.java
@@ -61,7 +61,7 @@
final Handler handler = mock(Handler.class);
final ArgumentCaptor<Context> captureContext = ArgumentCaptor.forClass(Context.class);
when(handler.handle(captureContext.capture(), any(Request.class)))
- .thenReturn(Response.newResponsePromise(new Response()));
+ .thenReturn(Response.newResponsePromise(new Response(Status.OK)));
filter.filter(new RootContext(), new Request(), handler);
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/ProxiedAuthV2FilterTest.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/ProxiedAuthV2FilterTest.java
index 24383f3..8e0b6d8 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/ProxiedAuthV2FilterTest.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/ProxiedAuthV2FilterTest.java
@@ -26,6 +26,7 @@
import org.forgerock.http.Handler;
import org.forgerock.http.protocol.Request;
import org.forgerock.http.protocol.Response;
+import org.forgerock.http.protocol.Status;
import org.forgerock.opendj.ldap.AbstractSynchronousConnection;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.Connection;
@@ -65,6 +66,7 @@
import org.testng.annotations.Test;
@Test
+@SuppressWarnings("javadoc")
public class ProxiedAuthV2FilterTest extends ForgeRockTestCase {
private ProxiedAuthV2Filter filter;
@@ -102,7 +104,7 @@
final SecurityContext securityContext = new SecurityContext(new RootContext(), "whatever", authz);
when(handler.handle(captureContext.capture(), any(Request.class)))
- .thenReturn(Response.newResponsePromise(new Response()));
+ .thenReturn(Response.newResponsePromise(new Response(Status.OK)));
filter.filter(securityContext, new Request(), handler);
final Connection proxiedConnection = captureContext.getValue().asContext(AuthenticatedConnectionContext.class)
@@ -135,6 +137,7 @@
@Override
public void close(UnbindRequest request, String reason) {
+ // nothing to do
}
@Override
@@ -176,10 +179,6 @@
}
@Override
- public void addConnectionEventListener(ConnectionEventListener listener) {
- }
-
- @Override
public boolean isClosed() {
return false;
}
@@ -190,7 +189,13 @@
}
@Override
+ public void addConnectionEventListener(ConnectionEventListener listener) {
+ // nothing to do
+ }
+
+ @Override
public void removeConnectionEventListener(ConnectionEventListener listener) {
+ // nothing to do
}
@Override
diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java
index b816745..2783b21 100644
--- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java
+++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java
@@ -91,7 +91,7 @@
expectedExceptionsMessageRegExp = ".*AccessTokenException.*Authorization server returned an error:.*")
public void testErrorResponse() throws Exception {
when(client.handle(eq(context), any(Request.class))).thenReturn(
- Response.newResponsePromise(new Response().setStatus(Status.UNAUTHORIZED)));
+ Response.newResponsePromise(new Response(Status.UNAUTHORIZED)));
resolver.resolve(context, "fake-access-token").get();
}
@@ -104,7 +104,7 @@
jsonResponse.put("an info", "info value");
when(client.handle(eq(context), any(Request.class))).thenReturn(
- Response.newResponsePromise(new Response().setStatus(Status.OK).setEntity(jsonResponse)));
+ Response.newResponsePromise(new Response(Status.OK).setEntity(jsonResponse)));
final Promise<AccessTokenInfo, AccessTokenException> promise = resolver.resolve(context, token);
ensureRequestIsCorrect(token);
return promise;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/InternalProxyAuthzFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/InternalProxyAuthzFilter.java
index da3364a..a3b8492 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/InternalProxyAuthzFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/InternalProxyAuthzFilter.java
@@ -123,8 +123,7 @@
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(Status.valueOf(e.getCode())).setEntity(e.toJsonValue().getObject());
return Promises.newResultPromise(response);
}
}
--
Gitblit v1.10.0