[java-idp-plugin-duo] branch dev/JDUO-71 updated: Fix remaining compilation issues
Phil Smart
philip.smart at jisc.ac.uk
Mon Jul 3 13:28:35 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JDUO-71
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=b79303ead4d4890242e31419001b2fa415620cc9
The following commit(s) were added to refs/heads/dev/JDUO-71 by this push:
new b79303e Fix remaining compilation issues
b79303e is described below
commit b79303ead4d4890242e31419001b2fa415620cc9
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Jul 3 14:28:32 2023 +0100
Fix remaining compilation issues
---
.../duo/nimbus/impl/NimbusClientFactoryTest.java | 4 +-
.../duo/nimbus/impl/NimbusClientSupportTest.java | 4 +-
.../authn/duo/nimbus/impl/NimbusClientTest.java | 52 +++++++---------------
3 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactoryTest.java b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactoryTest.java
index 3e5b5f7..19a014e 100644
--- a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactoryTest.java
+++ b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactoryTest.java
@@ -5,7 +5,7 @@ import static org.testng.Assert.assertNotNull;
import javax.annotation.Nonnull;
-import org.apache.http.client.HttpClient;
+import org.apache.hc.client5.http.classic.HttpClient;
import org.mockito.Mockito;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
/** Test for the NimbusClientFactory class. */
diff --git a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupportTest.java b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupportTest.java
index 4ec718c..dac2ddb 100644
--- a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupportTest.java
+++ b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupportTest.java
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.shared.component.ComponentInitializationException;
/** Tests for the NimbusClientSupport class.*/
public class NimbusClientSupportTest {
@@ -45,7 +45,7 @@ public class NimbusClientSupportTest {
@Nonnull static final String AUD = "audience";
/** Class logger. */
- @Nonnull private Logger log = LoggerFactory.getLogger(NimbusClientSupportTest.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(NimbusClientSupportTest.class);
/** A dummy integration.*/
@Nullable private DefaultDuoOIDCIntegration integ;
diff --git a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientTest.java b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientTest.java
index b983f66..c177989 100644
--- a/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientTest.java
+++ b/idp-duo-nimbus-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientTest.java
@@ -47,13 +47,11 @@ import java.nio.charset.StandardCharsets;
import javax.annotation.Nonnull;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.protocol.HttpContext;
import org.mockito.Mockito;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -61,11 +59,10 @@ import org.testng.annotations.Test;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jwt.JWT;
-
import net.shibboleth.idp.plugin.authn.duo.DefaultDuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** Tests for the NimbusClient class.*/
public class NimbusClientTest {
@@ -173,14 +170,11 @@ public class NimbusClientTest {
public void testTokenExchange() throws Exception {
final HttpClient httpClient = Mockito.mock(HttpClient.class);
- final HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
- final StatusLine statusLine = Mockito.mock(StatusLine.class);
+ final ClassicHttpResponse httpResponse = Mockito.mock(ClassicHttpResponse.class);
- Mockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
- Mockito.when(statusLine.getStatusCode()).thenReturn(200);
+ Mockito.when(httpResponse.getCode()).thenReturn(200);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(ID_TOKEN_RESPONSE));
- Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
+ Mockito.when(httpClient.executeOpen(null, (HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
.thenReturn(httpResponse);
// create new client with mock response
@@ -202,12 +196,9 @@ public class NimbusClientTest {
public void testTokenExchangeInternalServerErrorResponse() throws Exception {
final HttpClient httpClient = Mockito.mock(HttpClient.class);
- final HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
- final StatusLine statusLine = Mockito.mock(StatusLine.class);
+ final ClassicHttpResponse httpResponse = Mockito.mock(ClassicHttpResponse.class);
- Mockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
- Mockito.when(statusLine.getStatusCode()).thenReturn(500);
+ Mockito.when(httpResponse.getCode()).thenReturn(500);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(ID_TOKEN_REPONSE_NULL));
Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
.thenReturn(httpResponse);
@@ -227,12 +218,9 @@ public class NimbusClientTest {
*/
@Test public void testHealthCheck() throws Exception {
final HttpClient httpClient = Mockito.mock(HttpClient.class);
- final HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
- final StatusLine statusLine = Mockito.mock(StatusLine.class);
-
- Mockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
+ final ClassicHttpResponse httpResponse = Mockito.mock(ClassicHttpResponse.class);
- Mockito.when(statusLine.getStatusCode()).thenReturn(200);
+ Mockito.when(httpResponse.getCode()).thenReturn(500);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(HEALTH_CHECK_REPONSE));
Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
.thenReturn(httpResponse);
@@ -254,12 +242,9 @@ public class NimbusClientTest {
*/
@Test public void testHealthCheckMoreFields() throws Exception {
final HttpClient httpClient = Mockito.mock(HttpClient.class);
- final HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
- final StatusLine statusLine = Mockito.mock(StatusLine.class);
+ final ClassicHttpResponse httpResponse = Mockito.mock(ClassicHttpResponse.class);
- Mockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
- Mockito.when(statusLine.getStatusCode()).thenReturn(200);
+ Mockito.when(httpResponse.getCode()).thenReturn(500);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(HEALTH_CHECK_REPONSE_MORE_FIELDS));
Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
.thenReturn(httpResponse);
@@ -281,12 +266,9 @@ public class NimbusClientTest {
*/
@Test public void testHealthCheckError() throws Exception {
final HttpClient httpClient = Mockito.mock(HttpClient.class);
- final HttpResponse httpResponse = Mockito.mock(HttpResponse.class);
- final StatusLine statusLine = Mockito.mock(StatusLine.class);
-
- Mockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
+ final ClassicHttpResponse httpResponse = Mockito.mock(ClassicHttpResponse.class);
- Mockito.when(statusLine.getStatusCode()).thenReturn(200);
+ Mockito.when(httpResponse.getCode()).thenReturn(500);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(HEALTH_CHECK_REPONSE_ERROR));
Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
.thenReturn(httpResponse);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list