roberto.cirillo
/
registry-publisher
forked from gCubeSystem/registry-publisher
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added new IC REST calls

This commit is contained in:
lucio 2019-10-24 19:03:32 +02:00
parent 108c194bf2
commit e97ec6fbd1
6 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.classpath
View File

@ -6,19 +6,16 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
@ -28,6 +25,12 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/ic-client"/>
<classpathentry combineaccessrules="false" kind="src" path="/common-scope-maps"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

7
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,5 +1,6 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

2
pom.xml
View File

@ -21,7 +21,7 @@
<groupId>org.gcube.resources</groupId> <groupId>org.gcube.resources</groupId>
<artifactId>registry-publisher</artifactId> <artifactId>registry-publisher</artifactId>
<version>1.3.0</version> <version>1.3.0-SNAPSHOT</version>
<dependencies> <dependencies>

13
src/main/java/org/gcube/informationsystem/publisher/stubs/registry/RegistryStub.java
View File

@ -2,11 +2,15 @@ package org.gcube.informationsystem.publisher.stubs.registry;
import static org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants.*; import static org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants.*;
import java.io.StringWriter;
import javax.jws.WebMethod; import javax.jws.WebMethod;
import javax.jws.WebParam; import javax.jws.WebParam;
import javax.jws.WebResult; import javax.jws.WebResult;
import javax.jws.WebService; import javax.jws.WebService;
import org.gcube.common.resources.gcore.Resource;
import org.gcube.common.resources.gcore.Resources;
import org.gcube.informationsystem.publisher.stubs.registry.faults.CreateException; import org.gcube.informationsystem.publisher.stubs.registry.faults.CreateException;
import org.gcube.informationsystem.publisher.stubs.registry.faults.InvalidResourceException; import org.gcube.informationsystem.publisher.stubs.registry.faults.InvalidResourceException;
import org.gcube.informationsystem.publisher.stubs.registry.faults.RemoveException; import org.gcube.informationsystem.publisher.stubs.registry.faults.RemoveException;
@ -35,6 +39,7 @@ public interface RegistryStub {
@WebResult() @WebResult()
void create(@WebParam(name="profile") String profile, @WebParam(name="type") String type ) throws InvalidResourceException, void create(@WebParam(name="profile") String profile, @WebParam(name="type") String type ) throws InvalidResourceException,
ResourceNotAcceptedException, CreateException; ResourceNotAcceptedException, CreateException;
/** /**
* *
* @param id the id of the resource to update * @param id the id of the resource to update
@ -48,7 +53,8 @@ public interface RegistryStub {
@WebMethod(operationName="update") @WebMethod(operationName="update")
@WebResult() @WebResult()
void update(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type, @WebParam(name="xmlProfile") String profile ) throws InvalidResourceException, void update(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type, @WebParam(name="xmlProfile") String profile ) throws InvalidResourceException,
ResourceNotAcceptedException, UpdateException; ResourceNotAcceptedException, UpdateException;
/** /**
* *
* @param id the id of the resource to remove * @param id the id of the resource to remove
@ -60,7 +66,6 @@ public interface RegistryStub {
@WebMethod(operationName="remove") @WebMethod(operationName="remove")
@WebResult() @WebResult()
void remove(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type) throws ResourceDoesNotExistException, void remove(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type) throws ResourceDoesNotExistException,
RemoveException; RemoveException;
} }

37
src/main/java/org/gcube/informationsystem/publisher/utils/RegistryStubs.java
View File

@ -8,8 +8,10 @@ import java.util.List;
import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.resources.gcore.GCoreEndpoint;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.common.scope.api.ServiceMap;
import org.gcube.informationsystem.publisher.cache.RegistryCache; import org.gcube.informationsystem.publisher.cache.RegistryCache;
import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException; import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException;
import org.gcube.informationsystem.publisher.stubs.registry.CollectorStubs;
import org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants; import org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants;
import org.gcube.informationsystem.publisher.stubs.registry.RegistryStub; import org.gcube.informationsystem.publisher.stubs.registry.RegistryStub;
import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.api.DiscoveryClient;
@ -21,16 +23,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class RegistryStubs { public class RegistryStubs {
private RegistryCache cache = new RegistryCache(10); private RegistryCache cache = new RegistryCache(10);
private List<URI> endpoints; private List<URI> endpoints;
private static final Logger log = LoggerFactory.getLogger(RegistryStubs.class); private static final Logger log = LoggerFactory.getLogger(RegistryStubs.class);
private static final String XMLSTOREACCESS_SERVICE ="XMLStoreService";
public List<URI> getEndPoints(){ public List<URI> getEndPoints(){
String scope=ScopeProvider.instance.get(); String scope=ScopeProvider.instance.get();
// able/disable cache // able/disable cache
endpoints=(List<URI>)cache.get(scope); endpoints=(List<URI>)cache.get(scope);
if(endpoints==null){ if(endpoints==null){
SimpleQuery query = queryFor(GCoreEndpoint.class); SimpleQuery query = queryFor(GCoreEndpoint.class);
@ -40,30 +43,36 @@ public class RegistryStubs {
public URI parse(String result) throws Exception { public URI parse(String result) throws Exception {
return new URI(result.replaceAll("\n", "")); return new URI(result.replaceAll("\n", ""));
} }
}; };
DiscoveryClient<URI> client = new DelegateClient<URI>(uriParser, new ICClient()); DiscoveryClient<URI> client = new DelegateClient<URI>(uriParser, new ICClient());
query.addCondition("$resource/Profile/ServiceClass/text() eq '"+RegistryConstants.service_class+"'") query.addCondition("$resource/Profile/ServiceClass/text() eq '"+RegistryConstants.service_class+"'")
.addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'") .addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'")
.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()"); .setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()");
endpoints = client.submit(query); endpoints = client.submit(query);
if (endpoints.size()==0){ if (endpoints.size()==0){
throw new IllegalArgumentException("No registry endpoint founded"); throw new IllegalArgumentException("No registry endpoint founded");
} }
// able/disable cache // able/disable cache
cache.put(scope, endpoints); cache.put(scope, endpoints);
} }
return endpoints; return endpoints;
} }
public RegistryStub getStubs() throws RegistryNotFoundException{ public RegistryStub getStubs() throws RegistryNotFoundException{
URI endpoint=null; ServiceMap serviceMap = ServiceMap.instance;
//use another method to cache epr if (serviceMap!=null && serviceMap.version().equals("2.0.0")) {
endpoint = getEndPoints().get(0); String endpoint = serviceMap.endpoint(XMLSTOREACCESS_SERVICE);
log.debug("get stubs from endpoint: "+ endpoint); return new CollectorStubs(endpoint);
return stubFor(RegistryConstants.registry).at(endpoint); } else {
//use another method to cache epr
URI endpoint = getEndPoints().get(0);
log.debug("get stubs from endpoint: "+ endpoint);
return stubFor(RegistryConstants.registry).at(endpoint);
}
} }
public RegistryStub getStubs(URI endpoint) throws RegistryNotFoundException{ public RegistryStub getStubs(URI endpoint) throws RegistryNotFoundException{
log.debug("get stubs from endpoint: "+ endpoint); log.debug("get stubs from endpoint: "+ endpoint);
return stubFor(RegistryConstants.registry).at(endpoint); return stubFor(RegistryConstants.registry).at(endpoint);

2
src/test/java/org/gcube/informationsystem/publisher/GCoreEndpointPublisherTests.java
View File

@ -23,7 +23,7 @@ public class GCoreEndpointPublisherTests {
@BeforeClass @BeforeClass
public static void init(){ public static void init(){
// ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio"); // ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio");
ScopeProvider.instance.set("/gcube/devsec"); ScopeProvider.instance.set("/gcube/devNext");
running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml")); running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml"));
rp=RegistryPublisherFactory.create(); rp=RegistryPublisherFactory.create();
} }