diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java index 4e9466a..3ed5906 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java @@ -7,7 +7,7 @@ import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -44,8 +44,8 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwne @ResourceSchemaEntry(facet=ContactReferenceFacet.class) }, resources= { - @ResourceSchemaRelatedEntry(source=Dataset.class, relation=Involves.class, target=Actor.class), - @ResourceSchemaRelatedEntry(source=Site.class, relation=IsOwnedBy.class, target=Actor.class) + @RelatedResourcesEntry(source=Dataset.class, relation=Involves.class, target=Actor.class), + @RelatedResourcesEntry(source=Site.class, relation=IsOwnedBy.class, target=Actor.class) } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java index ccc3511..e0c2f57 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConcreteDataset.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -31,7 +31,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPart @ResourceSchemaEntry(facet=AccessPointFacet.class, min=1, description="The access point to use for having access to the concrete dataset. The embargoState can be modeled through the access policy defined in the consistsOf relation.") }, resources = { - @ResourceSchemaRelatedEntry(source=ConcreteDataset.class, relation=IsPartOf.class, target=Dataset.class, description="The reference to the 'incarnations'/'manifestations' contributing to a dataset."), + @RelatedResourcesEntry(source=ConcreteDataset.class, relation=IsPartOf.class, target=Dataset.class, description="The reference to the 'incarnations'/'manifestations' contributing to a dataset."), } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java index 34a9949..69e6c72 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Configuration.java @@ -5,7 +5,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -26,7 +26,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDeri @JsonDeserialize(as=ConfigurationImpl.class) @ResourceSchema( resources = { - @ResourceSchemaRelatedEntry(source=Configuration.class, relation=IsDerivationOf.class, target=ConfigurationTemplate.class) + @RelatedResourcesEntry(source=Configuration.class, relation=IsDerivationOf.class, target=ConfigurationTemplate.class) } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java index 8168bcd..e2648a3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/ConfigurationTemplate.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -34,9 +34,9 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDeri @ResourceSchemaEntry(facet=SimplePropertyFacet.class, min=1) }, resources = { - @ResourceSchemaRelatedEntry(source=Configuration.class, relation=IsDerivationOf.class, target=ConfigurationTemplate.class), - @ResourceSchemaRelatedEntry(source=Service.class, relation=IsCustomizedBy.class, target=ConfigurationTemplate.class), - @ResourceSchemaRelatedEntry(source=Software.class, relation=IsConfiguredBy.class, target=ConfigurationTemplate.class), + @RelatedResourcesEntry(source=Configuration.class, relation=IsDerivationOf.class, target=ConfigurationTemplate.class), + @RelatedResourcesEntry(source=Service.class, relation=IsCustomizedBy.class, target=ConfigurationTemplate.class), + @RelatedResourcesEntry(source=Software.class, relation=IsConfiguredBy.class, target=ConfigurationTemplate.class), } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java index ca4981c..b9cd277 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Dataset.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -69,11 +69,11 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manage @ResourceSchemaEntry(facet = SubjectFacet.class, description = "Any subject/tag associated with the dataset for descriptive and discovery purposes.") }, resources = { - @ResourceSchemaRelatedEntry(source=Dataset.class, relation=Involves.class, target=Actor.class), - @ResourceSchemaRelatedEntry(source=Dataset.class, relation=IsCorrelatedTo.class, target=Dataset.class), - @ResourceSchemaRelatedEntry(source=Dataset.class, relation=IsCompliantWith.class, target=Schema.class, description="Any schema characterising the content of the dataset, e.g. the schema describing the 'columns' of a CSV-based dataset."), - @ResourceSchemaRelatedEntry(source=ConcreteDataset.class, relation=IsPartOf.class, target=Dataset.class, description="The reference to the 'incarnations'/'manifestations' contributing to a dataset."), - @ResourceSchemaRelatedEntry(source=Service.class, relation=Manages.class, target=Dataset.class, description="The link between the service that 'manages' the dataset and the dataset, e.g. the service that hosts the dataset and give access to it."), + @RelatedResourcesEntry(source=Dataset.class, relation=Involves.class, target=Actor.class), + @RelatedResourcesEntry(source=Dataset.class, relation=IsCorrelatedTo.class, target=Dataset.class), + @RelatedResourcesEntry(source=Dataset.class, relation=IsCompliantWith.class, target=Schema.class, description="Any schema characterising the content of the dataset, e.g. the schema describing the 'columns' of a CSV-based dataset."), + @RelatedResourcesEntry(source=ConcreteDataset.class, relation=IsPartOf.class, target=Dataset.class, description="The reference to the 'incarnations'/'manifestations' contributing to a dataset."), + @RelatedResourcesEntry(source=Service.class, relation=Manages.class, target=Dataset.class, description="The link between the service that 'manages' the dataset and the dataset, e.g. the service that hosts the dataset and give access to it."), } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java index 73625a8..541ead3 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -41,8 +41,8 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Uses; @ResourceSchemaEntry(facet = LicenseFacet.class, description = "The specific terms of use governing the exploitation of the EService.") }, resources= { - @ResourceSchemaRelatedEntry(source=EService.class, relation=Discovers.class, target=EService.class, description="A reference to any other EService, the EService instance is discovering through query on IS."), - @ResourceSchemaRelatedEntry(source=EService.class, relation=Uses.class, target=EService.class, description="A reference to any other EService, the EService instance is invoking.") + @RelatedResourcesEntry(source=EService.class, relation=Discovers.class, target=EService.class, description="A reference to any other EService, the EService instance is discovering through query on IS."), + @RelatedResourcesEntry(source=EService.class, relation=Uses.class, target=EService.class, description="A reference to any other EService, the EService instance is invoking.") } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java index 7d9502b..1063caa 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java @@ -5,7 +5,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -23,7 +23,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Belong @JsonDeserialize(as=LegalBodyImpl.class) @ResourceSchema( resources= { - @ResourceSchemaRelatedEntry(source=Person.class, relation=BelongsTo.class, target=LegalBody.class) + @RelatedResourcesEntry(source=Person.class, relation=BelongsTo.class, target=LegalBody.class) } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java index a2c0286..3856816 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Person.java @@ -5,7 +5,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -22,7 +22,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Belong @JsonDeserialize(as = PersonImpl.class) @ResourceSchema( resources = { - @ResourceSchemaRelatedEntry(source = Person.class, relation = BelongsTo.class, target = LegalBody.class) + @RelatedResourcesEntry(source = Person.class, relation = BelongsTo.class, target = LegalBody.class) } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java index 5636735..0ca496f 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java @@ -5,7 +5,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -29,7 +29,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsPlug @JsonDeserialize(as=PluginImpl.class) @ResourceSchema( resources= { - @ResourceSchemaRelatedEntry(source=Plugin.class, relation=IsPluginOf.class, target=Software.class, description="A reference to the Software this Plugin is conceived to extend the capabilities.") + @RelatedResourcesEntry(source=Plugin.class, relation=IsPluginOf.class, target=Software.class, description="A reference to the Software this Plugin is conceived to extend the capabilities.") } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java index a557a53..84598fa 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Schema.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -38,7 +38,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsComp @ResourceSchemaEntry(facet=SubjectFacet.class) }, resources = { - @ResourceSchemaRelatedEntry(source=Dataset.class, relation=IsCompliantWith.class, target=Schema.class, description="Any schema characterising the content of the dataset, e.g. the schema describing the 'columns' of a CSV-based dataset.") + @RelatedResourcesEntry(source=Dataset.class, relation=IsCompliantWith.class, target=Schema.class, description="Any schema characterising the content of the dataset, e.g. the schema describing the 'columns' of a CSV-based dataset.") } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java index 9902301..ed4be35 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java @@ -7,7 +7,7 @@ import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -55,12 +55,12 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requir @ResourceSchemaEntry(facet=CapabilityFacet.class, description="Any facility supported/offered by the Service.") }, resources= { - @ResourceSchemaRelatedEntry(source=Service.class, relation=CallsFor.class, target=Service.class, description="A reference to the Services needed by the target instance to work."), - @ResourceSchemaRelatedEntry(source=Service.class, relation=Activates.class, target=Service.class, description="The source Service enables the target Service to be running. Examples are an Hosting Node which enables an EService; A VirtualMachine enabling an EService or an HostingNode; An EService enabling a RunningPlugin; A VirtualMachine enabling an HostingNode etc"), - @ResourceSchemaRelatedEntry(source=Service.class, relation=IsCustomizedBy.class, target=ConfigurationTemplate.class, description="A reference to any configuration characterising the Service behaviour."), - @ResourceSchemaRelatedEntry(source=Service.class, relation=Manages.class, target=Dataset.class, description="A reference to any Dataset resource managed by the Service instance."), - @ResourceSchemaRelatedEntry(source=Service.class, relation=Enables.class, target=Software.class, description="A reference to any Software the Service is enabling (i.e. the Software is running throught the EService)."), - @ResourceSchemaRelatedEntry(source=Service.class, relation=Requires.class, target=Service.class, description="A reference to any Service needed by a Software to properly operate, e.g. this can be used to capture a sort of run-time requirements between a software component and the Service it needs.") + @RelatedResourcesEntry(source=Service.class, relation=CallsFor.class, target=Service.class, description="A reference to the Services needed by the target instance to work."), + @RelatedResourcesEntry(source=Service.class, relation=Activates.class, target=Service.class, description="The source Service enables the target Service to be running. Examples are an Hosting Node which enables an EService; A VirtualMachine enabling an EService or an HostingNode; An EService enabling a RunningPlugin; A VirtualMachine enabling an HostingNode etc"), + @RelatedResourcesEntry(source=Service.class, relation=IsCustomizedBy.class, target=ConfigurationTemplate.class, description="A reference to any configuration characterising the Service behaviour."), + @RelatedResourcesEntry(source=Service.class, relation=Manages.class, target=Dataset.class, description="A reference to any Dataset resource managed by the Service instance."), + @RelatedResourcesEntry(source=Service.class, relation=Enables.class, target=Software.class, description="A reference to any Software the Service is enabling (i.e. the Software is running throught the EService)."), + @RelatedResourcesEntry(source=Service.class, relation=Requires.class, target=Service.class, description="A reference to any Service needed by a Software to properly operate, e.g. this can be used to capture a sort of run-time requirements between a software component and the Service it needs.") } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java index 3b2848f..a96f161 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Site.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -49,8 +49,8 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwne @ResourceSchemaEntry(facet=NetworkingFacet.class, min=1), }, resources= { - @ResourceSchemaRelatedEntry(source=Site.class, relation=IsOwnedBy.class, target=Actor.class), - @ResourceSchemaRelatedEntry(source=Site.class, relation=Hosts.class, target=Service.class) + @RelatedResourcesEntry(source=Site.class, relation=IsOwnedBy.class, target=Actor.class), + @RelatedResourcesEntry(source=Site.class, relation=Hosts.class, target=Service.class) } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java index e1377f3..96baaab 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.resources; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -39,11 +39,11 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requir @ResourceSchemaEntry(facet=CapabilityFacet.class) }, resources= { - @ResourceSchemaRelatedEntry(source=Software.class, relation=DependsOn.class, target=Software.class, description="To capture any dependency between two software artifacts."), - @ResourceSchemaRelatedEntry(source=Software.class, relation=IsConfiguredBy.class, target=ConfigurationTemplate.class), - @ResourceSchemaRelatedEntry(source=Software.class, relation=Requires.class, target=Service.class, description="To capture any dependency between a software artifact and a Service, e.g. A software requiring a specific database instance."), - @ResourceSchemaRelatedEntry(source=VirtualService.class, relation=Demands.class, target=Software.class), - @ResourceSchemaRelatedEntry(source=Plugin.class, relation=IsPluginOf.class, target=Software.class, description="To capture the relation between a Software and its Plugins.") + @RelatedResourcesEntry(source=Software.class, relation=DependsOn.class, target=Software.class, description="To capture any dependency between two software artifacts."), + @RelatedResourcesEntry(source=Software.class, relation=IsConfiguredBy.class, target=ConfigurationTemplate.class), + @RelatedResourcesEntry(source=Software.class, relation=Requires.class, target=Service.class, description="To capture any dependency between a software artifact and a Service, e.g. A software requiring a specific database instance."), + @RelatedResourcesEntry(source=VirtualService.class, relation=Demands.class, target=Software.class), + @RelatedResourcesEntry(source=Plugin.class, relation=IsPluginOf.class, target=Software.class, description="To capture the relation between a Software and its Plugins.") } ) @TypeMetadata( diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java index 836419e..a05339a 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualService.java @@ -7,7 +7,7 @@ import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.informationsystem.types.annotations.ResourceSchema; import org.gcube.informationsystem.types.annotations.ResourceSchemaEntry; -import org.gcube.informationsystem.types.annotations.ResourceSchemaRelatedEntry; +import org.gcube.informationsystem.types.annotations.RelatedResourcesEntry; import org.gcube.informationsystem.types.reference.Change; import org.gcube.informationsystem.types.reference.TypeMetadata; import org.gcube.informationsystem.utils.TypeVersion; @@ -48,7 +48,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Demand @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=SoftwareFacet.class, min=1), }, resources= { - @ResourceSchemaRelatedEntry(source=VirtualService.class, relation=Demands.class, target=Software.class) + @RelatedResourcesEntry(source=VirtualService.class, relation=Demands.class, target=Software.class) } ) @TypeMetadata(