From e67eef5bcd36405479e9b0b45a9f85a0fcccb926 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Thu, 3 Jun 2021 21:21:40 -0400
Subject: [PATCH 1/3] changed version for DEV

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 05c3d49..abf890c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-api</artifactId>
-	<version>2.0.0-v1</version>
+	<version>1.0-SNAPSHOT-v2</version>
 	<name>Alfresco Content Services ReST API Client for Java</name>
 
 	<properties>

From 9e3ec85ee0af3867cf9d7aae822ca57e712e6d3f Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Thu, 3 Jun 2021 22:14:16 -0400
Subject: [PATCH 2/3] added default prop values

---
 .../alfresco/acs/AcsClientConfiguration.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java
index a26f880..857ca8e 100644
--- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java
+++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java
@@ -10,13 +10,13 @@ import org.springframework.context.annotation.Configuration;
 @ComponentScan
 public class AcsClientConfiguration {
 
-	@Value("${content.service.baseUrl}")
+	@Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
 	private String baseUrl;
 
-	@Value("${content.service.security.basicAuth.username}")
+	@Value("${content.service.security.basicAuth.username:admin}")
 	private String basicAuthUsername;
 
-	@Value("${content.service.security.basicAuth.password}")
+	@Value("${content.service.security.basicAuth.password:admin}")
 	private String basicAuthPassword;
 
 	@Value("${content.service.security.accessToken}")
@@ -27,10 +27,10 @@ public class AcsClientConfiguration {
 	}
 
 	public void authorize(Client client) {
-		if (this.basicAuthUsername != null) {
-			client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
-		} else if (this.accessToken != null) {
+		if (this.accessToken != null) {
 			client.register(new AccessTokenRequestFilter(this.accessToken));
+		} else if (this.basicAuthUsername != null) {
+			client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
 		}
 	}
 

From faa3d499f6cfac4ab65219d4d17e872ffcac9ce2 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Thu, 3 Jun 2021 22:47:37 -0400
Subject: [PATCH 3/3] 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();