From c6ddf6da9167677a96b8acfe4e986e4c83f4c36a Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 6 Nov 2019 12:14:27 +0100 Subject: [PATCH] Fixed package name --- .../instances/base/ERManagementUtility.java | 6 +++--- .../instances/model/entities/EntityManagement.java | 2 +- .../instances/model/entities/ResourceManagement.java | 6 +++--- .../model/{relation => relations}/ConsistsOfManagement.java | 2 +- .../{relation => relations}/IsRelatedToManagement.java | 2 +- .../model/{relation => relations}/RelationManagement.java | 2 +- .../resourceregistry/instances/ERManagementTest.java | 4 ++-- .../resourceregistry/instances/multicontext/BasicTest.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/{relation => relations}/ConsistsOfManagement.java (99%) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/{relation => relations}/IsRelatedToManagement.java (99%) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/{relation => relations}/RelationManagement.java (99%) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java index 6454109..9abd14a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ERManagementUtility.java @@ -15,9 +15,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.instances.model.entities.EntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.ConsistsOfManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.IsRelatedToManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.RelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; import org.gcube.informationsystem.resourceregistry.instances.type.SchemaManagementImpl; import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.utils.Utility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java index efe44b1..a36987f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java @@ -23,7 +23,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.query.Invalid import org.gcube.informationsystem.resourceregistry.instances.base.ERManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.RelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.Utility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java index 586d958..57f68db 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/ResourceManagement.java @@ -11,9 +11,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAlreadyPresentException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.ConsistsOfManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.IsRelatedToManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.RelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; import org.gcube.informationsystem.resourceregistry.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.utils.Utility; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/ConsistsOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java similarity index 99% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/ConsistsOfManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java index 076d9f1..8030b1c 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/ConsistsOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/ConsistsOfManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.model.relation; +package org.gcube.informationsystem.resourceregistry.instances.model.relations; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/IsRelatedToManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java similarity index 99% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/IsRelatedToManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java index 8f502e5..d106b6f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/IsRelatedToManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/IsRelatedToManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.model.relation; +package org.gcube.informationsystem.resourceregistry.instances.model.relations; import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java similarity index 99% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/RelationManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java index 7e9ac5b..106862d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relation/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.resourceregistry.instances.model.relation; +package org.gcube.informationsystem.resourceregistry.instances.model.relations; import java.util.Collection; import java.util.HashMap; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java index 99434ff..7679848 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java @@ -37,8 +37,8 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.query.Invalid import org.gcube.informationsystem.resourceregistry.instances.base.ERManagementUtility; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.ConsistsOfManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.IsRelatedToManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; import org.gcube.informationsystem.utils.ISMapper; import org.gcube.informationsystem.utils.Utility; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java index f36e905..8b314e9 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java @@ -26,7 +26,7 @@ import org.gcube.informationsystem.resourceregistry.instances.SmartgearResources import org.gcube.informationsystem.resourceregistry.instances.context.ContextUtility; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; -import org.gcube.informationsystem.resourceregistry.instances.model.relation.IsRelatedToManagement; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement; import org.gcube.informationsystem.utils.ISMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;