Refactoring EntityManagement
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@141252 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
b1112136fa
commit
8b68f5d93f
|
@ -230,7 +230,7 @@ public abstract class EntityManagement<E extends Entity> {
|
|||
|
||||
try {
|
||||
|
||||
vertex = orientGraph.addVertex("class:" + entityType);
|
||||
Vertex vertexEntity = orientGraph.addVertex("class:" + entityType);
|
||||
|
||||
try {
|
||||
|
||||
|
@ -248,6 +248,8 @@ public abstract class EntityManagement<E extends Entity> {
|
|||
// no header or no header with uuid is provided and it is fine
|
||||
}
|
||||
|
||||
this.vertex = vertexEntity;
|
||||
|
||||
Header entityHeader = HeaderUtility.getHeader(jsonNode, true);
|
||||
if (entityHeader != null) {
|
||||
vertex.setProperty(Entity.HEADER_PROPERTY, entityHeader);
|
||||
|
|
|
@ -55,23 +55,20 @@ public class ResourceManagement extends EntityManagement<Resource> {
|
|||
JSONArray consistsOfArray = new JSONArray();
|
||||
/*
|
||||
* JSONArray isRelatedToArray = new JSONArray();
|
||||
* Iterable<Edge> edges = vertex.getEdges(Direction.OUT);
|
||||
*/
|
||||
|
||||
Iterable<Edge> edges = vertex.getEdges(Direction.OUT, ConsistsOf.NAME);
|
||||
|
||||
for (Edge edge : edges) {
|
||||
|
||||
Iterable<Edge> edges = vertex.getEdges(Direction.OUT);
|
||||
for(Edge edge : edges){
|
||||
@SuppressWarnings("rawtypes")
|
||||
RelationManagement relationManagement = RelationManagement.getRelationManagement(orientGraph, edge);
|
||||
JSONObject relationJsonObject = relationManagement.serializeAsJson();
|
||||
consistsOfArray.put(relationJsonObject);
|
||||
|
||||
if(relationManagement instanceof ConsistsOfManagement){
|
||||
JSONObject relationJsonObject = relationManagement.serializeAsJson();
|
||||
consistsOfArray.put(relationJsonObject);
|
||||
}
|
||||
/*
|
||||
* else if(orientEdgeType.isSubClassOf(IsRelatedTo.NAME)){
|
||||
* isRelatedToArray.put(jsonObjectEdge); }
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
@ -215,11 +215,8 @@ public abstract class RelationManagement<R extends Relation> {
|
|||
}
|
||||
return edge;
|
||||
} catch (ResourceRegistryException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw new ResourceRegistryException(e);
|
||||
throw new RelationNotFoundException(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public String serialize() throws ResourceRegistryException {
|
||||
|
|
|
@ -42,7 +42,7 @@ import org.gcube.informationsystem.model.relation.IsIdentifiedBy;
|
|||
import org.gcube.informationsystem.model.relation.Relation;
|
||||
import org.gcube.informationsystem.model.relation.isrelatedto.Hosts;
|
||||
import org.gcube.informationsystem.resourceregistry.ScopedTest;
|
||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException;
|
||||
import org.gcube.informationsystem.resourceregistry.ermanagement.entity.FacetManagement;
|
||||
import org.gcube.informationsystem.resourceregistry.ermanagement.entity.ResourceManagement;
|
||||
import org.gcube.informationsystem.resourceregistry.ermanagement.relation.ConsistsOfManagement;
|
||||
|
@ -345,7 +345,7 @@ public class ERManagementTest extends ScopedTest {
|
|||
try {
|
||||
facetManagement.read();
|
||||
throw new Exception(String.format("Shared Facet %s was not deleted", shared));
|
||||
}catch(ResourceRegistryException e){
|
||||
}catch(FacetNotFoundException e){
|
||||
logger.debug("Shared Facet was not foud as expected");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue