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 fff4255..4f32e41 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java @@ -32,6 +32,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory; import org.gcube.informationsystem.utils.ISMapper; +import org.gcube.resourcemanagement.model.reference.entities.resources.GCubeResource; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.gcube.resources.discovery.icclient.ICFactory; @@ -348,7 +349,7 @@ public abstract class GCoreResourceMapper facets = r.getIdentificationFacets(); + List facets = ((GCubeResource)r).getIdentificationFacets(); for (Facet f : facets) { f.setAdditionalProperty(EXPORTED, EXPORTED_FROM_OLD_GCORE_IS); } 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 369c6a3..ed81a2a 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java @@ -8,19 +8,19 @@ import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.resources.gcore.GenericResource.Profile; import org.gcube.informationsystem.base.impl.properties.HeaderImpl; import org.gcube.informationsystem.base.reference.properties.Header; -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.relations.ConsistsOf; -import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.ConfigurationImpl; +import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.SimpleFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Configuration; +import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.json.JSONObject; import org.json.XML; 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 5a61fdf..29bf195 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java @@ -15,12 +15,10 @@ import org.gcube.informationsystem.base.impl.properties.HeaderImpl; import org.gcube.informationsystem.base.reference.properties.Header; import org.gcube.informationsystem.model.impl.properties.EncryptedImpl; 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.relations.ConsistsOf; -import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; @@ -28,11 +26,13 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetIm import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl; +import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; +import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.slf4j.Logger; import org.slf4j.LoggerFactory;