inteligr8/acs-public-rest-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
Brian Long 2021-06-03 22:49:54 -04:00
commit cf1da9b6f1
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/inteligr8/alfresco/acs/AcsClient.java
View File

@ -2,6 +2,7 @@ package com.inteligr8.alfresco.acs;
import javax.ws.rs.client.Client; import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -26,4 +27,9 @@ public class AcsClient {
return client; return client;
} }
public WebTarget getTarget() {
return this.getClient()
.target(this.config.getBaseUrl());
}
} }

12
src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java
View File

@ -10,13 +10,13 @@ import org.springframework.context.annotation.Configuration;
@ComponentScan @ComponentScan
public class AcsClientConfiguration { public class AcsClientConfiguration {
@Value("${content.service.baseUrl}") @Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
private String baseUrl; private String baseUrl;
@Value("${content.service.security.basicAuth.username}") @Value("${content.service.security.basicAuth.username:admin}")
private String basicAuthUsername; private String basicAuthUsername;
@Value("${content.service.security.basicAuth.password}") @Value("${content.service.security.basicAuth.password:admin}")
private String basicAuthPassword; private String basicAuthPassword;
@Value("${content.service.security.accessToken}") @Value("${content.service.security.accessToken}")
@ -27,10 +27,10 @@ public class AcsClientConfiguration {
} }
public void authorize(Client client) { public void authorize(Client client) {
if (this.basicAuthUsername != null) { if (this.accessToken != null) {
client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
} else if (this.accessToken != null) {
client.register(new AccessTokenRequestFilter(this.accessToken)); client.register(new AccessTokenRequestFilter(this.accessToken));
} else if (this.basicAuthUsername != null) {
client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
} }
} }

10
src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java
View File

@ -38,14 +38,10 @@ public class ConnectionClientIT {
@Autowired @Autowired
private AcsClient client; private AcsClient client;
@Autowired
private AcsClientConfiguration config;
@Test @Test
//@EnabledIf("hostExists") //@EnabledIf("hostExists")
public void testDiscovery() { public void testDiscovery() {
Client client = this.client.getClient(); WebTarget target = this.client.getTarget();
WebTarget target = client.target(this.config.getBaseUrl());
DiscoveryApi api = WebResourceFactory.newResource(DiscoveryApi.class, target); DiscoveryApi api = WebResourceFactory.newResource(DiscoveryApi.class, target);
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository(); RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
@ -55,9 +51,9 @@ public class ConnectionClientIT {
} }
public boolean hostExists() { 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() .GET()
.build(); .build();