forked from gCubeSystem/registry-publisher
Compare commits
3 Commits
master
...
rest-colle
| Author | SHA1 | Date |
|---|---|---|
lucio
|
eb40fd0eeb | |
|
lucio
|
858c935b6c | |
|
lucio
|
e97ec6fbd1 |
15
.classpath
15
.classpath
|
|
@ -6,19 +6,16 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</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">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
|
|
@ -28,6 +25,12 @@
|
|||
</attributes>
|
||||
</classpathentry>
|
||||
<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"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
||||
org.eclipse.jdt.core.compiler.compliance=1.7
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
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
2
pom.xml
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
<groupId>org.gcube.resources</groupId>
|
||||
<artifactId>registry-publisher</artifactId>
|
||||
<version>1.3.0</version>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
|
||||
<dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
log.debug("id generated: "+id);
|
||||
ResourceMediator.setId(resource, id);
|
||||
}
|
||||
HashSet<String> vosScopes = updateResourceScopes(resource);
|
||||
// add the new scopes
|
||||
for(String scope: scopes){
|
||||
log.debug("[VOCREATE] new scope added {}",scope);
|
||||
|
|
@ -100,7 +101,6 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
log.error("the resource is not valid", e);
|
||||
throw new IllegalArgumentException("the resource is not valid ", e.getCause());
|
||||
}
|
||||
HashSet<String> vosScopes = updateResourceScopes(resource);
|
||||
try{
|
||||
if(currentScope != null){
|
||||
// checking the current scope: if the operation fails in the current VO it will give an exception, if it fails in another VO no exception will be given
|
||||
|
|
@ -446,9 +446,6 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
|
||||
private <T extends Resource> HashSet<String> updateResourceScopes(T resource) {
|
||||
HashSet<String> vosScopes = Utils.getInternalVOScopes(resource);
|
||||
// if the resource type is a RunningInstance or a HostingNode the check on the most recent resource is bypassed
|
||||
if((resource.type().toString().equalsIgnoreCase("RunningInstance")) || (resource.type().toString().equalsIgnoreCase("GHN")))
|
||||
return vosScopes;
|
||||
//extract the scopes from the more recent resource found at vo level
|
||||
List <String> latestScopesFound= Utils.setLatestInternalScopes(resource, vosScopes);
|
||||
log.debug("latest scope found are "+latestScopesFound);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
package org.gcube.informationsystem.publisher.stubs.registry;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
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.RemoveException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceDoesNotExistException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceNotAcceptedException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.UpdateException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class CollectorStubs implements RegistryStub {
|
||||
|
||||
private static Logger log = LoggerFactory.getLogger(CollectorStubs.class);
|
||||
|
||||
public static final String TOKEN_HEADER_ENTRY = "gcube-token";
|
||||
public static final String SCOPE_HEADER_ENTRY = "gcube-scope";
|
||||
|
||||
private String endopoint;
|
||||
|
||||
public CollectorStubs(String endopoint) {
|
||||
super();
|
||||
this.endopoint = endopoint;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void create(String profile, String type)
|
||||
throws InvalidResourceException, ResourceNotAcceptedException, CreateException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "POST");
|
||||
connection.setDoOutput(true);
|
||||
connection.setRequestProperty("Content-type", "text/xml");
|
||||
|
||||
try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){
|
||||
os.write(profile.getBytes());
|
||||
}
|
||||
|
||||
if (connection.getResponseCode()!=200) throw new Exception("error creating resource "+connection.getResponseCode());
|
||||
}catch (Exception e) {
|
||||
log.error("error on create",e);
|
||||
throw new RemoveException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void update(String id, String type, String profile)
|
||||
throws InvalidResourceException, ResourceNotAcceptedException, UpdateException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type).append("/").append(id);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "PUT");
|
||||
connection.setDoOutput(true);
|
||||
connection.setRequestProperty("Content-type", "text/xml");
|
||||
|
||||
try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){
|
||||
os.write(profile.getBytes());
|
||||
}
|
||||
|
||||
if (connection.getResponseCode()!=200) throw new Exception("error updating resource "+connection.getResponseCode());
|
||||
}catch (Exception e) {
|
||||
log.error("error on remove",e);
|
||||
throw new RemoveException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void remove(String id, String type) throws ResourceDoesNotExistException, RemoveException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type).append("/").append(id);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "DELETE");
|
||||
connection.setDoInput(true);
|
||||
if (connection.getResponseCode()!=200){
|
||||
log.info("response code is not 200");
|
||||
throw new Exception("error removing resource with id "+id);
|
||||
}
|
||||
}catch (Exception e) {
|
||||
log.error("error on remove",e);
|
||||
throw new RemoveException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private HttpURLConnection makeRequest(URL url, String method) throws Exception{
|
||||
HttpURLConnection connection;
|
||||
if (url.toString().startsWith("https://"))
|
||||
connection = (HttpsURLConnection)url.openConnection();
|
||||
else connection = (HttpURLConnection)url.openConnection();
|
||||
|
||||
if (SecurityTokenProvider.instance.get()!=null)
|
||||
connection.setRequestProperty(TOKEN_HEADER_ENTRY,SecurityTokenProvider.instance.get());
|
||||
else if (ScopeProvider.instance.get()!=null)
|
||||
connection.setRequestProperty(SCOPE_HEADER_ENTRY,ScopeProvider.instance.get());
|
||||
else throw new RuntimeException("Collector requires authorization (via token or scope)");
|
||||
|
||||
connection.setRequestMethod(method);
|
||||
return connection;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,11 +2,15 @@ package org.gcube.informationsystem.publisher.stubs.registry;
|
|||
|
||||
import static org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants.*;
|
||||
|
||||
import java.io.StringWriter;
|
||||
|
||||
import javax.jws.WebMethod;
|
||||
import javax.jws.WebParam;
|
||||
import javax.jws.WebResult;
|
||||
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.InvalidResourceException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.RemoveException;
|
||||
|
|
@ -35,6 +39,7 @@ public interface RegistryStub {
|
|||
@WebResult()
|
||||
void create(@WebParam(name="profile") String profile, @WebParam(name="type") String type ) throws InvalidResourceException,
|
||||
ResourceNotAcceptedException, CreateException;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param id the id of the resource to update
|
||||
|
|
@ -48,7 +53,8 @@ public interface RegistryStub {
|
|||
@WebMethod(operationName="update")
|
||||
@WebResult()
|
||||
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
|
||||
|
|
@ -60,7 +66,6 @@ public interface RegistryStub {
|
|||
@WebMethod(operationName="remove")
|
||||
@WebResult()
|
||||
void remove(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type) throws ResourceDoesNotExistException,
|
||||
RemoveException;
|
||||
|
||||
|
||||
RemoveException;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,10 @@ import java.util.List;
|
|||
|
||||
import org.gcube.common.resources.gcore.GCoreEndpoint;
|
||||
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.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.RegistryStub;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
|
|
@ -21,16 +23,17 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class RegistryStubs {
|
||||
|
||||
|
||||
private RegistryCache cache = new RegistryCache(10);
|
||||
private List<URI> endpoints;
|
||||
private static final Logger log = LoggerFactory.getLogger(RegistryStubs.class);
|
||||
|
||||
|
||||
|
||||
private static final String XMLSTOREACCESS_SERVICE ="XMLStoreService";
|
||||
|
||||
|
||||
public List<URI> getEndPoints(){
|
||||
String scope=ScopeProvider.instance.get();
|
||||
// able/disable cache
|
||||
// able/disable cache
|
||||
endpoints=(List<URI>)cache.get(scope);
|
||||
if(endpoints==null){
|
||||
SimpleQuery query = queryFor(GCoreEndpoint.class);
|
||||
|
|
@ -40,30 +43,36 @@ public class RegistryStubs {
|
|||
public URI parse(String result) throws Exception {
|
||||
return new URI(result.replaceAll("\n", ""));
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
DiscoveryClient<URI> client = new DelegateClient<URI>(uriParser, new ICClient());
|
||||
query.addCondition("$resource/Profile/ServiceClass/text() eq '"+RegistryConstants.service_class+"'")
|
||||
.addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'")
|
||||
.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()");
|
||||
.addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'")
|
||||
.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()");
|
||||
endpoints = client.submit(query);
|
||||
if (endpoints.size()==0){
|
||||
throw new IllegalArgumentException("No registry endpoint founded");
|
||||
}
|
||||
// able/disable cache
|
||||
// able/disable cache
|
||||
cache.put(scope, endpoints);
|
||||
}
|
||||
return endpoints;
|
||||
}
|
||||
|
||||
|
||||
public RegistryStub getStubs() throws RegistryNotFoundException{
|
||||
URI endpoint=null;
|
||||
//use another method to cache epr
|
||||
endpoint = getEndPoints().get(0);
|
||||
log.debug("get stubs from endpoint: "+ endpoint);
|
||||
return stubFor(RegistryConstants.registry).at(endpoint);
|
||||
ServiceMap serviceMap = ServiceMap.instance;
|
||||
if (serviceMap!=null && serviceMap.version().equals("2.0.0")) {
|
||||
String endpoint = serviceMap.endpoint(XMLSTOREACCESS_SERVICE);
|
||||
return new CollectorStubs(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{
|
||||
log.debug("get stubs from endpoint: "+ endpoint);
|
||||
return stubFor(RegistryConstants.registry).at(endpoint);
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@ public class Utils {
|
|||
|
||||
private static <T extends Resource> List<String> extractInternalScopes(T resource, String latestVO) {
|
||||
T extractedResource=null;
|
||||
log.debug("checking resource "+resource.id()+" type: "+resource.type());
|
||||
if(resource.type().toString().equalsIgnoreCase("RuntimeResource")){
|
||||
extractedResource= (T)getServiceEndpointByID(resource.id(), latestVO);
|
||||
}else if(resource.type().toString().equalsIgnoreCase("GenericResource")){
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ package org.gcube.informationsystem.publisher;
|
|||
|
||||
import static org.gcube.common.resources.gcore.Resources.print;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.resources.gcore.GCoreEndpoint;
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.gcube.common.resources.gcore.Resource.Type;
|
||||
|
|
@ -14,38 +16,39 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class GCoreEndpointPublisherTests {
|
||||
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(RegistryPublisherTests.class);
|
||||
static GCoreEndpoint running;
|
||||
static RegistryPublisher rp;
|
||||
static Resource r;
|
||||
|
||||
|
||||
@BeforeClass
|
||||
public static void init(){
|
||||
// ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio");
|
||||
ScopeProvider.instance.set("/gcube/devsec");
|
||||
running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml"));
|
||||
// ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio");
|
||||
ScopeProvider.instance.set("/gcube/devNext");
|
||||
SecurityTokenProvider.instance.set("52b59669-ccde-46d2-a4da-108b9e941f7c-98187548");
|
||||
rp=RegistryPublisherFactory.create();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void printTest(){
|
||||
print(running);
|
||||
//resource-specific tests
|
||||
//print(running);
|
||||
//resource-specific tests
|
||||
assertEquals(Type.GCOREENDPOINT,running.type());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void registerCreate(){
|
||||
r=rp.create(running);
|
||||
System.out.println("new resource created: ");
|
||||
if(r!=null)
|
||||
print(r);
|
||||
assertEquals(running,r);
|
||||
|
||||
for (int i = 0; i<10; i++) {
|
||||
running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml"));
|
||||
r=rp.create(running);
|
||||
System.out.println("new resource created: "+r.id());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@AfterClass
|
||||
|
||||
|
||||
/*@AfterClass
|
||||
public static void forceDeleteResource(){
|
||||
try {
|
||||
Thread.sleep(3000);
|
||||
|
|
@ -59,8 +62,8 @@ public class GCoreEndpointPublisherTests {
|
|||
advancedPublisher.forceRemove(r);
|
||||
ScopeProvider.instance.set(currentScope);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<Resource version="0.4.x">
|
||||
<ID>5d244ab0-9d79-11e3-af18-dd5904b11dd6</ID>
|
||||
<ID></ID>
|
||||
<Type>RunningInstance</Type>
|
||||
<Scopes>
|
||||
</Scopes>
|
||||
|
|
|
|||
Loading…
Reference in New Issue