From faa3d499f6cfac4ab65219d4d17e872ffcac9ce2 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 3 Jun 2021 22:47:37 -0400 Subject: [PATCH] added getTarget() to api bean --- .../java/com/inteligr8/alfresco/acs/AcsClient.java | 6 ++++++ .../com/inteligr8/alfresco/acs/ConnectionClientIT.java | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java index e555543..dbd10c1 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java @@ -2,6 +2,7 @@ package com.inteligr8.alfresco.acs; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.WebTarget; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,4 +27,9 @@ public class AcsClient { return client; } + public WebTarget getTarget() { + return this.getClient() + .target(this.config.getBaseUrl()); + } + } diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java index 2cc0d4e..6b95894 100644 --- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java @@ -38,14 +38,10 @@ public class ConnectionClientIT { @Autowired private AcsClient client; - @Autowired - private AcsClientConfiguration config; - @Test //@EnabledIf("hostExists") public void testDiscovery() { - Client client = this.client.getClient(); - WebTarget target = client.target(this.config.getBaseUrl()); + WebTarget target = this.client.getTarget(); DiscoveryApi api = WebResourceFactory.newResource(DiscoveryApi.class, target); RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository(); @@ -55,9 +51,9 @@ public class ConnectionClientIT { } public boolean hostExists() { - String baseUrl = this.config.getBaseUrl(); + URI uri = this.client.getTarget().getUri(); - HttpRequest request = HttpRequest.newBuilder(URI.create(baseUrl)) + HttpRequest request = HttpRequest.newBuilder(uri) .GET() .build();