gCubeSystem
/
information-system-model
14
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Removed uneeded interface

This commit is contained in:
Luca Frosini 2020-02-03 10:57:41 +01:00
parent 0709706ddc
commit df060fd912
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/informationsystem/types/reference/Type.java
View File

@ -4,13 +4,14 @@ import java.util.Set;
import org.gcube.informationsystem.base.reference.IdentifiableElement;
import org.gcube.informationsystem.types.annotations.Abstract;
import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@Abstract
@JsonIgnoreProperties(ignoreUnknown=true)
//@JsonDeserialize(as=TypeImpl.class) Do not uncomment to manage subclasses
public interface Type extends IdentifiableElement, TypeWithProperties {
public interface Type extends IdentifiableElement {
public static final String NAME = "Type"; //Type.class.getSimpleName();
@ -18,6 +19,7 @@ public interface Type extends IdentifiableElement, TypeWithProperties {
public static final String DESCRIPTION_PROPERTY = "description";
public static final String ABSTRACT_PROPERTY = "abstract";
public static final String TYPE_SUPERCLASSES_PROPERTY = "superClasses";
public static final String PROPERTIES_PROPERTY = "properties";
public String getName();
@ -27,4 +29,6 @@ public interface Type extends IdentifiableElement, TypeWithProperties {
public Set<String> getSuperClasses();
public Set<PropertyDefinition> getProperties();
}

12
src/main/java/org/gcube/informationsystem/types/reference/TypeWithProperties.java
View File

@ -1,12 +0,0 @@
package org.gcube.informationsystem.types.reference;
import java.util.Set;
import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
public interface TypeWithProperties {
public static final String PROPERTIES_PROPERTY = "properties";
public Set<PropertyDefinition> getProperties();
}

4
src/main/java/org/gcube/informationsystem/types/reference/entities/FacetType.java
View File

@ -4,7 +4,7 @@ import java.util.Set;
import org.gcube.informationsystem.types.annotations.ISProperty;
import org.gcube.informationsystem.types.impl.entities.FacetTypeImpl;
import org.gcube.informationsystem.types.reference.TypeWithProperties;
import org.gcube.informationsystem.types.reference.Type;
import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@ -16,7 +16,7 @@ public interface FacetType extends EntityType {
public static final String NAME = "FacetType"; //FacetType.class.getSimpleName();
@ISProperty(name = TypeWithProperties.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
@ISProperty(name = Type.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
public Set<PropertyDefinition> getProperties();

3
src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyType.java
View File

@ -8,7 +8,6 @@ import org.gcube.informationsystem.model.reference.properties.Header;
import org.gcube.informationsystem.types.annotations.ISProperty;
import org.gcube.informationsystem.types.impl.properties.PropertyTypeImpl;
import org.gcube.informationsystem.types.reference.Type;
import org.gcube.informationsystem.types.reference.TypeWithProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@ -42,7 +41,7 @@ public interface PropertyType<P extends PropertyElement> extends PropertyElement
@ISProperty(name = Type.TYPE_SUPERCLASSES_PROPERTY, readonly = true, mandatory = true, nullable = false)
public Set<String> getSuperClasses();
@ISProperty(name = TypeWithProperties.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
@ISProperty(name = Type.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
public Set<PropertyDefinition> getProperties();
/* TypeDefinition is just a Java useful class. The type is not created in the IS. Hence the fields must be redefined */

3
src/main/java/org/gcube/informationsystem/types/reference/relations/RelationType.java
View File

@ -6,7 +6,6 @@ import org.gcube.informationsystem.base.reference.relations.RelationElement;
import org.gcube.informationsystem.types.annotations.ISProperty;
import org.gcube.informationsystem.types.impl.relations.RelationTypeImpl;
import org.gcube.informationsystem.types.reference.Type;
import org.gcube.informationsystem.types.reference.TypeWithProperties;
import org.gcube.informationsystem.types.reference.entities.EntityType;
import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
@ -39,7 +38,7 @@ public interface RelationType<S extends EntityType, T extends EntityType>
public Set<String> getSuperClasses();
@Override
@ISProperty(name = TypeWithProperties.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
@ISProperty(name = Type.PROPERTIES_PROPERTY, readonly = false, mandatory = true, nullable = false)
public Set<PropertyDefinition> getProperties();
@Override