diff --git a/pom.xml b/pom.xml index 1c43b5a..2836eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.gcube.distribution gcube-bom - 1.6.0-SNAPSHOT + 2.0.0-SNAPSHOT pom import @@ -51,16 +51,16 @@ information-system-model - com.fasterxml.jackson.core - jackson-core + org.gcube.common + gcube-jackson-databind - com.fasterxml.jackson.core - jackson-annotations + org.gcube.common + gcube-jackson-annotations - com.fasterxml.jackson.core - jackson-databind + org.gcube.common + gcube-jackson-core org.slf4j diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/AccessPointFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/AccessPointFacetImpl.java index c428aec..6b42b93 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/AccessPointFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/AccessPointFacetImpl.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ActionFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ActionFacetImpl.java index 9264cad..088d83b 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ActionFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ActionFacetImpl.java @@ -1,11 +1,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * Implementation of {@link ActionFacet}. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CPUFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CPUFacetImpl.java index 1c4aeaf..e4f9fcf 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CPUFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CPUFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CapabilityFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CapabilityFacetImpl.java index a92a04b..2eea6bd 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CapabilityFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CapabilityFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CapabilityFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactFacetImpl.java index f0ae8f1..3f331d6 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactFacetImpl.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactReferenceFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactReferenceFacetImpl.java index 4f7bfde..07b9676 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactReferenceFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContactReferenceFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactReferenceFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContainerStateFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContainerStateFacetImpl.java index 4e33813..8905ee6 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContainerStateFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ContainerStateFacetImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.facets.ContainerStateFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CoverageFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CoverageFacetImpl.java index 0724495..9fc6c68 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CoverageFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/CoverageFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/DescriptiveMetadataFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/DescriptiveMetadataFacetImpl.java index 9e69f6c..bff6343 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/DescriptiveMetadataFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/DescriptiveMetadataFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.DescriptiveMetadataFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/EventFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/EventFacetImpl.java index 6b383f2..70dbc8e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/EventFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/EventFacetImpl.java @@ -6,11 +6,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; import java.util.Date; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.EventFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/IdentifierFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/IdentifierFacetImpl.java index 8a69783..2cc20c8 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/IdentifierFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/IdentifierFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.IdentifierFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/JSONSchemaFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/JSONSchemaFacetImpl.java index 224725b..145c80b 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/JSONSchemaFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/JSONSchemaFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.resourcemanagement.model.reference.entities.facets.JSONSchemaFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LicenseFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LicenseFacetImpl.java index efd46d5..f0fc55a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LicenseFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LicenseFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.LicenseFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LocationFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LocationFacetImpl.java index 870cea8..5716eb8 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LocationFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/LocationFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.LocationFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/MemoryFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/MemoryFacetImpl.java index ec5154e..2f9f82e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/MemoryFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/MemoryFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/NetworkingFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/NetworkingFacetImpl.java index 641daf7..534bb59 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/NetworkingFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/NetworkingFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ProvenanceFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ProvenanceFacetImpl.java index fcfb104..5e1a8f8 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ProvenanceFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ProvenanceFacetImpl.java @@ -6,11 +6,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; import java.util.UUID; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ProvenanceFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SchemaFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SchemaFacetImpl.java index d72d24d..c9ba2b4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SchemaFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SchemaFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.SchemaFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ServiceStateFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ServiceStateFacetImpl.java index a3338c2..4417545 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ServiceStateFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/ServiceStateFacetImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimpleFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimpleFacetImpl.java index c3e26fd..1569bce 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimpleFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimpleFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.SimpleFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimplePropertyFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimplePropertyFacetImpl.java index 50609e7..601b2d6 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimplePropertyFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SimplePropertyFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.SimplePropertyFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SoftwareFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SoftwareFacetImpl.java index a72c487..92699eb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SoftwareFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SoftwareFacetImpl.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.NameProperty; import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/StateFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/StateFacetImpl.java index 1cdc89d..91ee98e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/StateFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/StateFacetImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SubjectFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SubjectFacetImpl.java index 873c1e2..7b8b540 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SubjectFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/SubjectFacetImpl.java @@ -5,11 +5,10 @@ package org.gcube.resourcemanagement.model.impl.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.FacetImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.SubjectFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/XSDSchemaFacetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/XSDSchemaFacetImpl.java index 6216b48..a424382 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/XSDSchemaFacetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/facets/XSDSchemaFacetImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.facets; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.facets.XSDSchemaFacet; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ActorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ActorImpl.java index 00700bc..9c0b6f5 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ActorImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ActorImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConcreteDatasetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConcreteDatasetImpl.java index 3b750fd..5a3e9f3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConcreteDatasetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConcreteDatasetImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.ConcreteDataset; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationImpl.java index 342f6cf..88fce85 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Configuration; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationTemplateImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationTemplateImpl.java index ea7c881..af8a885 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationTemplateImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ConfigurationTemplateImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/DatasetImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/DatasetImpl.java index 3f936db..caf01df 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/DatasetImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/DatasetImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/EServiceImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/EServiceImpl.java index e665f88..50d8fd2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/EServiceImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/EServiceImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/GCubeResourceImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/GCubeResourceImpl.java index d2a4d74..7979097 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/GCubeResourceImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/GCubeResourceImpl.java @@ -3,6 +3,7 @@ package org.gcube.resourcemanagement.model.impl.entities.resources; import java.util.ArrayList; import java.util.List; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.entities.ResourceImpl; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; @@ -10,8 +11,6 @@ import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.resourcemanagement.model.reference.entities.resources.GCubeResource; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/HostingNodeImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/HostingNodeImpl.java index 77f3a7f..785741a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/HostingNodeImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/HostingNodeImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/LegalBodyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/LegalBodyImpl.java index 7f384b7..1cd20b0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/LegalBodyImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/LegalBodyImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.LegalBody; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PersonImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PersonImpl.java index 17116dd..b0f618c 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PersonImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PersonImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Person; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PluginImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PluginImpl.java index 5741fef..38f7940 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PluginImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/PluginImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Plugin; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/RunningPluginImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/RunningPluginImpl.java index 4a6ef14..cd94b07 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/RunningPluginImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/RunningPluginImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.RunningPlugin; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SchemaImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SchemaImpl.java index 7bd442c..512d142 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SchemaImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SchemaImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Schema; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ServiceImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ServiceImpl.java index 4520848..94d81f0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ServiceImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/ServiceImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SiteImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SiteImpl.java index 5f92456..8eacc02 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SiteImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SiteImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Site; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SoftwareImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SoftwareImpl.java index 174a9b2..67f37aa 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SoftwareImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/SoftwareImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualMachineImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualMachineImpl.java index f03ee16..445318a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualMachineImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualMachineImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.VirtualMachine; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualServiceImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualServiceImpl.java index ba656ba..ca1ad05 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualServiceImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/entities/resources/VirtualServiceImpl.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.impl.entities.resources; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.entities.resources.VirtualService; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/AccessPolicyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/AccessPolicyImpl.java index cead4a4..6dbd4ca 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/AccessPolicyImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/AccessPolicyImpl.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.impl.properties; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.properties.AccessPolicy; import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java index 1ea829a..5e7535e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java @@ -2,10 +2,9 @@ package org.gcube.resourcemanagement.model.impl.properties; import java.util.Set; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * Implementation for {@link EnumStringProperty}. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/GCubePropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/GCubePropertyImpl.java index f7ff106..49c3847 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/GCubePropertyImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/GCubePropertyImpl.java @@ -1,10 +1,9 @@ package org.gcube.resourcemanagement.model.impl.properties; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.properties.PropertyImpl; import org.gcube.resourcemanagement.model.reference.properties.GCubeProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java index c4f803f..1c7ed18 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java @@ -1,9 +1,8 @@ package org.gcube.resourcemanagement.model.impl.properties; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.properties.RegexProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * Implementation for {@link RegexProperty}. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java index 9278479..1d766be 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java @@ -2,10 +2,9 @@ package org.gcube.resourcemanagement.model.impl.properties; import java.net.URI; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * A property with an {@link URI} as value * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java index fb526a4..8661e0e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasAction; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * An implementation of the {@link HasAction} relation. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java index a77377b..ea2cc4a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasAddAction; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * An implementation of the {@link HasAddAction} relation. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java index d36e8fa..38eff4e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasContact; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java index 461a202..2160abe 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasContributor; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java index ab0e794..7f7d2bb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasCoverage; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java index 1b796f0..f41ba69 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java index 4328a92..fecf182 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasCurator; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java index a530a4e..64b3cdc 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasDeveloper; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java index 6df0c41..b6dc92f 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasMaintainer; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java index 648c493..59c1e18 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasManager; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java index 0a1b725..44067e7 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasMemory; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java index 5398ee6..7ac3a65 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasOwner; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java index 61b4903..b42e9c4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java index c55ab54..80155bc 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasRemoveAction; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * An implementation of the {@link HasRemoveAction} relation. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java index b0350cb..52ede7e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasSpatialCoverage; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java index 6002028..77831ec 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasTemporalCoverage; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java index 90851fa..3e8d118 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/IsIdentifiedByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/IsIdentifiedByImpl.java index d8e0c42..17d7fac 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/IsIdentifiedByImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/IsIdentifiedByImpl.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.impl.relations.consistsof; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java index 9efe39d..1ecbc99 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Activates; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java index 765277a..a152580 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.LegalBody; import org.gcube.resourcemanagement.model.reference.entities.resources.Person; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.BelongsTo; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java index c6301e3..88aa1fd 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.CallsFor; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java index 1bfd33b..dc036e4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.entities.resources.VirtualService; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Demands; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java index a991746..a420ad1 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.DependsOn; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java index 77665cb..9e7613c 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java @@ -1,11 +1,10 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Discovers; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java index 0bb78ab..26e9fdb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Enables; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java index f644a61..2cb834d 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Site; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Hosts; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java index 9e8c24c..dce100e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Involves; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java index 941ffb1..df8ac6a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Schema; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCompliantWith; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java index 4ec8fc1..f90b599 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsConfiguredBy; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java index 93d6c6f..95a3bfa 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCorrelatedTo; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java index 722de79..3c10cb9 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCustomizedBy; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java index b968c8c..3162efd 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Configuration; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDerivationOf; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java index d20bc53..fa34928 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; import org.gcube.resourcemanagement.model.reference.entities.resources.Site; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwnedBy; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java index 428d532..18d8792 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.ConcreteDataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPartOf; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java index 4362f32..431d5d3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Plugin; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPluginOf; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java index bf5454f..6987f3f 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manages; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java index 671dade..b182dec 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.impl.relations.IsRelatedToImpl; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requires; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java index a51f9a9..b21efab 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java @@ -1,11 +1,10 @@ package org.gcube.resourcemanagement.model.impl.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Uses; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacet.java index b847c4a..9361fab 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacet.java @@ -5,13 +5,12 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Access_Point_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacet.java index a6588f5..b473e63 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacet.java @@ -1,12 +1,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.ActionFacetImpl; import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * This facet is expected to capture information on how to instantiate a {@link SoftwareFacet}. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CPUFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CPUFacet.java index a6798f5..25c2d84 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CPUFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CPUFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#CPU_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CapabilityFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CapabilityFacet.java index 12e031e..7d86503 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CapabilityFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CapabilityFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.CapabilityFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Contact_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacet.java index 7dfc403..23fe6b3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.ContactFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Contact_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactReferenceFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactReferenceFacet.java index cb393e3..c9051bf 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactReferenceFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactReferenceFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.ContactReferenceFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Contact_Reference_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContainerStateFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContainerStateFacet.java index f1b78af..72de932 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContainerStateFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContainerStateFacet.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.entities.facets.ContainerStateFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CoverageFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CoverageFacet.java index c12822d..5fe876e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CoverageFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/CoverageFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.CoverageFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Coverage_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/DescriptiveMetadataFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/DescriptiveMetadataFacet.java index 74830ea..62ce3dc 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/DescriptiveMetadataFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/DescriptiveMetadataFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.DescriptiveMetadataFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Descriptive_Metadata_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java index 09c7a90..9f929d9 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java @@ -6,14 +6,13 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; import java.util.Date; +import org.gcube.com.fasterxml.jackson.annotation.JsonFormat; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Event_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/IdentifierFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/IdentifierFacet.java index f6a0d85..c747dfb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/IdentifierFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/IdentifierFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.IdentifierFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Identifier_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/JSONSchemaFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/JSONSchemaFacet.java index 13e286c..3a50990 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/JSONSchemaFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/JSONSchemaFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.JSONSchemaFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#XSD_Schema_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LicenseFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LicenseFacet.java index 7a6387c..61c751a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LicenseFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LicenseFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.LicenseFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#License_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LocationFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LocationFacet.java index 90f4934..439c248 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LocationFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/LocationFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.LocationFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Location_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/MemoryFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/MemoryFacet.java index 4a6ea1f..c68db22 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/MemoryFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/MemoryFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.MemoryFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Memory_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NetworkingFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NetworkingFacet.java index 1246a32..71401c1 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NetworkingFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NetworkingFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Network_Address_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ProvenanceFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ProvenanceFacet.java index c8214cb..a721f71 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ProvenanceFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ProvenanceFacet.java @@ -6,12 +6,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; import java.util.UUID; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.ProvenanceFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Provenance_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SchemaFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SchemaFacet.java index fbfdd7c..146a8f4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SchemaFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SchemaFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URL; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.SchemaFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Schema_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ServiceStateFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ServiceStateFacet.java index 87de6f0..ee76fa2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ServiceStateFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/ServiceStateFacet.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimpleFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimpleFacet.java index 7a684da..1f49d12 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimpleFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimpleFacet.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Simple_Property_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimplePropertyFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimplePropertyFacet.java index b029730..daf12c0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimplePropertyFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SimplePropertyFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.SimplePropertyFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Simple_Property_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SoftwareFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SoftwareFacet.java index de8a43e..5108f1c 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SoftwareFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SoftwareFacet.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Software_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/StateFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/StateFacet.java index 200e847..24d85de 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/StateFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/StateFacet.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.StateFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#State_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SubjectFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SubjectFacet.java index 19f0e8a..8c19971 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SubjectFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/SubjectFacet.java @@ -5,12 +5,11 @@ package org.gcube.resourcemanagement.model.reference.entities.facets; import java.net.URI; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.SubjectFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Subject_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/XSDSchemaFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/XSDSchemaFacet.java index 39a08a4..aa2a500 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/XSDSchemaFacet.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/XSDSchemaFacet.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.reference.entities.facets; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.entities.facets.XSDSchemaFacetImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#XSD_Schema_Facet diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java index f224f8e..ef5a0ac 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; @@ -15,8 +16,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Involves; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwnedBy; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Actor diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java index c975eb7..4af1d27 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -12,8 +13,6 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasMaintainer; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPartOf; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java index cb8e9d5..fcdba50 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.ConfigurationImpl; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDerivationOf; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java index e23583e..8f9c69d 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -14,8 +15,6 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsConf import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCustomizedBy; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDerivationOf; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Configuration_Template diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java index f67021e..0e0f787 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -32,8 +33,6 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCorr import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPartOf; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manages; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Dataset diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java index 8921cbc..4274e68 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -16,8 +17,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Discovers; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Uses; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#E-Service diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/GCubeResource.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/GCubeResource.java index f40ae25..6eb6fe2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/GCubeResource.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/GCubeResource.java @@ -2,6 +2,8 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import java.util.List; +import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.types.annotations.Abstract; @@ -10,9 +12,6 @@ import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.GCubeResourceImpl; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java index d4b18fc..bc27c5d 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; @@ -17,8 +18,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPers import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Hosting_Node diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java index 1e18b26..e4c7e7e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.LegalBodyImpl; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.BelongsTo; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java index f555cfd..6aaa237 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.PersonImpl; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.BelongsTo; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Person diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java index c4018dd..f9f471c 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.PluginImpl; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPluginOf; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/RunningPlugin.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/RunningPlugin.java index aa679c4..5489b58 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/RunningPlugin.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/RunningPlugin.java @@ -3,10 +3,9 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.entities.resources.RunningPluginImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Running_Plugin diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java index 65e655b..2db8eac 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -17,8 +18,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasCont import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCompliantWith; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Schema diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java index eb242ce..4025ffd 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; @@ -18,8 +19,6 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsCust import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manages; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requires; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Service diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java index 2dbf96e..aa15470 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -18,8 +19,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Hosts; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwnedBy; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Site diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java index 1ddd14b..e05c8d4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -16,8 +17,6 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsConf import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPluginOf; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requires; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Software diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java index 1643cd8..7ea57a9 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.resourcemanagement.model.impl.entities.resources.VirtualMachineImpl; @@ -16,8 +17,6 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPers import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Virtual_Machine diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java index de81ae1..f28f159 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java @@ -3,6 +3,7 @@ */ package org.gcube.resourcemanagement.model.reference.entities.resources; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; @@ -11,8 +12,6 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFace import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Demands; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Virtual_Service diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/AccessPolicy.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/AccessPolicy.java index c232e01..d7610a0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/AccessPolicy.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/AccessPolicy.java @@ -1,10 +1,9 @@ package org.gcube.resourcemanagement.model.reference.properties; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.properties.AccessPolicyImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java index f8513bd..bc3cd69 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java @@ -2,13 +2,12 @@ package org.gcube.resourcemanagement.model.reference.properties; import java.util.Set; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.properties.EnumStringPropertyImpl; import org.gcube.resourcemanagement.model.reference.properties.utilities.PropertyValidator; import org.gcube.resourcemanagement.model.reference.properties.utilities.ValidatedTypedProperty; import org.gcube.resourcemanagement.model.reference.properties.utilities.Validation; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * A string property validated against a set of accepted values. diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java index 8cc661a..c6fc7c0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java @@ -1,10 +1,9 @@ package org.gcube.resourcemanagement.model.reference.properties; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.resourcemanagement.model.impl.properties.GCubePropertyImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * Marker interface for {@link Property} properties extended in the gCube model. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java index 72e0356..ee78854 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java @@ -4,14 +4,13 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.properties.RegexPropertyImpl; import org.gcube.resourcemanagement.model.reference.properties.utilities.PropertyValidator; import org.gcube.resourcemanagement.model.reference.properties.utilities.ValidatedTypedProperty; import org.gcube.resourcemanagement.model.reference.properties.utilities.Validation; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * A property validated with a regular expression. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java index 5915178..82dd438 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java @@ -2,14 +2,13 @@ package org.gcube.resourcemanagement.model.reference.properties; import java.net.URI; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ISProperty; import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl; import org.gcube.resourcemanagement.model.reference.properties.utilities.PropertyValidator; import org.gcube.resourcemanagement.model.reference.properties.utilities.ValidatedTypedProperty; import org.gcube.resourcemanagement.model.reference.properties.utilities.Validation; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * A property with an {@link URI} as value * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAction.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAction.java index 4974ab8..ce77502 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAction.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAction.java @@ -1,13 +1,12 @@ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasActionImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * Relation among a {@link Service} and its {@link ActionFacet}. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAddAction.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAddAction.java index bf1a502..4510bdb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAddAction.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasAddAction.java @@ -1,11 +1,10 @@ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasAddActionImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * An action triggered when a {@link Service} is activated. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContact.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContact.java index 0b4b1fe..ecbe086 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContact.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContact.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasContactImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasContact diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContributor.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContributor.java index 3641a7b..f9c8584 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContributor.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasContributor.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasContributorImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasContributor diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCoverage.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCoverage.java index 4fb9749..d5460f2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCoverage.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCoverage.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasCoverageImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasCoverage diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCreator.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCreator.java index 38d51ee..b988876 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCreator.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCreator.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasCreatorImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasCreator diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCurator.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCurator.java index e4afa73..e9a3198 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCurator.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasCurator.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasCuratorImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasCurator diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasDeveloper.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasDeveloper.java index b10a3db..8d048a3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasDeveloper.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasDeveloper.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasDeveloperImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasDeveloper diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMaintainer.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMaintainer.java index 850ce88..5df8045 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMaintainer.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMaintainer.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasMaintainerImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasMaintainer diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasManager.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasManager.java index 27098d3..432b1d9 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasManager.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasManager.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasManagerImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasManager diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMemory.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMemory.java index 271f0a1..f425626 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMemory.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasMemory.java @@ -3,14 +3,13 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasMemoryImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasMemory diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasOwner.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasOwner.java index cfa0229..a041c0a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasOwner.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasOwner.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasOwnerImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasOwner diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasPersistentMemory.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasPersistentMemory.java index c427f84..4207dd9 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasPersistentMemory.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasPersistentMemory.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasPersistentMemoryImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasPersistentMemory diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasRemoveAction.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasRemoveAction.java index 13acd89..a216dce 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasRemoveAction.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasRemoveAction.java @@ -1,11 +1,10 @@ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasRemoveActionImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * An action triggered when a {@link Service} is deactivated. * diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasSpatialCoverage.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasSpatialCoverage.java index 600c52e..39fa0ab 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasSpatialCoverage.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasSpatialCoverage.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasSpatialCoverageImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasSpatialCoverage diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasTemporalCoverage.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasTemporalCoverage.java index 5f243eb..122d1f0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasTemporalCoverage.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasTemporalCoverage.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasTemporalCoverageImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.CoverageFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasTemporalCoverage diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasVolatileMemory.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasVolatileMemory.java index 4a86559..f448070 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasVolatileMemory.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/HasVolatileMemory.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasVolatileMemoryImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#hasVolatileMemory diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/IsIdentifiedBy.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/IsIdentifiedBy.java index 8ddaecc..2a8a170 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/IsIdentifiedBy.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/consistsof/IsIdentifiedBy.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.consistsof; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; 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.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isIdentifiedBy diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Activates.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Activates.java index 8f1b8a2..7447311 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Activates.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Activates.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.ActivatesImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#activates diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/BelongsTo.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/BelongsTo.java index f65d28d..4f3c730 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/BelongsTo.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/BelongsTo.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.BelongsToImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.LegalBody; import org.gcube.resourcemanagement.model.reference.entities.resources.Person; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#belongsTo diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/CallsFor.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/CallsFor.java index 8c10682..efb4467 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/CallsFor.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/CallsFor.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.CallsForImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#callsFor diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Demands.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Demands.java index ee0b825..2581b08 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Demands.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Demands.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.DemandsImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; import org.gcube.resourcemanagement.model.reference.entities.resources.VirtualService; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#demands diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/DependsOn.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/DependsOn.java index 8be2c99..aa85e3c 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/DependsOn.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/DependsOn.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.DependsOnImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#dependsOn diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Discovers.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Discovers.java index bf5f3e1..29a5090 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Discovers.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Discovers.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.DiscoversImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#discovers diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Enables.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Enables.java index 2a6cfb7..c329e8a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Enables.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Enables.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.EnablesImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#enables diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Hosts.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Hosts.java index a4c7450..25f85b4 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Hosts.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Hosts.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.HostsImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Site; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Involves.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Involves.java index c358ce6..cded717 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Involves.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Involves.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.InvolvesImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#involves diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCompliantWith.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCompliantWith.java index 56678d0..27456a0 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCompliantWith.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCompliantWith.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsCompliantWithImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Schema; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isCompliantWith diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsConfiguredBy.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsConfiguredBy.java index b82544d..1f7c2e2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsConfiguredBy.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsConfiguredBy.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsConfiguredByImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isConfiguredBy diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCorrelatedTo.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCorrelatedTo.java index 36c1902..e510e5d 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCorrelatedTo.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCorrelatedTo.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsCorrelatedToImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isCorrelatedTo diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCustomizedBy.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCustomizedBy.java index 79540a9..97e8f67 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCustomizedBy.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsCustomizedBy.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsCustomizedByImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isCustomizedBy diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsDerivationOf.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsDerivationOf.java index 0d997f4..334dcd2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsDerivationOf.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsDerivationOf.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsDerivationOfImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Configuration; import org.gcube.resourcemanagement.model.reference.entities.resources.ConfigurationTemplate; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isDerivationOf diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsOwnedBy.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsOwnedBy.java index f77e3b5..b39ea50 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsOwnedBy.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsOwnedBy.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsOwnedByImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Actor; import org.gcube.resourcemanagement.model.reference.entities.resources.Site; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isOwnedBy diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPartOf.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPartOf.java index 06bba47..d6dd021 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPartOf.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPartOf.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsPartOfImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.ConcreteDataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isPartOf diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPluginOf.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPluginOf.java index d354a98..1226817 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPluginOf.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/IsPluginOf.java @@ -3,12 +3,11 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.IsPluginOfImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Plugin; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isPluginOf diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Manages.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Manages.java index e7ad976..a21935e 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Manages.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Manages.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.ManagesImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Dataset; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#manages diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Requires.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Requires.java index 34f1878..a109263 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Requires.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Requires.java @@ -3,13 +3,12 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.RequiresImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.Service; import org.gcube.resourcemanagement.model.reference.entities.resources.Software; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#requires diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Uses.java b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Uses.java index d9d223b..4ed7643 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Uses.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/relations/isrelatedto/Uses.java @@ -3,11 +3,10 @@ */ package org.gcube.resourcemanagement.model.reference.relations.isrelatedto; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.UsesImpl; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java index 730e458..50c6229 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java @@ -7,7 +7,6 @@ import org.gcube.informationsystem.model.reference.properties.Encrypted; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl; -import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java index f16c7a0..84bba6d 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java @@ -7,17 +7,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.ActionFacetImpl; import org.gcube.resourcemanagement.model.impl.properties.EnumStringPropertyImpl; -import org.gcube.resourcemanagement.model.reference.entities.facets.ActionFacet; import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; -import com.fasterxml.jackson.core.JsonProcessingException; - /** * Test cases for {@link ActionFacet} * diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacetImplTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacetImplTest.java index ce9518d..94ef0c2 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacetImplTest.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ContactFacetImplTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.impl.entities.facets.ContactFacetImpl; -import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java index 68a1231..0e4e174 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java @@ -6,6 +6,9 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; +import org.gcube.com.fasterxml.jackson.core.JsonGenerationException; +import org.gcube.com.fasterxml.jackson.core.JsonParseException; +import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; import org.gcube.informationsystem.context.reference.entities.Context; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Facet; @@ -21,10 +24,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonGenerationException; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.databind.JsonMappingException; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java index 263698f..5c142a7 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java @@ -1,12 +1,12 @@ package org.gcube.resourcemanagement.model.reference.properties; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.HashSet; import org.gcube.resourcemanagement.model.impl.properties.EnumStringPropertyImpl; -import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java index 73f9f9c..51e87ea 100644 --- a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java +++ b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java @@ -1,9 +1,10 @@ package org.gcube.resourcemanagement.model.reference.properties; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.gcube.resourcemanagement.model.impl.properties.RegexPropertyImpl; -import org.gcube.resourcemanagement.model.reference.properties.RegexProperty; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;