diff --git a/src/main/java/org/gcube/informationsystem/model/annotations/ISPropertyRef.java b/src/main/java/org/gcube/informationsystem/model/annotations/Method.java similarity index 50% rename from src/main/java/org/gcube/informationsystem/model/annotations/ISPropertyRef.java rename to src/main/java/org/gcube/informationsystem/model/annotations/Method.java index 32bc779..2e311f6 100644 --- a/src/main/java/org/gcube/informationsystem/model/annotations/ISPropertyRef.java +++ b/src/main/java/org/gcube/informationsystem/model/annotations/Method.java @@ -5,16 +5,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) -public @interface ISPropertyRef { - - String name() default ""; - String description() default ""; - boolean mandatory() default false; - boolean readonly() default false; - boolean nullable() default true; - int min() default -1; - int max() default -1; - String regexpr() default ""; +public @interface Method { + } diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java b/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java index 8e58290..11513bc 100644 --- a/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java +++ b/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java @@ -1,6 +1,6 @@ package org.gcube.informationsystem.model.embedded; -import org.gcube.informationsystem.model.annotations.ISPropertyRef; + /** @@ -8,12 +8,10 @@ import org.gcube.informationsystem.model.annotations.ISPropertyRef; */ public interface AccessPolicy extends Embedded { - @ISPropertyRef public ValueSchema getPolicy(); public void setPolicy(ValueSchema policy); - @ISPropertyRef public String getNote(); public void setNote(String note); diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/Header.java b/src/main/java/org/gcube/informationsystem/model/embedded/Header.java index 9343236..10ef6c8 100644 --- a/src/main/java/org/gcube/informationsystem/model/embedded/Header.java +++ b/src/main/java/org/gcube/informationsystem/model/embedded/Header.java @@ -3,7 +3,6 @@ */ package org.gcube.informationsystem.model.embedded; -import org.gcube.informationsystem.model.annotations.ISProperty; /** @@ -12,16 +11,12 @@ import org.gcube.informationsystem.model.annotations.ISProperty; */ public interface Header extends Embedded { - @ISProperty public String getID(); - @ISProperty public String getCreator(); - @ISProperty public Long getCreationTime(); - @ISProperty public Long getLastUpdateTime(); diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java b/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java index 2e58498..9b5d19a 100644 --- a/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java +++ b/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java @@ -1,16 +1,7 @@ -/** - * - */ package org.gcube.informationsystem.model.embedded; -import org.gcube.informationsystem.model.annotations.ISProperty; -import org.gcube.informationsystem.model.annotations.ISPropertyRef; - - - /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ - * */ public interface RelationProperty extends Embedded { @@ -42,12 +33,10 @@ public interface RelationProperty extends Embedded { } - @ISProperty public ReferentiaIntegrity getReferentialIntegrity(); public void setReferentialIntegrity(ReferentiaIntegrity referentialIntegrity); - @ISPropertyRef public AccessPolicy getPolicy(); public void setPolicy(AccessPolicy accessPolicy); diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java b/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java index ab279aa..76360ca 100644 --- a/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java +++ b/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java @@ -5,8 +5,6 @@ package org.gcube.informationsystem.model.embedded; import java.net.URI; -import org.gcube.informationsystem.model.annotations.ISPropertyRef; - /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * Base Interface for all type described by a value and a schema retrieved @@ -14,12 +12,10 @@ import org.gcube.informationsystem.model.annotations.ISPropertyRef; */ public interface ValueSchema extends Embedded { - @ISPropertyRef public String getValue(); public void setValue(String value); - - @ISPropertyRef + public URI getSchema(); public void setSchema(URI schema); diff --git a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java index ab0d031..1b7322c 100644 --- a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java +++ b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java @@ -4,7 +4,6 @@ package org.gcube.informationsystem.model.entity; import org.gcube.informationsystem.model.annotations.Abstract; -import org.gcube.informationsystem.model.annotations.ISPropertyRef; import org.gcube.informationsystem.model.embedded.Header; @@ -14,7 +13,6 @@ import org.gcube.informationsystem.model.embedded.Header; @Abstract public interface Entity { - @ISPropertyRef public Header getHeader(); } diff --git a/src/main/java/org/gcube/informationsystem/model/relation/Relation.java b/src/main/java/org/gcube/informationsystem/model/relation/Relation.java index c39a49a..e336e04 100644 --- a/src/main/java/org/gcube/informationsystem/model/relation/Relation.java +++ b/src/main/java/org/gcube/informationsystem/model/relation/Relation.java @@ -3,12 +3,9 @@ */ package org.gcube.informationsystem.model.relation; -import org.gcube.informationsystem.model.annotations.ISPropertyRef; import org.gcube.informationsystem.model.embedded.RelationProperty; import org.gcube.informationsystem.model.entity.Entity; - - /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ */ @@ -18,7 +15,6 @@ public interface Relation { public In getTarget(); - @ISPropertyRef public RelationProperty getRelationProperty(); }