gCubeSystem
/
resource-registry
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Luca Frosini 2016-12-19 14:37:15 +00:00
parent b1112136fa
commit 8b68f5d93f
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/EntityManagement.java
View File

@ -230,7 +230,7 @@ public abstract class EntityManagement<E extends Entity> {
try { try {
vertex = orientGraph.addVertex("class:" + entityType); Vertex vertexEntity = orientGraph.addVertex("class:" + entityType);
try { 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 // no header or no header with uuid is provided and it is fine
} }
this.vertex = vertexEntity;
Header entityHeader = HeaderUtility.getHeader(jsonNode, true); Header entityHeader = HeaderUtility.getHeader(jsonNode, true);
if (entityHeader != null) { if (entityHeader != null) {
vertex.setProperty(Entity.HEADER_PROPERTY, entityHeader); vertex.setProperty(Entity.HEADER_PROPERTY, entityHeader);

15
src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/entity/ResourceManagement.java
View File

@ -55,23 +55,20 @@ public class ResourceManagement extends EntityManagement<Resource> {
JSONArray consistsOfArray = new JSONArray(); JSONArray consistsOfArray = new JSONArray();
/* /*
* JSONArray isRelatedToArray = new JSONArray(); * JSONArray isRelatedToArray = new JSONArray();
* Iterable<Edge> edges = vertex.getEdges(Direction.OUT);
*/ */
Iterable<Edge> edges = vertex.getEdges(Direction.OUT, ConsistsOf.NAME); Iterable<Edge> edges = vertex.getEdges(Direction.OUT);
for(Edge edge : edges){
for (Edge edge : edges) {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
RelationManagement relationManagement = RelationManagement.getRelationManagement(orientGraph, edge); RelationManagement relationManagement = RelationManagement.getRelationManagement(orientGraph, edge);
JSONObject relationJsonObject = relationManagement.serializeAsJson(); if(relationManagement instanceof ConsistsOfManagement){
consistsOfArray.put(relationJsonObject); JSONObject relationJsonObject = relationManagement.serializeAsJson();
consistsOfArray.put(relationJsonObject);
}
/* /*
* else if(orientEdgeType.isSubClassOf(IsRelatedTo.NAME)){ * else if(orientEdgeType.isSubClassOf(IsRelatedTo.NAME)){
* isRelatedToArray.put(jsonObjectEdge); } * isRelatedToArray.put(jsonObjectEdge); }
*/ */
} }
try { try {

5
src/main/java/org/gcube/informationsystem/resourceregistry/ermanagement/relation/RelationManagement.java
View File

@ -215,11 +215,8 @@ public abstract class RelationManagement<R extends Relation> {
} }
return edge; return edge;
} catch (ResourceRegistryException e) { } catch (ResourceRegistryException e) {
throw e; throw new RelationNotFoundException(e);
} catch (Exception e) {
throw new ResourceRegistryException(e);
} }
} }
public String serialize() throws ResourceRegistryException { public String serialize() throws ResourceRegistryException {

4
src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/ERManagementTest.java
View File

@ -42,7 +42,7 @@ import org.gcube.informationsystem.model.relation.IsIdentifiedBy;
import org.gcube.informationsystem.model.relation.Relation; import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.model.relation.isrelatedto.Hosts; import org.gcube.informationsystem.model.relation.isrelatedto.Hosts;
import org.gcube.informationsystem.resourceregistry.ScopedTest; 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.FacetManagement;
import org.gcube.informationsystem.resourceregistry.ermanagement.entity.ResourceManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.entity.ResourceManagement;
import org.gcube.informationsystem.resourceregistry.ermanagement.relation.ConsistsOfManagement; import org.gcube.informationsystem.resourceregistry.ermanagement.relation.ConsistsOfManagement;
@ -345,7 +345,7 @@ public class ERManagementTest extends ScopedTest {
try { try {
facetManagement.read(); facetManagement.read();
throw new Exception(String.format("Shared Facet %s was not deleted", shared)); 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"); logger.debug("Shared Facet was not foud as expected");
} }
} }