From 64069ccc54b42178ea9e6a09d9dd2072dd40af7e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 4 Aug 2021 15:05:25 +0200 Subject: [PATCH] Simplified Event facet --- .../model/impl/entities/facets/EventFacetImpl.java | 7 +++---- .../model/reference/entities/facets/EventFacet.java | 7 +++---- .../model/reference/entities/facets/StateFacet.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) 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 2dc56bc..edfb8ba 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 @@ -8,7 +8,6 @@ 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 org.gcube.resourcemanagement.model.reference.properties.ValueSchema; /** * @author Luca Frosini (ISTI - CNR) @@ -22,7 +21,7 @@ public class EventFacetImpl extends FacetImpl implements EventFacet { private static final long serialVersionUID = -4130548762073254058L; protected Date date; - protected ValueSchema event; + protected String event; public Date getDate() { return this.date; @@ -32,11 +31,11 @@ public class EventFacetImpl extends FacetImpl implements EventFacet { this.date = date; } - public ValueSchema getEvent() { + public String getEvent() { return event; } - public void setEvent(ValueSchema event) { + public void setEvent(String event) { this.event = event; } 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 214960c..d19ceee 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 @@ -14,7 +14,6 @@ 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.EventFacetImpl; -import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; /** * EventFacet captures information on a certain event/happening characterising the life cycle of the resource. @@ -43,9 +42,9 @@ public interface EventFacet extends Facet { public void setDate(Date date); - @ISProperty(description = "The typology of event according to the schema", mandatory=true, nullable=false) - public ValueSchema getEvent(); + @ISProperty(description = "The typology of event", mandatory=true, nullable=false) + public String getEvent(); - public void setEvent(ValueSchema event); + public void setEvent(String event); } \ No newline at end of file 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 5b74fb2..e908a3f 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 @@ -36,7 +36,7 @@ public interface StateFacet extends Facet { public static final String NAME = "StateFacet"; // StateFacet.class.getSimpleName(); - @ISProperty(mandatory=true, nullable=false) + @ISProperty(description="The value of the state", mandatory=true, nullable=false) public String getValue(); public void setValue(String value);