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

Refactoring due to changes on is-model 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@130925 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-08-01 13:52:38 +00:00
parent 3d77f5f32a
commit e2466d32a9
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaInitializator.java
View File

@ -16,8 +16,8 @@ import org.gcube.informationsystem.model.embedded.ValueSchema;
import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.entity.Facet;
import org.gcube.informationsystem.model.entity.Resource;
import org.gcube.informationsystem.model.relation.ConsistOf;
import org.gcube.informationsystem.model.relation.RelatedTo;
import org.gcube.informationsystem.model.relation.ConsistsOf;
import org.gcube.informationsystem.model.relation.IsRelatedTo;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.resourceregistry.dbinitialization.Tree.Node;
import org.gcube.informationsystem.resourceregistry.dbinitialization.Tree.NodeVisitor;
@ -301,9 +301,9 @@ public class SchemaInitializator {
String json = TypeBinder.serializeType(clz);
logger.trace(json);
if(!DRY_RUN){
if (ConsistOf.class.isAssignableFrom(clz)) {
if (ConsistsOf.class.isAssignableFrom(clz)) {
new SchemaManagementImpl().registerConsistOfSchema(json);
} else if(RelatedTo.class.isAssignableFrom(clz)){
} else if(IsRelatedTo.class.isAssignableFrom(clz)){
new SchemaManagementImpl().registerRelatedToSchema(json);
} else {
new SchemaManagementImpl().registerRelationSchema(json);

4
src/main/java/org/gcube/informationsystem/resourceregistry/resources/EntityManager.java
View File

@ -9,7 +9,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import org.gcube.informationsystem.model.orientdb.impl.relation.ConsistOf;
import org.gcube.informationsystem.model.relation.RelatedTo;
import org.gcube.informationsystem.model.relation.IsRelatedTo;
import org.gcube.informationsystem.resourceregistry.api.EntityManagement;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityException;
@ -120,7 +120,7 @@ public class EntityManager {
logger.trace(
"requested to attach source resource {} and target resource {} ({} Type {}) with properties {}",
sourceResourceUuid, targetResourceUuid,
RelatedTo.class.getSimpleName(), relatedToType, jsonProperties);
IsRelatedTo.class.getSimpleName(), relatedToType, jsonProperties);
return entityManager.attachResource(sourceResourceUuid,
targetResourceUuid, relatedToType, jsonProperties);
}

14
src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java
View File

@ -9,7 +9,7 @@ import java.util.UUID;
import org.codehaus.jettison.json.JSONException;
import org.gcube.informationsystem.model.embedded.Header;
import org.gcube.informationsystem.model.orientdb.impl.entity.Context;
import org.gcube.informationsystem.model.relation.ParentOf;
import org.gcube.informationsystem.model.relation.IsParentOf;
import org.gcube.informationsystem.resourceregistry.api.ContextManagement;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextCreationException;
@ -76,7 +76,7 @@ public class ContextManagementImpl implements ContextManagement {
// TODO Rewrite using Gremlin
String select = "SELECT FROM " + Context.class.getSimpleName() + " WHERE "
+ Context.NAME_PROPERTY + " = \"" + contextName + "\""
+ " AND in(\"" + ParentOf.class.getSimpleName() + "\").size() = 0";
+ " AND in(\"" + IsParentOf.class.getSimpleName() + "\").size() = 0";
OSQLSynchQuery<Vertex> osqlSynchQuery = new OSQLSynchQuery<Vertex>(select);
Iterable<Vertex> vertexes = orientGraph.command(osqlSynchQuery).execute();
@ -132,7 +132,7 @@ public class ContextManagementImpl implements ContextManagement {
HeaderUtility.addHeader(context, uuid);
if (parentContextUUID != null) {
orientGraph.addEdge(null, parent, context.asVertex(), ParentOf.class.getSimpleName());
orientGraph.addEdge(null, parent, context.asVertex(), IsParentOf.class.getSimpleName());
}
SecurityContext.addToSecurityContext(orientGraph, context.asVertex(), uuidString);
@ -175,7 +175,7 @@ public class ContextManagementImpl implements ContextManagement {
String parentUUID = null;
Iterable<Edge> edges = context.getEdges(Direction.IN, ParentOf.class.getSimpleName());
Iterable<Edge> edges = context.getEdges(Direction.IN, IsParentOf.class.getSimpleName());
if (edges != null && edges.iterator().hasNext()) {
Iterator<Edge> iteratorEdge = edges.iterator();
Edge edge = iteratorEdge.next();
@ -212,7 +212,7 @@ public class ContextManagementImpl implements ContextManagement {
checkContext(orientGraph, newParentUUID, context.getProperty(Context.NAME_PROPERTY).toString());
// Removing the old parent relationship if any
Iterable<Edge> edges = context.getEdges(Direction.IN, ParentOf.class.getSimpleName());
Iterable<Edge> edges = context.getEdges(Direction.IN, IsParentOf.class.getSimpleName());
if (edges != null && edges.iterator().hasNext()) {
Iterator<Edge> edgeIterator = edges.iterator();
Edge edge = edgeIterator.next();
@ -223,7 +223,7 @@ public class ContextManagementImpl implements ContextManagement {
if(newParentUUID!=null){
Vertex parent = getContext(orientGraph, newParentUUID);
logger.trace("New Parent Context {}", Utility.vertexToJsonString(parent));
orientGraph.addEdge(null, parent, context, ParentOf.class.getSimpleName());
orientGraph.addEdge(null, parent, context, IsParentOf.class.getSimpleName());
}
orientGraph.commit();
@ -239,7 +239,7 @@ public class ContextManagementImpl implements ContextManagement {
Vertex context = getContext(orientGraph, uuid);
logger.trace("Context to be delete {}", Utility.vertexToJsonString(context));
Iterable<Edge> edges = context.getEdges(Direction.OUT, ParentOf.class.getSimpleName());
Iterable<Edge> edges = context.getEdges(Direction.OUT, IsParentOf.class.getSimpleName());
if (edges != null && edges.iterator().hasNext()) {
throw new ContextException("Only context with no children can be deleted");
}

20
src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java
View File

@ -10,9 +10,9 @@ import java.util.Set;
import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.entity.Facet;
import org.gcube.informationsystem.model.entity.Resource;
import org.gcube.informationsystem.model.relation.RelatedTo;
import org.gcube.informationsystem.model.relation.IsRelatedTo;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.model.relation.ConsistOf;
import org.gcube.informationsystem.model.relation.ConsistsOf;
import org.gcube.informationsystem.resourceregistry.api.EntityManagement;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.FacetNotFoundException;
@ -76,11 +76,11 @@ public class EntityManagementImpl implements EntityManagement {
throws ResourceRegistryException {
try {
if (relationType == null || relationType.compareTo("") == 0) {
if (RelatedTo.class.isAssignableFrom(relationClass)) {
relationType = RelatedTo.NAME;
if (IsRelatedTo.class.isAssignableFrom(relationClass)) {
relationType = IsRelatedTo.NAME;
}
if (ConsistOf.class.isAssignableFrom(relationClass)) {
relationType = ConsistOf.NAME;
if (ConsistsOf.class.isAssignableFrom(relationClass)) {
relationType = ConsistsOf.NAME;
}
}
return Utility.getRelationByUUID(orientGraph, relationType, uuid);
@ -384,8 +384,8 @@ public class EntityManagementImpl implements EntityManagement {
orientGraph = ContextUtility
.getActualSecurityContextGraph(PermissionMode.WRITER);
Edge edge = getRelation(orientGraph, consistOfUUID, ConsistOf.NAME,
ConsistOf.class);
Edge edge = getRelation(orientGraph, consistOfUUID, ConsistsOf.NAME,
ConsistsOf.class);
edge.remove();
orientGraph.commit();
@ -428,8 +428,8 @@ public class EntityManagementImpl implements EntityManagement {
orientGraph = ContextUtility
.getActualSecurityContextGraph(PermissionMode.WRITER);
Edge edge = getRelation(orientGraph, relatedToUUID, RelatedTo.NAME,
RelatedTo.class);
Edge edge = getRelation(orientGraph, relatedToUUID, IsRelatedTo.NAME,
IsRelatedTo.class);
edge.remove();
orientGraph.commit();

12
src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java
View File

@ -10,8 +10,8 @@ import java.util.Set;
import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.entity.Facet;
import org.gcube.informationsystem.model.entity.Resource;
import org.gcube.informationsystem.model.relation.ConsistOf;
import org.gcube.informationsystem.model.relation.RelatedTo;
import org.gcube.informationsystem.model.relation.ConsistsOf;
import org.gcube.informationsystem.model.relation.IsRelatedTo;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.resourceregistry.api.SchemaManagement;
import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException;
@ -551,13 +551,13 @@ public class SchemaManagementImpl implements SchemaManagement {
@Override
public String registerConsistOfSchema(String jsonSchema)
throws SchemaException {
return registerEdgeTypeSchema(jsonSchema, ConsistOf.NAME);
return registerEdgeTypeSchema(jsonSchema, ConsistsOf.NAME);
}
@Override
public String getConsistOfSchema(String consistOfType)
throws SchemaNotFoundException {
return getTypeSchemaAsString(consistOfType, ConsistOf.NAME);
return getTypeSchemaAsString(consistOfType, ConsistsOf.NAME);
}
@Override
@ -575,13 +575,13 @@ public class SchemaManagementImpl implements SchemaManagement {
@Override
public String registerRelatedToSchema(String jsonSchema)
throws SchemaException {
return registerEdgeTypeSchema(jsonSchema, RelatedTo.NAME);
return registerEdgeTypeSchema(jsonSchema, IsRelatedTo.NAME);
}
@Override
public String getRelatedToSchema(String relatedToType)
throws SchemaNotFoundException {
return getTypeSchemaAsString(relatedToType, RelatedTo.NAME);
return getTypeSchemaAsString(relatedToType, IsRelatedTo.NAME);
}
@Override

8
src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/ContextCreation.java
View File

@ -5,10 +5,10 @@ package org.gcube.informationsystem.resourceregistry.dbinitialization;
import org.gcube.informationsystem.model.embedded.Embedded;
import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.facet.CPUFacet;
import org.gcube.informationsystem.model.relation.Host;
import org.gcube.informationsystem.model.entity.facet.CPUFacet;
import org.gcube.informationsystem.model.entity.resource.Configuration;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.model.resource.Configuration;
import org.gcube.informationsystem.model.relation.isrelatedto.Hosts;
import org.junit.Test;
/**
@ -23,7 +23,7 @@ public class ContextCreation {
SchemaInitializator.addPackage(Entity.class.getPackage());
SchemaInitializator.addPackage(Relation.class.getPackage());
SchemaInitializator.addPackage(CPUFacet.class.getPackage());
SchemaInitializator.addPackage(Host.class.getPackage());
SchemaInitializator.addPackage(Hosts.class.getPackage());
SchemaInitializator.addPackage(Configuration.class.getPackage());
SchemaInitializator.createTypes();
}

8
src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImplTest.java
View File

@ -3,9 +3,9 @@
*/
package org.gcube.informationsystem.resourceregistry.resources.impl;
import org.gcube.informationsystem.model.facet.ContactFacet;
import org.gcube.informationsystem.model.relation.Run;
import org.gcube.informationsystem.model.resource.Service;
import org.gcube.informationsystem.model.entity.facet.ContactFacet;
import org.gcube.informationsystem.model.entity.resource.Service;
import org.gcube.informationsystem.model.relation.isrelatedto.Runs;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextCreationException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
@ -42,7 +42,7 @@ public class ContextManagementImplTest {
public ContextManagementImplTest(){
contextManagementImpl = new ContextManagementImpl();
DatabaseIntializator.addPackage(Service.class.getPackage());
DatabaseIntializator.addPackage(Run.class.getPackage());
DatabaseIntializator.addPackage(Runs.class.getPackage());
DatabaseIntializator.addPackage(ContactFacet.class.getPackage());
}

14
src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImplTest.java
View File

@ -7,15 +7,15 @@ import java.io.StringWriter;
import org.codehaus.jettison.json.JSONObject;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.informationsystem.impl.facet.CPUFacetImpl;
import org.gcube.informationsystem.impl.entity.facet.CPUFacetImpl;
import org.gcube.informationsystem.impl.utils.Entities;
import org.gcube.informationsystem.impl.utils.Utility;
import org.gcube.informationsystem.model.embedded.Header;
import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.facet.CPUFacet;
import org.gcube.informationsystem.model.relation.ConsistOf;
import org.gcube.informationsystem.model.entity.facet.CPUFacet;
import org.gcube.informationsystem.model.entity.resource.HostingNode;
import org.gcube.informationsystem.model.relation.ConsistsOf;
import org.gcube.informationsystem.model.relation.Relation;
import org.gcube.informationsystem.model.resource.HostingNode;
import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.FacetNotFoundException;
import org.junit.Test;
import org.slf4j.Logger;
@ -214,7 +214,7 @@ public class EntityManagementImplTest {
String facetUUID = Utility.getUUIDFromJSONString(json);
json = entityManagementImpl.attachFacet(resourceUUID, facetUUID,
ConsistOf.class.getSimpleName(), null);
ConsistsOf.class.getSimpleName(), null);
logger.debug("Facet attached : {}", json);
String consistOfUUID = Utility.getUUIDFromJSONString(json);
@ -223,10 +223,10 @@ public class EntityManagementImplTest {
if (detached) {
logger.trace("{} {} with uuid {} removed successfully",
ConsistOf.NAME, Relation.NAME, consistOfUUID);
ConsistsOf.NAME, Relation.NAME, consistOfUUID);
} else {
String error = String.format("Unable to remove %s %s with uuid %s",
ConsistOf.NAME, Relation.NAME, consistOfUUID);
ConsistsOf.NAME, Relation.NAME, consistOfUUID);
logger.error(error);
throw new Exception(error);
}