From 9e3ec85ee0af3867cf9d7aae822ca57e712e6d3f Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 3 Jun 2021 22:14:16 -0400 Subject: [PATCH] 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)); } }