diff --git a/src/main/java/org/gcube/informationsystem/model/impl/entities/ResourceImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/entities/ResourceImpl.java index daf1cf0..14567cf 100644 --- a/src/main/java/org/gcube/informationsystem/model/impl/entities/ResourceImpl.java +++ b/src/main/java/org/gcube/informationsystem/model/impl/entities/ResourceImpl.java @@ -11,7 +11,6 @@ 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.relations.ConsistsOf; -import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -199,17 +198,6 @@ public abstract class ResourceImpl extends EntityImpl implements Resource { */ } - @Override - public List getIdentificationFacets() { - List identificationFacets = new ArrayList<>(); - for(ConsistsOf consistsOfInstance : consistsOfList){ - if (IsIdentifiedBy.class.isAssignableFrom(consistsOfInstance.getClass())) { - identificationFacets.add(consistsOfInstance.getTarget()); - } - } - return identificationFacets; - } - @Override public List> getConsistsOf() { return consistsOfList; diff --git a/src/main/java/org/gcube/informationsystem/model/impl/relations/IsIdentifiedByImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/relations/IsIdentifiedByImpl.java deleted file mode 100644 index 44f0d29..0000000 --- a/src/main/java/org/gcube/informationsystem/model/impl/relations/IsIdentifiedByImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.model.impl.relations; - -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.informationsystem.model.reference.relations.IsIdentifiedBy; - -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -@JsonTypeName(value=IsIdentifiedBy.NAME) -public class IsIdentifiedByImpl extends - ConsistsOfImpl implements IsIdentifiedBy { - - /** - * Generated Serial Version UID - */ - private static final long serialVersionUID = 8043666054054911145L; - - protected IsIdentifiedByImpl(){ - super(); - } - - public IsIdentifiedByImpl(S source, T target, - PropagationConstraint propagationConstraint) { - super(source, target, propagationConstraint); - } - -} diff --git a/src/main/java/org/gcube/informationsystem/model/reference/entities/Resource.java b/src/main/java/org/gcube/informationsystem/model/reference/entities/Resource.java index b4f8907..bc59181 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/entities/Resource.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/entities/Resource.java @@ -27,9 +27,6 @@ public interface Resource extends Entity { public static final String CONSISTS_OF_PROPERTY = "consistsOf"; public static final String IS_RELATED_TO_PROPERTY = "isRelatedTo"; - @JsonIgnore - public List getIdentificationFacets(); - // @JsonManagedReference public List> getConsistsOf(); diff --git a/src/main/java/org/gcube/informationsystem/model/reference/relations/IsIdentifiedBy.java b/src/main/java/org/gcube/informationsystem/model/reference/relations/IsIdentifiedBy.java deleted file mode 100644 index 0f84458..0000000 --- a/src/main/java/org/gcube/informationsystem/model/reference/relations/IsIdentifiedBy.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.model.reference.relations; - -import org.gcube.informationsystem.model.impl.relations.IsIdentifiedByImpl; -import org.gcube.informationsystem.model.reference.entities.Facet; -import org.gcube.informationsystem.model.reference.entities.Resource; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -/** - * @author Luca Frosini (ISTI - CNR) - * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isIdentifiedBy - */ -@JsonDeserialize(as=IsIdentifiedByImpl.class) -public interface IsIdentifiedBy - extends ConsistsOf { - - public static final String NAME = "IsIdentifiedBy"; //IsIdentifiedBy.class.getSimpleName(); - -}