Adding and additional level to allow to define TypeDefinition and

PropertyDefinition

src/main/java/org/gcube/informationsystem/base/impl/ERImpl.java

@@ -1,10 +1,10 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.impl;
+package org.gcube.informationsystem.base.impl;
 
-import org.gcube.informationsystem.model.reference.ER;
+import org.gcube.informationsystem.base.reference.ER;
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.properties.Header;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 @JsonTypeName(value=ER.NAME)
 public abstract class ERImpl extends ISManageableImpl implements ER {
 	
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -494123926950181618L;
+	
 	protected Header header;
 	
 	public ERImpl(){

src/main/java/org/gcube/informationsystem/base/impl/ISManageableImpl.java

@@ -0,0 +1,22 @@
+/**
+ * 
+ */
+package org.gcube.informationsystem.base.impl;
+
+import org.gcube.informationsystem.base.reference.ISManageable;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ *
+ */
+public class ISManageableImpl implements ISManageable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7338083489551084860L;
+
+	public ISManageableImpl(){
+		
+	}
+}

src/main/java/org/gcube/informationsystem/base/impl/entities/BaseEntityImpl.java

@@ -1,10 +1,11 @@
-package org.gcube.informationsystem.model.impl;
+package org.gcube.informationsystem.base.impl.entities;
 
 import java.io.StringWriter;
 
-import org.gcube.informationsystem.model.reference.BaseEntity;
+import org.gcube.informationsystem.base.impl.ERImpl;
+import org.gcube.informationsystem.base.reference.entities.BaseEntity;
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.utils.ISMapper;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;

src/main/java/org/gcube/informationsystem/base/impl/entities/EImpl.java

@@ -0,0 +1,5 @@
+package org.gcube.informationsystem.base.impl.entities;
+
+public class EImpl {
+	
+}

src/main/java/org/gcube/informationsystem/base/impl/relations/BaseRelationImpl.java

@@ -0,0 +1,24 @@
+package org.gcube.informationsystem.base.impl.relations;
+
+import org.gcube.informationsystem.base.reference.entities.BaseEntity;
+import org.gcube.informationsystem.base.reference.relations.BaseRelation;
+
+public abstract class BaseRelationImpl<Out extends BaseEntity, In extends BaseEntity> extends RImpl<Out,In> implements BaseRelation<Out, In> {
+
+	/**
+	 * Generated Serial Version UID 
+	 */
+	private static final long serialVersionUID = 5789078326714392972L;
+	
+	protected Out source;
+	protected In target;
+
+	protected BaseRelationImpl() {
+		super();		
+	}
+
+	protected BaseRelationImpl(Out source, In target) {
+		super(source, target);
+	}
+	
+}

src/main/java/org/gcube/informationsystem/base/impl/relations/RImpl.java

@@ -1,30 +1,30 @@
-package org.gcube.informationsystem.model.impl;
+package org.gcube.informationsystem.base.impl.relations;
 
 import java.io.StringWriter;
 
-import org.gcube.informationsystem.model.reference.BaseEntity;
+import org.gcube.informationsystem.base.impl.ERImpl;
-import org.gcube.informationsystem.model.reference.BaseRelation;
+import org.gcube.informationsystem.base.reference.entities.E;
-import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
+import org.gcube.informationsystem.base.reference.relations.R;
 import org.gcube.informationsystem.utils.ISMapper;
 
-public abstract class BaseRelationImpl<Out extends BaseEntity, In extends BaseEntity> extends ERImpl implements BaseRelation<Out, In> {
+public abstract class RImpl<Out extends E, In extends E> extends ERImpl implements R<Out, In> {
+	
+	/**
+	 * Generated Serial Version UID 
+	 */
+	private static final long serialVersionUID = 28704968813390512L;
 	
 	protected Out source;
 	protected In target;
 
-	protected PropagationConstraint propagationConstraint;
+	protected RImpl() {
-
-
-	protected BaseRelationImpl() {
 		super();		
 	}
 
-	protected BaseRelationImpl(Out source, In target,
+	protected RImpl(Out source, In target) {
-			PropagationConstraint propagationConstraint) {
 		this();
 		this.source = source;
 		this.target = target;
-		this.propagationConstraint = propagationConstraint;
 	}
 
 	@Override
@@ -47,11 +47,6 @@ public abstract class BaseRelationImpl<Out extends BaseEntity, In extends BaseEn
 		this.target = target;
 	}
 
-	@Override
-	public PropagationConstraint getPropagationConstraint() {
-		return this.propagationConstraint;
-	}
-
 	@Override
 	public String toString() {
 		StringWriter stringWriter = new StringWriter();
@@ -67,5 +62,4 @@ public abstract class BaseRelationImpl<Out extends BaseEntity, In extends BaseEn
 			}
 		}
 	}
-	
 }

src/main/java/org/gcube/informationsystem/base/reference/AccessType.java

@@ -1,10 +1,11 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference;
 
 import java.util.Arrays;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.context.impl.entities.ContextImpl;
 import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
@@ -24,7 +25,6 @@ import org.gcube.informationsystem.model.impl.relations.RelationImpl;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.model.reference.relations.Relation;

src/main/java/org/gcube/informationsystem/base/reference/ER.java

@@ -1,9 +1,9 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference;
 
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.properties.Header;
 
 /**
  * @author Luca Frosini (ISTI - CNR)

src/main/java/org/gcube/informationsystem/base/reference/ISConstants.java

@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference;
 
 public interface ISConstants {
 

src/main/java/org/gcube/informationsystem/base/reference/ISManageable.java

@@ -1,7 +1,9 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference;
+
+import java.io.Serializable;
 
 import org.gcube.informationsystem.types.annotations.Abstract;
 
@@ -12,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
  */
 @Abstract
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = ISManageable.CLASS_PROPERTY)
-public interface ISManageable {
+public interface ISManageable extends Serializable {
 
 	public static final String NAME = "ISManageable"; //ISManageable.class.getSimpleName();
 	

src/main/java/org/gcube/informationsystem/base/reference/entities/BaseEntity.java

@@ -1,6 +1,4 @@
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference.entities;
-
-import java.io.Serializable;
 
 import org.gcube.informationsystem.types.annotations.Abstract;
 
@@ -9,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 @Abstract
 @JsonIgnoreProperties(ignoreUnknown=true)
 //@JsonDeserialize(as=BaseEntityImpl.class) Do not uncomment to manage subclasses
-public interface BaseEntity extends ER, Serializable {
+public interface BaseEntity extends E {
 	
 	public static final String NAME = "BaseEntity"; //Entity.class.getSimpleName();
 	

src/main/java/org/gcube/informationsystem/base/reference/entities/E.java

@@ -0,0 +1,15 @@
+package org.gcube.informationsystem.base.reference.entities;
+
+import org.gcube.informationsystem.base.reference.ER;
+import org.gcube.informationsystem.types.annotations.Abstract;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@Abstract
+@JsonIgnoreProperties(ignoreUnknown=true)
+//@JsonDeserialize(as=EImpl.class) Do not uncomment to manage subclasses
+public interface E extends ER {
+	
+	public static final String NAME = "E"; // Entity.class.getSimpleName();
+	
+}

src/main/java/org/gcube/informationsystem/base/reference/properties/Header.java

@@ -1,13 +1,13 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.reference.properties;
+package org.gcube.informationsystem.base.reference.properties;
 
 import java.util.Date;
 import java.util.UUID;
 
+import org.gcube.informationsystem.base.reference.ISConstants;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.model.reference.ISConstants;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/gcube/informationsystem/base/reference/properties/Property.java

@@ -1,11 +1,9 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.reference.properties;
+package org.gcube.informationsystem.base.reference.properties;
 
-import java.io.Serializable;
+import org.gcube.informationsystem.base.reference.ISManageable;
-
-import org.gcube.informationsystem.model.reference.ISManageable;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
@@ -14,11 +12,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  * Root Class for Property types. It creates a base common type, which is useful
  * for management purpose.
  */
+
 // @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = ISManageable.CLASS_PROPERTY)
 @JsonIgnoreProperties(ignoreUnknown=true)
-public interface Property extends ISManageable, Serializable {
+public interface Property extends ISManageable {
 	
 	public static final String NAME = "Property"; //Property.class.getSimpleName();
 	public static final String DESCRIPTION = "This is the base class for Property";
 	public static final String VERSION = "1.0.0";
+	
 }

src/main/java/org/gcube/informationsystem/base/reference/relations/BaseRelation.java

@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.base.reference.relations;
+
+import org.gcube.informationsystem.base.reference.entities.BaseEntity;
+import org.gcube.informationsystem.types.annotations.Abstract;
+
+@Abstract
+//@JsonDeserialize(as=BaseRelationImpl.class) Do not uncomment to manage subclasses
+public interface BaseRelation<Out extends BaseEntity, In extends BaseEntity> extends R<Out,In> {
+	
+	public static final String NAME = "BaseRelation"; // BaseRelation.class.getSimpleName();
+	
+}

src/main/java/org/gcube/informationsystem/base/reference/relations/R.java

@@ -1,7 +1,8 @@
-package org.gcube.informationsystem.model.reference;
+package org.gcube.informationsystem.base.reference.relations;
 
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.ER;
-import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
+import org.gcube.informationsystem.base.reference.entities.E;
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.types.annotations.Abstract;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 
@@ -9,16 +10,14 @@ import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 @Abstract
-//@JsonDeserialize(as=BaseRelationImpl.class) Do not uncomment to manage subclasses
+//@JsonDeserialize(as=RImpl.class) Do not uncomment to manage subclasses
-public interface BaseRelation<Out extends BaseEntity, In extends BaseEntity> extends ER {
+public interface R<Out extends E, In extends E> extends ER {
 	
-	public static final String NAME = "BaseRelation"; // BaseRelation.class.getSimpleName();
+	public static final String NAME = "R"; // R.class.getSimpleName();
 	
 	public static final String SOURCE_PROPERTY = "source";
 	public static final String TARGET_PROPERTY = "target";
 	
-	public static final String PROPAGATION_CONSTRAINT = "propagationConstraint";
-	
 	/* Overriding getHeader method to create Header property in type */
 	@ISProperty(name = HEADER_PROPERTY, mandatory = true, nullable = false)
 	@Override
@@ -36,7 +35,4 @@ public interface BaseRelation<Out extends BaseEntity, In extends BaseEntity> ext
 	@JsonIgnore
 	public void setTarget(In target);
 	
-	@ISProperty(name=PROPAGATION_CONSTRAINT)
-	public PropagationConstraint getPropagationConstraint();
-	
 }

src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java

@@ -7,10 +7,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.gcube.informationsystem.base.impl.entities.BaseEntityImpl;
 import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.context.reference.relations.IsParentOf;
-import org.gcube.informationsystem.model.impl.BaseEntityImpl;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
@@ -83,7 +83,7 @@ public class ContextImpl extends BaseEntityImpl implements Context {
 	public void setParent(Context context) {
 		IsParentOf<Context, Context> isParentOf = null;
 		if(context!=null) {
-			isParentOf = new IsParentOfImpl<Context, Context>(context, this, null);
+			isParentOf = new IsParentOfImpl<Context, Context>(context, this);
 		}
 		setParent(isParentOf);
 	}
@@ -129,7 +129,7 @@ public class ContextImpl extends BaseEntityImpl implements Context {
 	
 	@Override
 	public void addChild(Context child) {
-		IsParentOf<Context, Context> isParentOf = new IsParentOfImpl<Context, Context>(this, child, null);
+		IsParentOf<Context, Context> isParentOf = new IsParentOfImpl<Context, Context>(this, child);
 		this.addChild(isParentOf);
 	}
 	

src/main/java/org/gcube/informationsystem/context/impl/relations/IsParentOfImpl.java

@@ -3,10 +3,9 @@
  */
 package org.gcube.informationsystem.context.impl.relations;
 
+import org.gcube.informationsystem.base.impl.relations.BaseRelationImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.context.reference.relations.IsParentOf;
-import org.gcube.informationsystem.model.impl.BaseRelationImpl;
-import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -17,13 +16,17 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsParentOfImpl<Out extends Context, In extends Context> extends
 		BaseRelationImpl<Out, In> implements IsParentOf<Out, In> {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 246200525751824393L;
+
 	protected IsParentOfImpl(){
 		super();
 	}
 	
-	public IsParentOfImpl(Out source, In target,
+	public IsParentOfImpl(Out source, In target) {
-			PropagationConstraint propagationConstraint) {
+		super(source, target);
-		super(source, target, propagationConstraint);
 	}
 
 }

src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java

@@ -6,9 +6,9 @@ package org.gcube.informationsystem.context.reference.entities;
 import java.util.List;
 import java.util.UUID;
 
+import org.gcube.informationsystem.base.reference.entities.BaseEntity;
 import org.gcube.informationsystem.context.impl.entities.ContextImpl;
 import org.gcube.informationsystem.context.reference.relations.IsParentOf;
-import org.gcube.informationsystem.model.reference.BaseEntity;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 

src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java

@@ -3,11 +3,10 @@
  */
 package org.gcube.informationsystem.context.reference.relations;
 
+import org.gcube.informationsystem.base.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.relations.BaseRelation;
 import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
-import org.gcube.informationsystem.model.reference.BaseRelation;
-import org.gcube.informationsystem.model.reference.properties.Header;
-import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
@@ -43,7 +42,4 @@ public interface IsParentOf<Out extends Context, In extends Context> extends Bas
 	@JsonIgnore
 	public void setTarget(In target);
 	
-	@ISProperty(name = PROPAGATION_CONSTRAINT)
-	public PropagationConstraint getPropagationConstraint();
-	
 }

src/main/java/org/gcube/informationsystem/model/impl/ISManageableImpl.java

@@ -1,17 +0,0 @@
-/**
- * 
- */
-package org.gcube.informationsystem.model.impl;
-
-import org.gcube.informationsystem.model.reference.ISManageable;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- *
- */
-public class ISManageableImpl implements ISManageable {
-
-	public ISManageableImpl(){
-		
-	}
-}

src/main/java/org/gcube/informationsystem/model/impl/entities/EntityImpl.java

@@ -5,7 +5,7 @@ package org.gcube.informationsystem.model.impl.entities;
 
 import java.io.StringWriter;
 
-import org.gcube.informationsystem.model.impl.BaseEntityImpl;
+import org.gcube.informationsystem.base.impl.entities.BaseEntityImpl;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.utils.ISMapper;
 

src/main/java/org/gcube/informationsystem/model/impl/entities/FacetImpl.java

@@ -8,9 +8,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Facet;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.utils.ISMapper;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;

src/main/java/org/gcube/informationsystem/model/impl/properties/DummyProperty.java

@@ -3,7 +3,7 @@
  */
 package org.gcube.informationsystem.model.impl.properties;
 
-import org.gcube.informationsystem.model.reference.properties.Property;
+import org.gcube.informationsystem.base.reference.properties.Property;
 
 /**
  * @author Luca Frosini (ISTI - CNR)

src/main/java/org/gcube/informationsystem/model/impl/properties/HeaderImpl.java

@@ -6,7 +6,7 @@ package org.gcube.informationsystem.model.impl.properties;
 import java.util.Date;
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.properties.Header;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 

src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyImpl.java

@@ -3,14 +3,13 @@
  */
 package org.gcube.informationsystem.model.impl.properties;
 
-import org.gcube.informationsystem.model.impl.ISManageableImpl;
+import org.gcube.informationsystem.base.impl.ISManageableImpl;
-import org.gcube.informationsystem.model.reference.properties.Property;
+import org.gcube.informationsystem.base.reference.properties.Property;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- *
  */
 @JsonTypeName(value=Property.NAME)
 public class PropertyImpl extends ISManageableImpl implements Property {
@@ -23,4 +22,5 @@ public class PropertyImpl extends ISManageableImpl implements Property {
 	public PropertyImpl() {
 		super();
 	}
+	
 }

src/main/java/org/gcube/informationsystem/model/impl/relations/ConsistsOfImpl.java

@@ -17,6 +17,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class ConsistsOfImpl<Out extends Resource, In extends Facet> extends
 		RelationImpl<Out, In> implements ConsistsOf<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -4903629726765659155L;
+
 	protected ConsistsOfImpl(){
 		super();
 	}

src/main/java/org/gcube/informationsystem/model/impl/relations/DummyConsistsOf.java

@@ -17,6 +17,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class DummyConsistsOf<Out extends Resource, In extends Facet> extends
 		ConsistsOfImpl<Out, In> implements ConsistsOf<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -8195862723295398163L;
+
 	public DummyConsistsOf(){
 		super();
 	}

src/main/java/org/gcube/informationsystem/model/impl/relations/DummyIsRelatedTo.java

@@ -16,6 +16,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class DummyIsRelatedTo<Out extends Resource, In extends Resource>
 		extends IsRelatedToImpl<Out, In> implements IsRelatedTo<Out, In>{
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 3522865762953929379L;
+
 	public DummyIsRelatedTo(){
 		super();
 	}

src/main/java/org/gcube/informationsystem/model/impl/relations/IsIdentifiedByImpl.java

@@ -17,6 +17,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsIdentifiedByImpl<Out extends Resource, In extends Facet> extends
 	ConsistsOfImpl<Out, In> implements IsIdentifiedBy<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 8043666054054911145L;
+
 	protected IsIdentifiedByImpl(){
 		super();
 	}

src/main/java/org/gcube/informationsystem/model/impl/relations/IsRelatedToImpl.java

@@ -16,6 +16,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsRelatedToImpl<Out extends Resource, In extends Resource> extends
 		RelationImpl<Out, In> implements IsRelatedTo<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 5119376559964300102L;
+
 	protected IsRelatedToImpl(){
 		super();
 	}

src/main/java/org/gcube/informationsystem/model/impl/relations/RelationImpl.java

@@ -8,11 +8,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.gcube.informationsystem.model.impl.BaseRelationImpl;
+import org.gcube.informationsystem.base.impl.relations.BaseRelationImpl;
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.utils.ISMapper;
 
@@ -26,8 +26,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public abstract class RelationImpl<Out extends Entity, In extends Entity>
 		extends BaseRelationImpl<Out,In> implements Relation<Out, In> {
 
-	protected Out source;
+	/**
-	protected In target;
+	 * 
+	 */
+	private static final long serialVersionUID = -6249979476879235053L;
 	
 	protected PropagationConstraint propagationConstraint;
 
@@ -54,6 +56,11 @@ public abstract class RelationImpl<Out extends Entity, In extends Entity>
 		this.propagationConstraint = propagationConstraint;
 	}
 
+	@Override
+	public PropagationConstraint getPropagationConstraint() {
+		return this.propagationConstraint;
+	}
+	
 	@Override
 	public Map<String, Object> getAdditionalProperties() {
 		return additionalProperties;

src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java

@@ -3,8 +3,8 @@
  */
 package org.gcube.informationsystem.model.reference.entities;
 
-import org.gcube.informationsystem.model.reference.BaseEntity;
+import org.gcube.informationsystem.base.reference.entities.BaseEntity;
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.types.annotations.Abstract;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 

src/main/java/org/gcube/informationsystem/model/reference/properties/Encrypted.java

@@ -1,5 +1,6 @@
 package org.gcube.informationsystem.model.reference.properties;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.impl.properties.EncryptedImpl;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 

src/main/java/org/gcube/informationsystem/model/reference/properties/PropagationConstraint.java

@@ -3,6 +3,7 @@
  */
 package org.gcube.informationsystem.model.reference.properties;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 

src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java

@@ -5,7 +5,7 @@ package org.gcube.informationsystem.model.reference.relations;
 
 import java.util.Map;
 
-import org.gcube.informationsystem.model.reference.BaseRelation;
+import org.gcube.informationsystem.base.reference.relations.BaseRelation;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
@@ -30,6 +30,8 @@ public interface Relation<Out extends Entity, In extends Entity> extends BaseRel
 	
 	public static final String NAME = "Relation"; //Relation.class.getSimpleName();
 	
+	public static final String PROPAGATION_CONSTRAINT = "propagationConstraint";
+	
 	@JsonIgnoreProperties({Resource.CONSISTS_OF_PROPERTY, Resource.IS_RELATED_TO_PROPERTY})
 	@JsonGetter(value = SOURCE_PROPERTY)
 	public Out getSource();

src/main/java/org/gcube/informationsystem/types/Type.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.reference.properties.Property;
+import org.gcube.informationsystem.base.reference.properties.Property;
 
 
 /**

src/main/java/org/gcube/informationsystem/types/TypeBinder.java

@@ -12,11 +12,11 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.model.reference.relations.Relation;

src/main/java/org/gcube/informationsystem/utils/AdditionalPropertiesSerializer.java

@@ -3,7 +3,7 @@ package org.gcube.informationsystem.utils;
 import java.io.IOException;
 import java.util.Map;
 
-import org.gcube.informationsystem.model.reference.properties.Property;
+import org.gcube.informationsystem.base.reference.properties.Property;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

src/main/java/org/gcube/informationsystem/utils/ERDeserializer.java

@@ -7,8 +7,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.informationsystem.model.reference.AccessType;
+import org.gcube.informationsystem.base.reference.AccessType;
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;

src/main/java/org/gcube/informationsystem/utils/ISMapper.java

@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 
-import org.gcube.informationsystem.model.reference.AccessType;
+import org.gcube.informationsystem.base.reference.AccessType;
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
 import org.gcube.informationsystem.utils.discovery.ISMDiscovery;
 import org.gcube.informationsystem.utils.discovery.RegistrationProvider;
 import org.gcube.informationsystem.utils.discovery.SchemaAction;

src/main/java/org/gcube/informationsystem/utils/ObjectMappingERAction.java

@@ -3,8 +3,8 @@
  */
 package org.gcube.informationsystem.utils;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.utils.discovery.SchemaAction;
 

src/main/java/org/gcube/informationsystem/utils/Utility.java

@@ -6,8 +6,8 @@ package org.gcube.informationsystem.utils;
 import java.io.IOException;
 import java.util.UUID;
 
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Header;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/gcube/informationsystem/utils/discovery/ISMDiscovery.java

@@ -9,9 +9,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 import org.slf4j.Logger;

src/main/java/org/gcube/informationsystem/utils/discovery/ReflectionUtility.java

@@ -139,7 +139,6 @@ public class ReflectionUtility {
 	 * @throws ClassNotFoundException
 	 *             if something went wrong
 	 */
-	@SuppressWarnings("restriction")
 	public static List<Class<?>> getClassesForPackage(String pckgname)
 	        throws ClassNotFoundException {
 	    final List<Class<?>> classes = new ArrayList<Class<?>>();

src/main/java/org/gcube/informationsystem/utils/discovery/SchemaAction.java

@@ -3,8 +3,8 @@
  */
 package org.gcube.informationsystem.utils.discovery;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 
 /**

src/test/java/org/gcube/informationsystem/model/impl/properties/EncryptedTest.java

@@ -5,10 +5,10 @@ import java.security.SecureRandom;
 
 import javax.crypto.KeyGenerator;
 
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.ContextTest;
 import org.gcube.informationsystem.model.impl.properties.EncryptedImpl;
 import org.gcube.informationsystem.model.reference.properties.Encrypted;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.types.TypeBinder;
 import org.gcube.informationsystem.utils.ISMapper;
 import org.junit.Assert;

src/test/java/org/gcube/informationsystem/model/impl/properties/HeaderTest.java

@@ -4,8 +4,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.UUID;
 
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.utils.ISMapper;
 import org.junit.Assert;
 import org.junit.Test;

src/test/java/org/gcube/informationsystem/types/EntitySchemaDefinition.java

@@ -3,10 +3,10 @@
  */
 package org.gcube.informationsystem.types;
 
-import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.properties.Header;
+import org.gcube.informationsystem.base.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.model.reference.properties.Header;
-import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.junit.Test;
 import org.slf4j.Logger;