From 68dbf33af65627e07ffaad464de67bab92b99478 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 15 Dec 2020 18:52:42 +0100 Subject: [PATCH] Fixed named convenient interface --- .../model/impl/entities/facets/SoftwareFacetImpl.java | 4 +--- .../model/reference/entities/facets/ActionFacet.java | 8 +++++--- .../model/reference/entities/facets/SoftwareFacet.java | 3 ++- .../utilities/Named.java} | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) rename src/main/java/org/gcube/resourcemanagement/model/reference/{entities/facets/NameProperty.java => properties/utilities/Named.java} (62%) 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 92699eb..5f0c61a 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 @@ -5,21 +5,19 @@ 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; /** * @author Luca Frosini (ISTI - CNR) */ @JsonTypeName(value=SoftwareFacet.NAME) -public class SoftwareFacetImpl extends FacetImpl implements SoftwareFacet, NameProperty { +public class SoftwareFacetImpl extends FacetImpl implements SoftwareFacet { /** * Generated Serial version UID */ private static final long serialVersionUID = 1062768788238515868L; - protected String name; protected String group; protected String version; 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 5701187..d209759 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 @@ -8,11 +8,13 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; import org.gcube.resourcemanagement.model.impl.entities.facets.ActionFacetImpl; import org.gcube.resourcemanagement.model.reference.properties.EnumStringProperty; +import org.gcube.resourcemanagement.model.reference.properties.utilities.Named; /** - * This facet is expected to capture information on how to instantiate a {@link SoftwareFacet}. * - * @author Manuele Simi (ISTI-CNR) + * @author Manuele Simi (ISTI - CNR) + * @author Luca Frosini (ISTI - CNR) + * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Action_Facet */ @JsonDeserialize(as=ActionFacetImpl.class) @@ -22,7 +24,7 @@ import org.gcube.resourcemanagement.model.reference.properties.EnumStringPropert version = TypeVersion.MINIMAL_VERSION_STRING ) @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION) -public interface ActionFacet extends Facet, NameProperty { +public interface ActionFacet extends Facet, Named { public static final String NAME = "ActionFacet"; // ActionFacet.class.getSimpleName(); 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 72dbf53..7fd0930 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 @@ -10,6 +10,7 @@ import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.reference.properties.utilities.Named; /** * @author Luca Frosini (ISTI - CNR) @@ -22,7 +23,7 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl version = TypeVersion.MINIMAL_VERSION_STRING ) @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION) -public interface SoftwareFacet extends Facet, NameProperty { +public interface SoftwareFacet extends Facet, Named { public static final String NAME = "SoftwareFacet"; // SoftwareFacet.class.getSimpleName(); diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NameProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/Named.java similarity index 62% rename from src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NameProperty.java rename to src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/Named.java index 938e20c..15c08bb 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/NameProperty.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/Named.java @@ -1,14 +1,14 @@ -package org.gcube.resourcemanagement.model.reference.entities.facets; +package org.gcube.resourcemanagement.model.reference.properties.utilities; -import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.types.annotations.ISProperty; /** - * A name property for a {@link Facet}. + * A convenient interface for any type having a name * - * @author Manuele Simi (ISTI CNR) + * @author Manuele Simi (ISTI - CNR) + * @author Luca Frosini (ISTI - CNR) * */ -public interface NameProperty { +public interface Named { public static final String NAME_PROPERTY = "name";