gCubeSystem
/
resource-registry-query-template-client
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed force URL in factory

This commit is contained in:
Luca Frosini 2022-07-25 11:16:03 +02:00
parent 4ed56600d6
commit d7edafcd49
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientFactory.java
View File

@ -26,21 +26,8 @@ public class ResourceRegistryQueryTemplateClientFactory {
return authorizationEntry.getContext();
}
private static String FORCED_URL = null;
protected static void forceToURL(String url){
FORCED_URL = url;
}
public static ResourceRegistryQueryTemplateClient create() {
String address = null;
if(FORCED_URL!=null){
address = FORCED_URL;
}else {
address = String.format("%s/%s", ServiceInstance.getServiceURL(),Constants.SERVICE_NAME);
}
String address = String.format("%s/%s", ServiceInstance.getServiceURL(),Constants.SERVICE_NAME);
logger.trace("The {} will be contacted at {}", Constants.SERVICE_NAME, address);
return new ResourceRegistryQueryTemplateClientImpl(address);
}

5
src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ContextTest.java
View File

@ -80,10 +80,7 @@ public class ContextTest {
}
RESOURCE_REGISTRY_URL = registryProperties.getProperty(RESOURCE_REGISTRY_URL_PROPERTY);
if(RESOURCE_REGISTRY_URL!=null){
ResourceRegistryQueryTemplateClientFactory.forceToURL(RESOURCE_REGISTRY_URL);
}
}
public static String getCurrentScope(String token) throws ObjectNotFound, Exception {

6
src/test/java/org/gcube/informationsystem/resourceregistry/queries/templates/ResourceRegistryQueryTemplateClientTest.java
View File

@ -42,7 +42,11 @@ public class ResourceRegistryQueryTemplateClientTest extends ContextTest {
protected ResourceRegistryQueryTemplateClient resourceRegistryQueryTemplateClient;
public ResourceRegistryQueryTemplateClientTest() {
resourceRegistryQueryTemplateClient = ResourceRegistryQueryTemplateClientFactory.create();
if(ContextTest.RESOURCE_REGISTRY_URL !=null && !ContextTest.RESOURCE_REGISTRY_URL.isEmpty()) {
resourceRegistryQueryTemplateClient = new ResourceRegistryQueryTemplateClientImpl(ContextTest.RESOURCE_REGISTRY_URL);
}else {
resourceRegistryQueryTemplateClient = ResourceRegistryQueryTemplateClientFactory.create();
}
}
public static String getUser() {