gCubeSystem
/
gcube-cms-suite
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ticket #23894 : client to expose relationship management methods

This commit is contained in:
Fabio Sinibaldi 2022-09-22 11:15:08 +02:00
parent 71d383e162
commit d05db92597
7 changed files with 183 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java
View File

@ -9,9 +9,8 @@ import org.gcube.application.geoportal.common.faults.InvalidRequestException;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.configuration.Configuration;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
import org.gcube.application.geoportal.common.model.rest.StepExecutionRequest;
import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject;
import org.gcube.application.geoportal.common.model.rest.*;
import org.gcube.application.geoportal.common.rest.InterfaceConstants;
import org.gcube.application.geoportal.common.rest.Projects;
import org.gcube.common.clients.Call;
@ -23,6 +22,7 @@ import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.List;
@RequiredArgsConstructor
@Slf4j
@ -280,7 +280,7 @@ public class DefaultDocumentsClient<T extends Project> implements Projects<T> {
@Override
public T updateDocument(String id, Document updatedDocument) throws RemoteException {
try {
log.debug("Updateing {} [useCaseDescriptor {} , class {}] with ",
log.debug("Updating {} [useCaseDescriptor {} , class {}] with ",
id, profileID,getManagedClass(),updatedDocument);
Call<WebTarget, T> call = endpoint -> {
return ResponseCommons.check(endpoint.path(profileID).path(id).
@ -299,5 +299,95 @@ public class DefaultDocumentsClient<T extends Project> implements Projects<T> {
}
}
@Override
public Project setRelation(CreateRelationshipRequest request) throws RemoteException {
try {
log.debug("Setting relationship {}:{} --{}--> {}:{}",
profileID, request.getProjectId(), request.getRelationshipId(),
request.getTargetUCD(),request.getTargetId());
Call<WebTarget, T> call = endpoint -> {
return ResponseCommons.check(endpoint.path(profileID).
path(InterfaceConstants.Methods.RELATIONSHIP).
path(request.getRelationshipId()).
queryParam(InterfaceConstants.Parameters.TARGET_ID,request.getTargetId()).
queryParam(InterfaceConstants.Parameters.TARGET_UCD,request.getTargetUCD()).
request(MediaType.APPLICATION_JSON).
put(Entity.entity(null, MediaType.APPLICATION_JSON)),getManagedClass());
};
T toReturn=delegate.make(call);
log.info("Set relationship {}:{} --{}--> {}:{}",
profileID, request.getProjectId(), request.getRelationshipId(),
request.getTargetUCD(),request.getTargetId());
return toReturn;
}catch(RemoteException e){
log.error("Unexpected error ",e);
throw e;
}catch(Exception e){
log.error("Unexpected error ",e);
throw new RemoteException("Unexpected Error", e);
}
}
@Override
public Project deleteRelation(DeleteRelationshipRequest request) throws RemoteException {
try {
log.debug("Deleting relationship {}:{} --{}--> {}:{}",
profileID, request.getProjectId(), request.getRelationshipId(),
request.getTargetUCD(),request.getTargetId());
Call<WebTarget, T> call = endpoint -> {
return ResponseCommons.check(endpoint.path(profileID).
path(InterfaceConstants.Methods.RELATIONSHIP).
path(request.getRelationshipId()).
queryParam(InterfaceConstants.Parameters.TARGET_ID,request.getTargetId()).
queryParam(InterfaceConstants.Parameters.TARGET_UCD,request.getTargetUCD()).
request(MediaType.APPLICATION_JSON).
delete(),getManagedClass());
};
T toReturn=delegate.make(call);
log.info("Deleted relationship {}:{} --{}--> {}:{}",
profileID, request.getProjectId(), request.getRelationshipId(),
request.getTargetUCD(),request.getTargetId());
return toReturn;
}catch(RemoteException e){
log.error("Unexpected error ",e);
throw e;
}catch(Exception e){
log.error("Unexpected error ",e);
throw new RemoteException("Unexpected Error", e);
}
}
@Override
public Iterator<RelationshipNavigationObject> getRelationshipChain(String id, String relationId) throws RemoteException {
return getRelationshipChain(id,relationId,null);
}
@Override
public Iterator<RelationshipNavigationObject> getRelationshipChain(String id, String relationId, Boolean deep) throws RemoteException {
try {
log.debug("Get relationship chain ID {} for {} [useCaseDescriptor {} , class {}]",
relationId, id, profileID,getManagedClass());
Call<WebTarget, Iterator<RelationshipNavigationObject>> call = endpoint -> {
WebTarget target = endpoint.path(profileID).
path(InterfaceConstants.Methods.RELATIONSHIP).
path(id).
path(relationId);
if(deep!=null) target = target.queryParam(InterfaceConstants.Parameters.DEEP,deep);
String jsonChain = ResponseCommons.check(target.request(MediaType.APPLICATION_JSON).
get(),String.class);
return Serialization.readCollection(jsonChain,RelationshipNavigationObject.class);
};
return delegate.make(call);
}catch(RemoteException e){
log.error("Unexpected error ",e);
throw e;
}catch(Exception e){
log.error("Unexpected error ",e);
throw new RemoteException("Unexpected Error", e);
}
}
}

40
geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java
View File

@ -7,6 +7,9 @@ import org.gcube.application.geoportal.client.DefaultDocumentsClient;
import org.gcube.application.geoportal.client.utils.Serialization;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.configuration.Configuration;
import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject;
import org.gcube.application.geoportal.common.model.rest.CreateRelationshipRequest;
import org.gcube.application.geoportal.common.model.rest.DeleteRelationshipRequest;
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
import org.gcube.application.geoportal.common.rest.Projects;
import org.gcube.application.geoportal.common.utils.tests.GCubeTest;
@ -15,6 +18,7 @@ import sun.net.www.content.text.Generic;
import java.rmi.RemoteException;
import java.time.LocalDateTime;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicLong;
import static junit.framework.TestCase.assertTrue;
@ -86,5 +90,41 @@ public class ProfiledDocumentsTest<M extends Project,C extends Projects<M>> exte
});
}
@Test
public void testRelationships() throws Exception{
assumeTrue(GCubeTest.isTestInfrastructureEnabled());
Projects<M> client = (Projects<M>) getClient();
Project source = client.createNew(new Document().append("field","value"));
Project target = client.createNew(new Document().append("field2","value"));
String relId="associate";
Project linkedSource = client.setRelation(
new CreateRelationshipRequest(source.getId(),relId,
target.getId(), null));
assumeTrue(linkedSource.getRelationships()!=null);
assumeTrue(!linkedSource.getRelationships().isEmpty());
assumeTrue(linkedSource.getRelationships().get(0).getRelationshipName().equals(relId));
assumeTrue(linkedSource.getRelationships().get(0).getTargetID().equals(target.getId()));
assumeTrue(linkedSource.getRelationships().get(0).getTargetUCD().equals(target.getProfileID()));
Iterator<RelationshipNavigationObject> it = client.getRelationshipChain(source.getId(),relId,true);
System.out.println("Scanning rel ..");
it.forEachRemaining(r -> {
System.out.println(r.getTarget().getId());
System.out.println("Children size : "+r.getChildren().size());
});
Project unLinkedSource = client.deleteRelation(
new DeleteRelationshipRequest(source.getId(),relId,
target.getId(),null));
assumeTrue(unLinkedSource.getRelationships()==null || unLinkedSource.getRelationships().isEmpty());
}
}

17
geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/CreateRelationshipRequest.java Normal file
View File

@ -0,0 +1,17 @@
package org.gcube.application.geoportal.common.model.rest;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CreateRelationshipRequest {
private String projectId;
private String relationshipId;
private String targetId;
private String targetUCD;
}

11
geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/DeleteRelationshipRequest.java Normal file
View File

@ -0,0 +1,11 @@
package org.gcube.application.geoportal.common.model.rest;
public class DeleteRelationshipRequest extends CreateRelationshipRequest{
public DeleteRelationshipRequest(String projectId, String relationshipId, String targetId, String targetUCD) {
super(projectId, relationshipId, targetId, targetUCD);
}
public DeleteRelationshipRequest() {
}
}

4
geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/InterfaceConstants.java
View File

@ -43,8 +43,8 @@ public class InterfaceConstants {
public static final String RELATIONSHIP_ID="relationship_id";
public static final String DEEP="deep";
public static final String TARGET_UCD="target_id";
public static final String TARGET_ID="target_ucd";
public static final String TARGET_UCD="target_ucd";
public static final String TARGET_ID="target_id";
}

15
geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java
View File

@ -5,12 +5,12 @@ import org.gcube.application.geoportal.common.faults.InvalidRequestException;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.configuration.Configuration;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
import org.gcube.application.geoportal.common.model.rest.StepExecutionRequest;
import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject;
import org.gcube.application.geoportal.common.model.rest.*;
import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.List;
public interface Projects<P extends Project> {
@ -43,4 +43,13 @@ public interface Projects<P extends Project> {
public P forceUnlock(String id) throws RemoteException;
public P setAccessPolicy(String id, Access toSet) throws RemoteException;
// Relationships
public Project setRelation(CreateRelationshipRequest request)throws RemoteException;
public Project deleteRelation(DeleteRelationshipRequest request)throws RemoteException;
public Iterator<RelationshipNavigationObject> getRelationshipChain(String id, String relationId, Boolean deep) throws RemoteException;
public Iterator<RelationshipNavigationObject> getRelationshipChain(String id, String relationId) throws RemoteException;
}

7
geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/ProfiledDocuments.java
View File

@ -288,7 +288,12 @@ public class ProfiledDocuments {
protected Project run() throws Exception, WebApplicationException {
log.info("Set relation from Project ({} : {}) [{}]-> ({} : {})",
manager.getUseCaseDescriptor().getId(), id,relationshipId,targetUCD,targetId);
return manager.setRelation(id,relationshipId,targetUCD,targetId);
String toUseTargetUCD=targetUCD;
if(toUseTargetUCD==null || toUseTargetUCD.isEmpty()) {
log.debug("Target UCD is null, forcing same UCD () as source ",manager.getUseCaseDescriptor().getId());
toUseTargetUCD = manager.getUseCaseDescriptor().getId();
}
return manager.setRelation(id,relationshipId,toUseTargetUCD,targetId);
}
}.execute().getResult();
}