From c68826637c9d578542a899f749bd5b2a477f487e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 24 Jan 2024 17:18:46 +0100 Subject: [PATCH] Fixed list of allowed properties starting with _ or @ --- .../base/impl/properties/PropertyElementImpl.java | 1 - .../gcube/informationsystem/model/impl/entities/FacetImpl.java | 3 --- .../informationsystem/model/impl/relations/RelationImpl.java | 1 - 3 files changed, 5 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyElementImpl.java b/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyElementImpl.java index 7162f0a..912ace0 100644 --- a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyElementImpl.java +++ b/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyElementImpl.java @@ -41,7 +41,6 @@ public class PropertyElementImpl extends ElementImpl implements Property { super(); this.additionalProperties = new HashMap<>(); this.allowedAdditionalKeys = new HashSet<>(); - this.allowedAdditionalKeys.add(SUPERTYPES_PROPERTY); } @Override diff --git a/src/main/java/org/gcube/informationsystem/model/impl/entities/FacetImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/entities/FacetImpl.java index 4c61c14..3daab53 100644 --- a/src/main/java/org/gcube/informationsystem/model/impl/entities/FacetImpl.java +++ b/src/main/java/org/gcube/informationsystem/model/impl/entities/FacetImpl.java @@ -11,7 +11,6 @@ import java.util.Set; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.informationsystem.base.reference.Element; -import org.gcube.informationsystem.model.reference.ModelElement; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.serialization.ElementMapper; @@ -40,8 +39,6 @@ public abstract class FacetImpl extends EntityImpl implements Facet { super(); this.additionalProperties = new HashMap<>(); this.allowedAdditionalKeys = new HashSet<>(); - this.allowedAdditionalKeys.add(ModelElement.SUPERTYPES_PROPERTY); - this.allowedAdditionalKeys.add(ModelElement.EXPECTED_TYPE_PROPERTY); } @Override diff --git a/src/main/java/org/gcube/informationsystem/model/impl/relations/RelationImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/relations/RelationImpl.java index 9ba5837..a327111 100644 --- a/src/main/java/org/gcube/informationsystem/model/impl/relations/RelationImpl.java +++ b/src/main/java/org/gcube/informationsystem/model/impl/relations/RelationImpl.java @@ -53,7 +53,6 @@ public abstract class RelationImpl super(); this.additionalProperties = new HashMap<>(); this.allowedAdditionalKeys = new HashSet<>(); - this.allowedAdditionalKeys.add(SUPERTYPES_PROPERTY); } protected RelationImpl(S source, T target,