diff --git a/pom.xml b/pom.xml index d5a7dd6..4b958f1 100644 --- a/pom.xml +++ b/pom.xml @@ -107,8 +107,8 @@ - org.gcube.information-system - gcube-resources + org.gcube.resource-management + gcube-model test diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java index 697e92d..bbd0a4f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextManagement.java @@ -6,11 +6,11 @@ import java.util.UUID; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.entity.Context; -import org.gcube.informationsystem.model.relation.IsParentOf; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Context; +import org.gcube.informationsystem.model.reference.relation.IsParentOf; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; @@ -126,7 +126,7 @@ public class ContextManagement extends EntityManagement { } else { // TODO Rewrite using Gremlin - String select = "SELECT FROM " + org.gcube.informationsystem.model.entity.Context.NAME + " WHERE " + String select = "SELECT FROM " + org.gcube.informationsystem.model.reference.entity.Context.NAME + " WHERE " + Context.NAME_PROPERTY + " = \"" + getName() + "\"" + " AND in(\"" + IsParentOf.NAME + "\").size() = 0"; @@ -280,7 +280,7 @@ public class ContextManagement extends EntityManagement { } if(parentContextJsonNode != null && !(parentContextJsonNode instanceof NullNode)) { - UUID parentUUID = org.gcube.informationsystem.impl.utils.Utility.getUUIDFromJsonNode(parentContextJsonNode); + UUID parentUUID = org.gcube.informationsystem.model.impl.utils.Utility.getUUIDFromJsonNode(parentContextJsonNode); if(actualParentContextManagement != null) { if(parentUUID.compareTo(actualParentContextManagement.uuid) != 0) { parentChanged = true; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java index bcea054..ae72008 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextUtility.java @@ -11,8 +11,8 @@ import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; -import org.gcube.informationsystem.model.entity.Context; -import org.gcube.informationsystem.model.relation.IsParentOf; +import org.gcube.informationsystem.model.reference.entity.Context; +import org.gcube.informationsystem.model.reference.relation.IsParentOf; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/IsParentOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/IsParentOfManagement.java index c964f98..3c02892 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/IsParentOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/IsParentOfManagement.java @@ -3,13 +3,13 @@ package org.gcube.informationsystem.resourceregistry.context; import java.util.UUID; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.AddConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.relation.IsParentOf; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.AddConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.relation.IsParentOf; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/security/SecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/security/SecurityContext.java index 96106f0..28892a6 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/security/SecurityContext.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/security/SecurityContext.java @@ -13,7 +13,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java index 5dec118..84ac48b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java @@ -6,9 +6,9 @@ import java.util.Map; import java.util.Properties; import java.util.UUID; -import org.gcube.informationsystem.impl.utils.discovery.ISMDiscovery; -import org.gcube.informationsystem.impl.utils.discovery.SchemaAction; -import org.gcube.informationsystem.model.ISConstants; +import org.gcube.informationsystem.model.impl.utils.discovery.ISMDiscovery; +import org.gcube.informationsystem.model.impl.utils.discovery.SchemaAction; +import org.gcube.informationsystem.model.reference.ISConstants; import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.context.security.AdminSecurityContext; import org.gcube.informationsystem.resourceregistry.context.security.ContextSecurityContext; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java index 95d790f..0c8a30c 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaActionImpl.java @@ -1,14 +1,15 @@ package org.gcube.informationsystem.resourceregistry.dbinitialization; -import org.gcube.informationsystem.impl.utils.discovery.SchemaAction; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Embedded; -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.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsRelatedTo; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.impl.utils.discovery.SchemaAction; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.relation.Relation; +import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.schema.SchemaManagement; import org.gcube.informationsystem.resourceregistry.schema.SchemaManagementImpl; import org.gcube.informationsystem.types.TypeBinder; @@ -42,6 +43,8 @@ public class SchemaActionImpl implements SchemaAction { } else { schemaManagement.create(json, AccessType.RELATION); } + } catch (SchemaAlreadyPresentException sape) { + logger.warn("{} already exists. It will be ignored", TypeBinder.getType(r)); } catch(Exception ex) { logger.error("Error creating schema for {} type {} : {}", Relation.NAME, r.getSimpleName(), ex.getMessage()); @@ -62,6 +65,8 @@ public class SchemaActionImpl implements SchemaAction { } else { schemaManagement.create(json, AccessType.ENTITY); } + } catch (SchemaAlreadyPresentException sape) { + logger.warn("{} already exists. It will be ignored", TypeBinder.getType(e)); } catch(Exception ex) { logger.error("Error creating schema for {} type {} : {}", Entity.NAME, e.getSimpleName(), ex.getMessage()); throw ex; @@ -75,7 +80,9 @@ public class SchemaActionImpl implements SchemaAction { String json = TypeBinder.serializeType(e); logger.trace(json); schemaManagement.create(json, AccessType.EMBEDDED); - } catch(Exception ex) { + } catch (SchemaAlreadyPresentException sape) { + logger.warn("{} already exists. It will be ignored", TypeBinder.getType(e)); + } catch(Exception ex) { logger.error("Error creating schema for {} type {} : {}", Embedded.NAME, e.getSimpleName(), ex.getMessage()); throw ex; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java index 6be201d..f185966 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java @@ -16,11 +16,11 @@ import javax.activation.UnsupportedDataTypeException; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.ISManageable; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.ISManageable; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; @@ -189,7 +189,7 @@ public abstract class ERManagement { protected void checkJSON() throws ResourceRegistryException { if(uuid == null) { try { - uuid = org.gcube.informationsystem.impl.utils.Utility.getUUIDFromJsonNode(jsonNode); + uuid = org.gcube.informationsystem.model.impl.utils.Utility.getUUIDFromJsonNode(jsonNode); } catch(Exception e) { } } else { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagementUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagementUtility.java index edd8980..8586f91 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagementUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagementUtility.java @@ -2,14 +2,14 @@ package org.gcube.informationsystem.resourceregistry.er; import java.util.UUID; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Embedded; -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.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsRelatedTo; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.context.security.SecurityContext; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/EmbeddedMangement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/EmbeddedMangement.java index b20b10e..e10b3d7 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/EmbeddedMangement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/EmbeddedMangement.java @@ -3,9 +3,9 @@ package org.gcube.informationsystem.resourceregistry.er; import java.util.HashSet; import java.util.Set; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.ISManageable; -import org.gcube.informationsystem.model.embedded.Header; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.ISManageable; +import org.gcube.informationsystem.model.reference.embedded.Header; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.schema.SchemaManagementImpl; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java index 6d81215..dff45c2 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java @@ -8,13 +8,13 @@ import java.util.UUID; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Header; -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.ConsistsOf; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagement.java index 396cd1c..c97fdc4 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagement.java @@ -1,8 +1,8 @@ package org.gcube.informationsystem.resourceregistry.er.entity; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.entity.Facet; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.entity.Facet; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAlreadyPresentException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java index 3b748f1..2ec3181 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagement.java @@ -3,10 +3,10 @@ package org.gcube.informationsystem.resourceregistry.er.entity; import java.util.Iterator; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAlreadyPresentException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/ConsistsOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/ConsistsOfManagement.java index 381e480..3c3e331 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/ConsistsOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/ConsistsOfManagement.java @@ -1,11 +1,11 @@ package org.gcube.informationsystem.resourceregistry.er.relation; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.AddConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.relation.ConsistsOf; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.AddConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf.ConsistsOfAlreadyPresentException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/IsRelatedToManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/IsRelatedToManagement.java index 0c44339..19d418a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/IsRelatedToManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/IsRelatedToManagement.java @@ -1,11 +1,11 @@ package org.gcube.informationsystem.resourceregistry.er.relation; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.AddConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.relation.IsRelatedTo; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.AddConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto.IsRelatedToAlreadyPresentException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java index 12fe200..e8adb41 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java @@ -8,15 +8,15 @@ import java.util.UUID; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.AddConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -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.Relation; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.AddConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; @@ -265,7 +265,7 @@ public abstract class RelationManagement pathValues = new ArrayList<>(); pathValues.add(AccessPath.CONTEXTS_PATH_PART); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ContextManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ContextManager.java index 4526c98..c36c23a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ContextManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/ContextManager.java @@ -13,7 +13,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.ResourceInitializer; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java index ce85c4a..ee27b0e 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SchemaManager.java @@ -18,7 +18,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.gcube.informationsystem.model.AccessType; +import org.gcube.informationsystem.model.reference.AccessType; import org.gcube.informationsystem.resourceregistry.ResourceInitializer; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManagement.java index 910b9a1..bd1b471 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManagement.java @@ -9,7 +9,7 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import org.gcube.informationsystem.model.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaContextManagement.java index 17e86e2..b9de0b6 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaContextManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaContextManagement.java @@ -2,10 +2,10 @@ package org.gcube.informationsystem.resourceregistry.schema; import java.util.Iterator; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Embedded; -import org.gcube.informationsystem.model.entity.Entity; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; import org.gcube.informationsystem.resourceregistry.context.ContextUtility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java index c33dd79..bae13ea 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagement.java @@ -1,6 +1,6 @@ package org.gcube.informationsystem.resourceregistry.schema; -import org.gcube.informationsystem.model.AccessType; +import org.gcube.informationsystem.model.reference.AccessType; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImpl.java index 63fc0aa..fcb7981 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImpl.java @@ -10,11 +10,11 @@ import java.util.Set; import javax.activation.UnsupportedDataTypeException; -import org.gcube.informationsystem.model.AccessType; -import org.gcube.informationsystem.model.embedded.Embedded; -import org.gcube.informationsystem.model.entity.Entity; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.reference.AccessType; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaCreationException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java index 1c22492..fc9e5d6 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java @@ -3,14 +3,14 @@ package org.gcube.informationsystem.resourceregistry.utils; import java.util.Date; import java.util.UUID; -import org.gcube.informationsystem.model.embedded.Header; +import org.gcube.informationsystem.model.reference.embedded.Header; import com.orientechnologies.orient.core.record.impl.ODocument; /** * @author Luca Frosini (ISTI - CNR) */ -public class HeaderOrient extends ODocument implements org.gcube.informationsystem.model.embedded.Header { +public class HeaderOrient extends ODocument implements org.gcube.informationsystem.model.reference.embedded.Header { public HeaderOrient() { super(Header.NAME); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderUtility.java index a94481e..20d84a8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderUtility.java @@ -9,9 +9,9 @@ import java.util.UUID; import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.ClientInfo; import org.gcube.common.authorization.library.utils.Caller; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.embedded.Header; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.embedded.Header; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ public class HeaderUtility { private static final Logger logger = LoggerFactory.getLogger(HeaderUtility.class); public static String getUser() { - String user = org.gcube.informationsystem.model.embedded.Header.UNKNOWN_USER; + String user = org.gcube.informationsystem.model.reference.embedded.Header.UNKNOWN_USER; try { Caller caller = AuthorizationProvider.instance.get(); if(caller != null) { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java index 4ea969e..b8c7bc9 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java @@ -1,13 +1,13 @@ package org.gcube.informationsystem.resourceregistry.utils; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; import com.orientechnologies.orient.core.record.impl.ODocument; /** * @author Luca Frosini (ISTI - CNR) */ -public class PropagationConstraintOrient extends ODocument implements org.gcube.informationsystem.model.embedded.PropagationConstraint { +public class PropagationConstraintOrient extends ODocument implements org.gcube.informationsystem.model.reference.embedded.PropagationConstraint { public PropagationConstraintOrient() { super(PropagationConstraint.NAME); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java index 0e480c9..43d95e6 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java @@ -7,11 +7,11 @@ import java.util.UUID; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.embedded.Embedded; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.entity.Entity; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.context.ContextUtility; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java index 9566691..8f33891 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java @@ -4,11 +4,11 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import org.gcube.informationsystem.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.impl.entity.ContextImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.entity.Context; -import org.gcube.informationsystem.model.relation.IsParentOf; +import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; +import org.gcube.informationsystem.model.impl.entity.ContextImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.entity.Context; +import org.gcube.informationsystem.model.reference.relation.IsParentOf; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/AbstractERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/AbstractERManagementTest.java index 8e4b312..355437d 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/AbstractERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/AbstractERManagementTest.java @@ -1,6 +1,6 @@ package org.gcube.informationsystem.resourceregistry.er; -import org.gcube.informationsystem.model.ER; +import org.gcube.informationsystem.model.reference.ER; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; public abstract class AbstractERManagementTest { diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java index 062ae4e..9ecae6e 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java @@ -16,47 +16,20 @@ import java.util.Map; import java.util.UUID; import org.gcube.common.authorization.library.provider.AuthorizationProvider; -import org.gcube.informationsystem.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.impl.entity.facet.AccessPointFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.CPUFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.EventFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.LicenseFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.NetworkingFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.ServiceStateFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.SimpleFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.StateFacetImpl; -import org.gcube.informationsystem.impl.entity.resource.EServiceImpl; -import org.gcube.informationsystem.impl.entity.resource.HostingNodeImpl; -import org.gcube.informationsystem.impl.relation.ConsistsOfImpl; -import org.gcube.informationsystem.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.impl.relation.isrelatedto.HostsImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.impl.utils.Utility; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.entity.facet.AccessPointFacet; -import org.gcube.informationsystem.model.entity.facet.CPUFacet; -import org.gcube.informationsystem.model.entity.facet.ContactFacet; -import org.gcube.informationsystem.model.entity.facet.EventFacet; -import org.gcube.informationsystem.model.entity.facet.LicenseFacet; -import org.gcube.informationsystem.model.entity.facet.NetworkingFacet; -import org.gcube.informationsystem.model.entity.facet.ServiceStateFacet; -import org.gcube.informationsystem.model.entity.facet.SimpleFacet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.facet.StateFacet; -import org.gcube.informationsystem.model.entity.resource.Configuration; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.entity.resource.HostingNode; -import org.gcube.informationsystem.model.entity.resource.Service; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; -import org.gcube.informationsystem.model.relation.IsRelatedTo; -import org.gcube.informationsystem.model.relation.Relation; -import org.gcube.informationsystem.model.relation.isrelatedto.Hosts; +import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.impl.relation.ConsistsOfImpl; +import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.impl.utils.Utility; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException; @@ -65,6 +38,33 @@ import org.gcube.informationsystem.resourceregistry.er.entity.FacetManagement; import org.gcube.informationsystem.resourceregistry.er.entity.ResourceManagement; import org.gcube.informationsystem.resourceregistry.er.relation.ConsistsOfManagement; import org.gcube.informationsystem.resourceregistry.er.relation.IsRelatedToManagement; +import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.CPUFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.EventFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.LicenseFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.ServiceStateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.SimpleFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.StateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.relation.isrelatedto.ActivatesImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.CPUFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.ContactFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.LicenseFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.NetworkingFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.ServiceStateFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SimpleFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.StateFacet; +import org.gcube.resourcemanagement.model.reference.entity.resource.Configuration; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.entity.resource.Service; +import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Activates; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -348,9 +348,9 @@ public class ERManagementTest extends ScopedTest { PropagationConstraint propagationConstraint = new PropagationConstraintImpl(); propagationConstraint.setRemoveConstraint(RemoveConstraint.cascade); - Hosts hosts = new HostsImpl( + Activates activates = new ActivatesImpl( hostingNode, eService, propagationConstraint); - hostingNode.attachResource(hosts); + hostingNode.attachResource(activates); resourceManagement = new ResourceManagement(); resourceManagement.setElementType(HostingNode.NAME); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/SmartgearResourcesTest.java index 8e23f9a..9e3d5bd 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/SmartgearResourcesTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/SmartgearResourcesTest.java @@ -22,41 +22,41 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.gcube.informationsystem.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.impl.entity.facet.CPUFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.ContainerStateFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.MemoryFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.NetworkingFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.SimplePropertyFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.entity.resource.HostingNodeImpl; -import org.gcube.informationsystem.impl.relation.ConsistsOfImpl; -import org.gcube.informationsystem.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.impl.relation.consistsof.HasPersistentMemoryImpl; -import org.gcube.informationsystem.impl.relation.consistsof.HasVolatileMemoryImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.entity.facet.CPUFacet; -import org.gcube.informationsystem.model.entity.facet.ContainerStateFacet; -import org.gcube.informationsystem.model.entity.facet.MemoryFacet; -import org.gcube.informationsystem.model.entity.facet.MemoryFacet.MemoryUnit; -import org.gcube.informationsystem.model.entity.facet.NetworkingFacet; -import org.gcube.informationsystem.model.entity.facet.SimplePropertyFacet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.entity.resource.HostingNode; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; -import org.gcube.informationsystem.model.relation.consistsof.HasPersistentMemory; -import org.gcube.informationsystem.model.relation.consistsof.HasVolatileMemory; +import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.impl.relation.ConsistsOfImpl; +import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.er.entity.ResourceManagement; +import org.gcube.resourcemanagement.model.impl.entity.facet.CPUFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.ContainerStateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.MemoryFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.SimplePropertyFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasPersistentMemoryImpl; +import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasVolatileMemoryImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.CPUFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.ContainerStateFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.NetworkingFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SimplePropertyFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet.MemoryUnit; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasPersistentMemory; +import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasVolatileMemory; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagementTest.java index 061fdfd..7df7656 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/FacetManagementTest.java @@ -2,11 +2,9 @@ package org.gcube.informationsystem.resourceregistry.er.entity; import java.util.UUID; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.entity.Facet; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAvailableInAnotherContextException; @@ -15,6 +13,8 @@ import org.gcube.informationsystem.resourceregistry.api.utils.Utility; import org.gcube.informationsystem.resourceregistry.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.er.ERManagementTest; import org.gcube.informationsystem.resourceregistry.utils.HeaderUtility; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagementTest.java index be2f038..7057135 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/entity/ResourceManagementTest.java @@ -4,19 +4,19 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.gcube.informationsystem.impl.entity.resource.EServiceImpl; -import org.gcube.informationsystem.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.entity.resource.Service; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.er.ERManagement; import org.gcube.informationsystem.resourceregistry.er.ERManagementUtility; +import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entity.resource.Service; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/BasicTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/BasicTest.java index 60c43df..b8db580 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/BasicTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/BasicTest.java @@ -8,41 +8,14 @@ import java.net.URL; import java.util.Calendar; import java.util.UUID; -import org.gcube.informationsystem.impl.embedded.PropagationConstraintImpl; -import org.gcube.informationsystem.impl.entity.facet.AccessPointFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.CPUFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.EventFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.LicenseFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.MemoryFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.NetworkingFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.ServiceStateFacetImpl; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.entity.resource.EServiceImpl; -import org.gcube.informationsystem.impl.entity.resource.HostingNodeImpl; -import org.gcube.informationsystem.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.impl.relation.consistsof.HasPersistentMemoryImpl; -import org.gcube.informationsystem.impl.relation.consistsof.HasVolatileMemoryImpl; -import org.gcube.informationsystem.impl.relation.isrelatedto.HostsImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.embedded.PropagationConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.AddConstraint; -import org.gcube.informationsystem.model.embedded.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.facet.AccessPointFacet; -import org.gcube.informationsystem.model.entity.facet.CPUFacet; -import org.gcube.informationsystem.model.entity.facet.EventFacet; -import org.gcube.informationsystem.model.entity.facet.LicenseFacet; -import org.gcube.informationsystem.model.entity.facet.MemoryFacet; -import org.gcube.informationsystem.model.entity.facet.MemoryFacet.MemoryUnit; -import org.gcube.informationsystem.model.entity.facet.NetworkingFacet; -import org.gcube.informationsystem.model.entity.facet.ServiceStateFacet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.entity.resource.HostingNode; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; -import org.gcube.informationsystem.model.relation.consistsof.HasPersistentMemory; -import org.gcube.informationsystem.model.relation.consistsof.HasVolatileMemory; -import org.gcube.informationsystem.model.relation.isrelatedto.Hosts; +import org.gcube.informationsystem.model.impl.embedded.PropagationConstraintImpl; +import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.AddConstraint; +import org.gcube.informationsystem.model.reference.embedded.PropagationConstraint.RemoveConstraint; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; @@ -55,6 +28,33 @@ import org.gcube.informationsystem.resourceregistry.er.SmartgearResourcesTest; import org.gcube.informationsystem.resourceregistry.er.entity.FacetManagement; import org.gcube.informationsystem.resourceregistry.er.entity.ResourceManagement; import org.gcube.informationsystem.resourceregistry.er.relation.IsRelatedToManagement; +import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.CPUFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.EventFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.LicenseFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.MemoryFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.ServiceStateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasPersistentMemoryImpl; +import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasVolatileMemoryImpl; +import org.gcube.resourcemanagement.model.impl.relation.isrelatedto.ActivatesImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.CPUFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.LicenseFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.NetworkingFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.ServiceStateFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet.MemoryUnit; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasPersistentMemory; +import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasVolatileMemory; +import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Activates; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -240,9 +240,9 @@ public class BasicTest extends ScopedTest { hostingNode, disk, null); hostingNode.addFacet(hasPersistentMemory); - Hosts hosts = new HostsImpl( + Activates activates = new ActivatesImpl( hostingNode, eService, null); - hostingNode.attachResource(hosts); + hostingNode.attachResource(activates); resourceManagement = new ResourceManagement(); resourceManagement.setElementType(HostingNode.NAME); @@ -354,7 +354,7 @@ public class BasicTest extends ScopedTest { UUID eServiceUUID = eService.getHeader().getUUID(); - /* Creating Hosts Relation */ + /* Creating Activates Relation */ PropagationConstraint propagationConstraint = new PropagationConstraintImpl(); propagationConstraint @@ -363,19 +363,19 @@ public class BasicTest extends ScopedTest { .setAddConstraint(AddConstraint.propagate); - Hosts hosts = new HostsImpl<>(hostingNode, eService, + Activates activates = new ActivatesImpl<>(hostingNode, eService, propagationConstraint); IsRelatedToManagement isRelatedToManagement = new IsRelatedToManagement(); - isRelatedToManagement.setElementType(Hosts.NAME); - String hostsJson = ISMapper.marshal(hosts); - isRelatedToManagement.setJSON(hostsJson); - String createdHostsJson = isRelatedToManagement.create(); - logger.debug("Created : {}", createdHostsJson); + isRelatedToManagement.setElementType(Activates.NAME); + String activatesJson = ISMapper.marshal(activates); + isRelatedToManagement.setJSON(activatesJson); + String createdActivatesJson = isRelatedToManagement.create(); + logger.debug("Created : {}", createdActivatesJson); @SuppressWarnings("unchecked") - Hosts createdHosts = ISMapper.unmarshal(Hosts.class, createdHostsJson); - UUID hostsUUID = createdHosts.getHeader().getUUID(); + Activates createdActivates = ISMapper.unmarshal(Activates.class, createdActivatesJson); + UUID activatesUUID = createdActivates.getHeader().getUUID(); /* ------------------------------------------------------------------ */ @@ -399,7 +399,7 @@ public class BasicTest extends ScopedTest { */ isRelatedToManagement = new IsRelatedToManagement(); - isRelatedToManagement.setUUID(hostsUUID); + isRelatedToManagement.setUUID(activatesUUID); isRelatedToManagement.addToContext(ContextUtility.getCurrentSecurityContext().getUUID()); /* The addTocontext on the relation adds the source and target too. @@ -424,7 +424,7 @@ public class BasicTest extends ScopedTest { Assert.assertTrue(removed); /* The cascading MUST remove the relation and the target so that - * I MUST not be able to read Hosts relation and EService + * I MUST not be able to read Activates relation and EService */ resourceManagement = new ResourceManagement(); @@ -439,10 +439,10 @@ public class BasicTest extends ScopedTest { } isRelatedToManagement = new IsRelatedToManagement(); - isRelatedToManagement.setUUID(hostsUUID); + isRelatedToManagement.setUUID(activatesUUID); try { isRelatedToManagement.read(); - String error = String.format("{} with UUID {} should not be visible.", Hosts.NAME, hostsUUID); + String error = String.format("{} with UUID {} should not be visible.", Activates.NAME, activatesUUID); logger.trace(error); throw new Exception(error); }catch (RelationAvailableInAnotherContextException e) { diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/RuleTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/RuleTest.java index 2edff48..e542c60 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/RuleTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/multicontext/RuleTest.java @@ -2,19 +2,19 @@ package org.gcube.informationsystem.resourceregistry.er.multicontext; import java.util.UUID; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.entity.resource.EServiceImpl; -import org.gcube.informationsystem.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.ScopedTest; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.er.entity.FacetManagement; import org.gcube.informationsystem.resourceregistry.er.entity.ResourceManagement; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImplTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImplTest.java index 142b75f..2d1b33c 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImplTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/SchemaManagementImplTest.java @@ -5,20 +5,20 @@ package org.gcube.informationsystem.resourceregistry.schema; import java.util.List; -import org.gcube.informationsystem.model.ISManageable; -import org.gcube.informationsystem.model.embedded.Embedded; -import org.gcube.informationsystem.model.embedded.Header; -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.entity.facet.ContactFacet; -import org.gcube.informationsystem.model.entity.resource.Actor; -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.model.relation.isrelatedto.Hosts; +import org.gcube.informationsystem.model.reference.ISManageable; +import org.gcube.informationsystem.model.reference.embedded.Embedded; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.TypeBinder.TypeDefinition; +import org.gcube.resourcemanagement.model.reference.entity.facet.ContactFacet; +import org.gcube.resourcemanagement.model.reference.entity.resource.Actor; +import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Hosts; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory;