From af24bde831dd8024933d26963813ee26d232149c Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 20 Jan 2021 17:26:13 +0100 Subject: [PATCH] Fixed authorship --- .../gcube/informationsystem/base/reference/AccessType.java | 4 ++-- .../base/reference/IdentifiableElement.java | 4 ++-- .../base/reference/SchemaMixedElement.java | 4 ++-- .../base/reference/properties/PropertyElement.java | 4 ++-- .../context/reference/entities/Context.java | 4 ++-- .../context/reference/relations/IsParentOf.java | 4 ++-- .../informationsystem/model/reference/entities/Entity.java | 4 ++-- .../informationsystem/model/reference/entities/Facet.java | 2 +- .../model/reference/entities/Resource.java | 4 ++-- .../model/reference/properties/Header.java | 4 ++-- .../model/reference/properties/PropagationConstraint.java | 4 ++-- .../model/reference/properties/Property.java | 4 ++-- .../model/reference/relations/ConsistsOf.java | 4 ++-- .../model/reference/relations/Relation.java | 2 +- .../gcube/informationsystem/types/annotations/Abstract.java | 4 ++-- .../informationsystem/types/annotations/ISProperty.java | 4 ++-- .../types/annotations/ResourceSchemaEntry.java | 4 ++-- .../types/annotations/ResourceSchemaRelatedEntry.java | 4 ++-- .../types/reference/properties/LinkedEntity.java | 6 +++--- .../java/org/gcube/informationsystem/utils/TypeVersion.java | 4 ++-- .../utils/discovery/RegistrationProvider.java | 4 ++-- .../org/gcube/informationsystem/utils/TypeVersionTest.java | 3 +++ 22 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java b/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java index ec88e37..4becb14 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/AccessType.java @@ -44,9 +44,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) - * * Enumerates the basic type names. + * + * @author Luca Frosini (ISTI - CNR) */ public enum AccessType { diff --git a/src/main/java/org/gcube/informationsystem/base/reference/IdentifiableElement.java b/src/main/java/org/gcube/informationsystem/base/reference/IdentifiableElement.java index bf1e917..6106c2e 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/IdentifiableElement.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/IdentifiableElement.java @@ -3,9 +3,9 @@ package org.gcube.informationsystem.base.reference; import org.gcube.informationsystem.model.reference.properties.Header; /** - * @author Luca Frosini (ISTI - CNR) - * * This interfaces is an helper to identify elements could be identified via {@link Header} + * + * @author Luca Frosini (ISTI - CNR) */ public interface IdentifiableElement extends Element { diff --git a/src/main/java/org/gcube/informationsystem/base/reference/SchemaMixedElement.java b/src/main/java/org/gcube/informationsystem/base/reference/SchemaMixedElement.java index cbd7d91..1760612 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/SchemaMixedElement.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/SchemaMixedElement.java @@ -3,10 +3,10 @@ package org.gcube.informationsystem.base.reference; import java.util.Map; /** - * @author Luca Frosini (ISTI - CNR) - * * This interfaces is an helper to identify elements supporting Schema Mixed. * i.e. elements which instances could have additional properties in respect to the ones defined in the schema + * + * @author Luca Frosini (ISTI - CNR) */ public interface SchemaMixedElement extends Element { diff --git a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyElement.java b/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyElement.java index 3c31c77..21ae064 100644 --- a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyElement.java +++ b/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyElement.java @@ -8,10 +8,10 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * Root Class for Property types. * It creates a base common type, which is useful for management purpose. + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as=PropertyElementImpl.class) @TypeMetadata(name = PropertyElement.NAME, description = "This is the base class for any PropertyElement", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java b/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java index e0dff47..083874c 100644 --- a/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java +++ b/src/main/java/org/gcube/informationsystem/context/reference/entities/Context.java @@ -20,9 +20,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) This Entity is for internal use only - * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Context + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as = ContextImpl.class) @TypeMetadata(name = Context.NAME, description = "This class is the used to define a Context", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java b/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java index 5010147..96873f0 100644 --- a/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java +++ b/src/main/java/org/gcube/informationsystem/context/reference/relations/IsParentOf.java @@ -15,9 +15,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) + * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#IsParentOf * - * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#isParentOf + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as = IsParentOfImpl.class) @TypeMetadata(name = IsParentOf.NAME, description = "This class is the used to define parental relations between Context", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java b/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java index 7b6498c..60b5063 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java @@ -10,9 +10,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) + * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Entity * - * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Basic_Concepts + * @author Luca Frosini (ISTI - CNR) */ @Abstract //@JsonDeserialize(as=EntityImpl.class) Do not uncomment to manage subclasses diff --git a/src/main/java/org/gcube/informationsystem/model/reference/entities/Facet.java b/src/main/java/org/gcube/informationsystem/model/reference/entities/Facet.java index ff97323..c7faf25 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/entities/Facet.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/entities/Facet.java @@ -15,7 +15,7 @@ import org.gcube.informationsystem.utils.TypeVersion; /** * @author Luca Frosini (ISTI - CNR) * - * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Facets + * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Facet */ @Abstract // @JsonDeserialize(as=FacetImpl.class) Do not uncomment to manage subclasses 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 20dc2fc..9f54103 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 @@ -19,9 +19,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Resources + * + * @author Luca Frosini (ISTI - CNR) */ @Abstract @JsonIgnoreProperties(ignoreUnknown=true) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java index 6d49883..5432748 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/Header.java @@ -16,9 +16,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Header + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as=HeaderImpl.class) @TypeMetadata(name = Header.NAME, description = "This class provides metadata per every IdentifiableElement", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/properties/PropagationConstraint.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropagationConstraint.java index eb4900a..c066c7e 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/properties/PropagationConstraint.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropagationConstraint.java @@ -11,8 +11,6 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * At any time entities and relations can be added or removed to/from a context or deleted. * The PropagationConstraint property contained in each relation is a predefined Property type * which indicates the behaviour to be held on a target entity when an event related to a context occurs @@ -23,6 +21,8 @@ import org.gcube.informationsystem.utils.TypeVersion; * - ConsistsOf : remove=cascadeWhenOrphan, add=propagate. * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Propagation_Constraint + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as=PropagationConstraintImpl.class) @TypeMetadata(name = PropagationConstraint.NAME, description = "This class provides propation constraint for Relation", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/properties/Property.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/Property.java index 49f6e9b..44d2a00 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/properties/Property.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/Property.java @@ -18,10 +18,10 @@ import org.gcube.informationsystem.utils.AdditionalPropertiesSerializer; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * Root Class for Property types. * It creates a base common type, which is useful for management purpose. + * + * @author Luca Frosini (ISTI - CNR) */ // @JsonIgnoreProperties(ignoreUnknown=true) @JsonDeserialize(as=PropertyImpl.class) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/relations/ConsistsOf.java b/src/main/java/org/gcube/informationsystem/model/reference/relations/ConsistsOf.java index 5ea8977..1a2b3a0 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/relations/ConsistsOf.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/relations/ConsistsOf.java @@ -12,9 +12,9 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#ConsistsOf + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as=ConsistsOfImpl.class) @TypeMetadata(name = ConsistsOf.NAME, description = "This is the base class for ConsistsOf relations", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java b/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java index 3f76454..bbb50bf 100644 --- a/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java +++ b/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java @@ -26,7 +26,7 @@ import org.gcube.informationsystem.utils.TypeVersion; /** * @author Luca Frosini (ISTI - CNR) * - * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Relations + * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Relation */ @Abstract // @JsonDeserialize(as=RelationImpl.class) Do not uncomment to manage subclasses diff --git a/src/main/java/org/gcube/informationsystem/types/annotations/Abstract.java b/src/main/java/org/gcube/informationsystem/types/annotations/Abstract.java index 4ae392b..6a726f3 100644 --- a/src/main/java/org/gcube/informationsystem/types/annotations/Abstract.java +++ b/src/main/java/org/gcube/informationsystem/types/annotations/Abstract.java @@ -9,13 +9,13 @@ import org.gcube.informationsystem.model.reference.entities.Entity; import org.gcube.informationsystem.model.reference.relations.Relation; /** - * @author Luca Frosini (ISTI - CNR) - * * It indicates that the {@link Entity} or the {@link Relation} is abstract and * cannot be instantiated. * This is needed because the type definition is made with interface so that * even used the java abstract keyword is useless because it cannot be retrieved * using reflection (interfaces are always abstract) + * + * @author Luca Frosini (ISTI - CNR) */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/gcube/informationsystem/types/annotations/ISProperty.java b/src/main/java/org/gcube/informationsystem/types/annotations/ISProperty.java index 9f65a87..9174422 100644 --- a/src/main/java/org/gcube/informationsystem/types/annotations/ISProperty.java +++ b/src/main/java/org/gcube/informationsystem/types/annotations/ISProperty.java @@ -11,12 +11,12 @@ import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; /** - * @author Luca Frosini (ISTI - CNR) - * * It is used by {@link TypeMapper} to identify which getter method are * related to and {@link Entity} {@link PropertyDefinition}. * The name of the property is obtained by removing "get" or "is" from method * name and lower casing the first letter. + * + * @author Luca Frosini (ISTI - CNR) */ @Documented @Target(ElementType.METHOD) diff --git a/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaEntry.java b/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaEntry.java index 4e6ec19..ef18467 100644 --- a/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaEntry.java +++ b/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaEntry.java @@ -13,12 +13,12 @@ import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; /** - * @author Luca Frosini (ISTI - CNR) - * * It is used by {@link TypeMapper} to identify which getter method are * related to and {@link Entity} {@link PropertyDefinition}. * The name of the property is obtained by removing "get" or "is" from method * name and lower casing the first letter. + * + * @author Luca Frosini (ISTI - CNR) */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaRelatedEntry.java b/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaRelatedEntry.java index b164dac..a987fbe 100644 --- a/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaRelatedEntry.java +++ b/src/main/java/org/gcube/informationsystem/types/annotations/ResourceSchemaRelatedEntry.java @@ -13,12 +13,12 @@ import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; /** - * @author Luca Frosini (ISTI - CNR) - * * It is used by {@link TypeMapper} to identify which getter method are * related to and {@link Entity} {@link PropertyDefinition}. * The name of the property is obtained by removing "get" or "is" from method * name and lower casing the first letter. + * + * @author Luca Frosini (ISTI - CNR) */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/gcube/informationsystem/types/reference/properties/LinkedEntity.java b/src/main/java/org/gcube/informationsystem/types/reference/properties/LinkedEntity.java index 201ab8f..c058700 100644 --- a/src/main/java/org/gcube/informationsystem/types/reference/properties/LinkedEntity.java +++ b/src/main/java/org/gcube/informationsystem/types/reference/properties/LinkedEntity.java @@ -9,11 +9,11 @@ import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; /** - * @author Luca Frosini (ISTI - CNR) - * * A convenient type to define a Resource in terms of: * - mandatory/recommended ConsistsOf->Facets; - * - suggested IsRelatedTo->Resource. + * - suggested IsRelatedTo->Resource. + * + * @author Luca Frosini (ISTI - CNR) */ @JsonDeserialize(as=LinkedEntityImpl.class) @TypeMetadata(name = LinkedEntity.NAME, description = " A convenient type to define a Resource in terms of: mandatory/recommended ConsistsOf->Facets; uggested IsRelatedTo->Resource.", version = TypeVersion.MINIMAL_VERSION_STRING) diff --git a/src/main/java/org/gcube/informationsystem/utils/TypeVersion.java b/src/main/java/org/gcube/informationsystem/utils/TypeVersion.java index ff909f6..7595c09 100644 --- a/src/main/java/org/gcube/informationsystem/utils/TypeVersion.java +++ b/src/main/java/org/gcube/informationsystem/utils/TypeVersion.java @@ -5,13 +5,13 @@ import java.util.regex.Pattern; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; /** - * @author Luca Frosini (ISTI - CNR) - * * A class representing and validating a version in the following format X.X.X (Major.Minor.Revision) * Each part is an integer with no trailing zeros (e.g 1 and not 01). * The version is validated by the regex defined in the static field {@link TypeVersion#TYPE_VERSION_REGEX} * * Accepted initial version is {@link TypeVersion#MINIMAL_VERSION_STRING} + * + * @author Luca Frosini (ISTI - CNR) */ public class TypeVersion implements Comparable { diff --git a/src/main/java/org/gcube/informationsystem/utils/discovery/RegistrationProvider.java b/src/main/java/org/gcube/informationsystem/utils/discovery/RegistrationProvider.java index d9f538c..909af7e 100644 --- a/src/main/java/org/gcube/informationsystem/utils/discovery/RegistrationProvider.java +++ b/src/main/java/org/gcube/informationsystem/utils/discovery/RegistrationProvider.java @@ -3,11 +3,11 @@ package org.gcube.informationsystem.utils.discovery; import java.util.List; /** - * @author Luca Frosini (ISTI - CNR) - * * Any model which requires to register the defined types from marshalling and unmarshalling * must implement this interface returning the list of packages containing the interfaces * representing the model. + * + * @author Luca Frosini (ISTI - CNR) */ public interface RegistrationProvider { diff --git a/src/test/java/org/gcube/informationsystem/utils/TypeVersionTest.java b/src/test/java/org/gcube/informationsystem/utils/TypeVersionTest.java index ecc5a76..04d6d6e 100644 --- a/src/test/java/org/gcube/informationsystem/utils/TypeVersionTest.java +++ b/src/test/java/org/gcube/informationsystem/utils/TypeVersionTest.java @@ -3,6 +3,9 @@ package org.gcube.informationsystem.utils; import org.junit.Assert; import org.junit.Test; +/** + * @author Luca Frosini (ISTI - CNR) + */ public class TypeVersionTest { String[] validVersions = new String[] {"1.0.0", "13.23.45", "1.12.3"};