From e987df0b2595599ba86b0b7c8b77d1da861ade24 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 6 Feb 2019 09:01:35 +0000 Subject: [PATCH] Refactored due to Packages Reorganization git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/is-exporter-se-plugin@177004 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../exporter/mapper/GCoreResourceMapper.java | 6 +++--- .../exporter/mapper/GenericResourceExporter.java | 10 +++++----- .../exporter/mapper/ServiceEndpointExporter.java | 14 +++++++------- .../mapper/GenericResourceExporterTest.java | 2 +- .../mapper/ServiceEndpointExporterTest.java | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java index e0a8e14..448f62f 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java @@ -19,10 +19,10 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.informationsystem.exporter.mapper.exception.CreateException; import org.gcube.informationsystem.exporter.mapper.exception.UpdateException; -import org.gcube.informationsystem.model.impl.utils.ISMapper; import org.gcube.informationsystem.model.reference.ISConstants; -import org.gcube.informationsystem.model.reference.entity.Facet; -import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.entities.Facet; +import org.gcube.informationsystem.model.reference.entities.Resource; +import org.gcube.informationsystem.model.utils.ISMapper; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java index ecaeb75..dcc199c 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java @@ -7,12 +7,12 @@ import java.util.UUID; import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.resources.gcore.GenericResource.Profile; import org.gcube.informationsystem.model.impl.properties.HeaderImpl; -import org.gcube.informationsystem.model.impl.relation.IsIdentifiedByImpl; -import org.gcube.informationsystem.model.reference.entity.Facet; -import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.impl.relations.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.reference.entities.Facet; +import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.Header; -import org.gcube.informationsystem.model.reference.relation.ConsistsOf; -import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.reference.relations.ConsistsOf; +import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; import org.gcube.resourcemanagement.model.impl.entity.facet.SimpleFacetImpl; diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java index 845eeb6..23a366e 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java @@ -13,15 +13,15 @@ import org.gcube.common.resources.gcore.common.Platform; import org.gcube.common.resources.gcore.utils.Group; import org.gcube.informationsystem.model.impl.properties.EncryptedImpl; import org.gcube.informationsystem.model.impl.properties.HeaderImpl; -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.entity.Facet; -import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; +import org.gcube.informationsystem.model.impl.relations.IsIdentifiedByImpl; +import org.gcube.informationsystem.model.reference.entities.Facet; +import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.Encrypted; import org.gcube.informationsystem.model.reference.properties.Header; -import org.gcube.informationsystem.model.reference.relation.ConsistsOf; -import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.reference.relations.ConsistsOf; +import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy; +import org.gcube.informationsystem.model.utils.ISMapper; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl; diff --git a/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java b/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java index 279b3cf..0918244 100644 --- a/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java +++ b/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java @@ -7,7 +7,7 @@ import java.util.UUID; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.resources.gcore.GenericResource; import org.gcube.informationsystem.exporter.ScopedTest; -import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; diff --git a/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java b/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java index 073171d..bac2dcf 100644 --- a/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java +++ b/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java @@ -7,7 +7,7 @@ import java.util.UUID; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.informationsystem.exporter.ScopedTest; -import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;