Backported service instance predictive URL
This commit is contained in:
parent
621f1abaaa
commit
e9d110e5a1
|
@ -1,17 +1,10 @@
|
||||||
package org.gcube.informationsystem.resourceregistry.publisher;
|
package org.gcube.informationsystem.resourceregistry.publisher;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import org.gcube.common.authorization.library.AuthorizationEntry;
|
import org.gcube.common.authorization.library.AuthorizationEntry;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.common.resources.gcore.GCoreEndpoint;
|
|
||||||
import org.gcube.common.resources.gcore.ServiceEndpoint;
|
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.Constants;
|
import org.gcube.informationsystem.resourceregistry.api.Constants;
|
||||||
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
|
import org.gcube.informationsystem.resourceregistry.api.rest.ServiceInstance;
|
||||||
import org.gcube.resources.discovery.icclient.ICFactory;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
@ -22,57 +15,6 @@ public class ResourceRegistryPublisherFactory {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ResourceRegistryPublisherFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(ResourceRegistryPublisherFactory.class);
|
||||||
|
|
||||||
protected static boolean HIERARCHICAL_MODE;
|
|
||||||
|
|
||||||
public static boolean isHierarchicalMode() {
|
|
||||||
return ResourceRegistryPublisherFactory.HIERARCHICAL_MODE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The affected methods are {@link ResourceRegistryPublisher} safe methods i.e. read* and exists*
|
|
||||||
* @param hierarchicalMode
|
|
||||||
*/
|
|
||||||
public static void setHierarchicalMode(boolean hierarchicalMode) {
|
|
||||||
ResourceRegistryPublisherFactory.HIERARCHICAL_MODE = hierarchicalMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static boolean INCLUDE_CONTEXTS_IN_INSTANCES_HEADER;
|
|
||||||
|
|
||||||
protected static boolean includeContextsInInstanceHeader() {
|
|
||||||
return ResourceRegistryPublisherFactory.INCLUDE_CONTEXTS_IN_INSTANCES_HEADER;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The affected methods are {@link ResourceRegistryPublisher} instances safe methods i.e. read* and exists*
|
|
||||||
* @param includeContextsInInstancesHeader
|
|
||||||
*/
|
|
||||||
public static void includeContextsInInstanceHeader(boolean includeContextsInInstancesHeader) {
|
|
||||||
ResourceRegistryPublisherFactory.INCLUDE_CONTEXTS_IN_INSTANCES_HEADER = includeContextsInInstancesHeader;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static List<String> addresses;
|
|
||||||
|
|
||||||
static {
|
|
||||||
addresses = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String FORCED_URL = null;
|
|
||||||
|
|
||||||
protected static void forceToURL(String url){
|
|
||||||
FORCED_URL = url;
|
|
||||||
HIERARCHICAL_MODE = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String classFormat = "$resource/Profile/ServiceClass/text() eq '%1s'";
|
|
||||||
private static String nameFormat = "$resource/Profile/ServiceName/text() eq '%1s'";
|
|
||||||
private static String statusFormat = "$resource/Profile/DeploymentData/Status/text() eq 'ready'";
|
|
||||||
private static String containsFormat = "$entry/@EntryName eq '%1s'";
|
|
||||||
|
|
||||||
|
|
||||||
private static String serviceEndpointCategoryFormat = "$resource/Profile/Category/text() eq '%1s'";
|
|
||||||
private static String serviceEndpointNameFormat = "$resource/Profile/Name/text() eq '%1s'";
|
|
||||||
private static String serviceEndpointstatusFormat = "$resource/Profile/RunTime/Status/text() eq 'READY'";
|
|
||||||
|
|
||||||
public static String getCurrentContextFullName() {
|
public static String getCurrentContextFullName() {
|
||||||
String token = SecurityTokenProvider.instance.get();
|
String token = SecurityTokenProvider.instance.get();
|
||||||
AuthorizationEntry authorizationEntry = null;
|
AuthorizationEntry authorizationEntry = null;
|
||||||
|
@ -84,43 +26,10 @@ public class ResourceRegistryPublisherFactory {
|
||||||
return authorizationEntry.getContext();
|
return authorizationEntry.getContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SimpleQuery queryForService(){
|
private static String FORCED_URL = null;
|
||||||
return ICFactory.queryFor(GCoreEndpoint.class)
|
|
||||||
.addCondition(String.format(classFormat, Constants.SERVICE_CLASS))
|
|
||||||
.addCondition(String.format(nameFormat, Constants.SERVICE_NAME))
|
|
||||||
.addCondition(String.format(statusFormat))
|
|
||||||
.addVariable("$entry","$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint")
|
|
||||||
.addCondition(String.format(containsFormat, Constants.SERVICE_ENTRY_NAME))
|
|
||||||
.setResult("$entry/text()");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static SimpleQuery queryForProxy(){
|
protected static void forceToURL(String url){
|
||||||
return ICFactory.queryFor(ServiceEndpoint.class)
|
FORCED_URL = url;
|
||||||
.addCondition(String.format(serviceEndpointCategoryFormat, Constants.SERVICE_CLASS))
|
|
||||||
.addCondition(String.format(serviceEndpointNameFormat, Constants.SERVICE_NAME))
|
|
||||||
.addCondition(String.format(serviceEndpointstatusFormat))
|
|
||||||
.addVariable("$entry","$resource/Profile/AccessPoint/Interface/Endpoint")
|
|
||||||
.addCondition(String.format(containsFormat, Constants.SERVICE_ENTRY_NAME))
|
|
||||||
.setResult("$entry/text()");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected static List<String> getAddresses(){
|
|
||||||
List<String> addresses = new ArrayList<>();
|
|
||||||
|
|
||||||
try {
|
|
||||||
SimpleQuery proxyQuery = queryForProxy();
|
|
||||||
addresses = ICFactory.client().submit(proxyQuery);
|
|
||||||
if(addresses==null || addresses.isEmpty()){
|
|
||||||
throw new Exception("No ResourceRegistry Proxy Found");
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.debug("{}. Looking for RunningInstance.", e.getMessage());
|
|
||||||
SimpleQuery serviceQuery = queryForService();
|
|
||||||
addresses = ICFactory.client().submit(serviceQuery);
|
|
||||||
}
|
|
||||||
|
|
||||||
return addresses;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ResourceRegistryPublisher create() {
|
public static ResourceRegistryPublisher create() {
|
||||||
|
@ -129,21 +38,10 @@ public class ResourceRegistryPublisherFactory {
|
||||||
if(FORCED_URL!=null){
|
if(FORCED_URL!=null){
|
||||||
address = FORCED_URL;
|
address = FORCED_URL;
|
||||||
}else {
|
}else {
|
||||||
|
address = String.format("%s/%s", ServiceInstance.getServiceURL(),Constants.SERVICE_NAME);
|
||||||
if(addresses==null || addresses.isEmpty()) {
|
|
||||||
addresses = getAddresses();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(addresses==null || addresses.isEmpty()){
|
|
||||||
String error = String.format("No %s:%s found in the current context %s", Constants.SERVICE_CLASS, Constants.SERVICE_NAME, getCurrentContextFullName());
|
|
||||||
throw new RuntimeException(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
Random random = new Random();
|
|
||||||
int index = random.nextInt(addresses.size());
|
|
||||||
address = addresses.get(index);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.trace("The {} will be contacted at {}", Constants.SERVICE_NAME, address);
|
||||||
return new ResourceRegistryPublisherImpl(address);
|
return new ResourceRegistryPublisherImpl(address);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue