From 160634bafabb2dae0be7a6f09e72638d03b158d7 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 2 Mar 2021 15:57:39 +0100 Subject: [PATCH] Fixed GCube Resource Schema --- .../model/reference/entities/resources/Actor.java | 2 +- .../reference/entities/resources/ConfigurationTemplate.java | 2 +- .../model/reference/entities/resources/Dataset.java | 2 +- .../model/reference/entities/resources/EService.java | 2 +- .../model/reference/entities/resources/HostingNode.java | 2 +- .../model/reference/entities/resources/Schema.java | 2 +- .../model/reference/entities/resources/Site.java | 2 +- .../model/reference/entities/resources/Software.java | 2 +- .../model/reference/entities/resources/VirtualMachine.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 3ed5906..5c7d5e0 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 @@ -39,7 +39,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwne @JsonDeserialize(as=ActorImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=ContactFacet.class, min=1, description=" An Actor has at least a Contact Facet which permit to identify the Actor per se. "), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=ContactFacet.class, min=1, max=1, description=" An Actor has at least a Contact Facet which permit to identify the Actor per se. "), @ResourceSchemaEntry(relation=HasContact.class, facet=ContactFacet.class, description=" An Actor can have other Contact Facets which provide secondary contact information. "), @ResourceSchemaEntry(facet=ContactReferenceFacet.class) }, 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 c82543c..cdaf99c 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 @@ -29,7 +29,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsDeri @JsonDeserialize(as=ConfigurationTemplateImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=IdentifierFacet.class, min=1) + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=IdentifierFacet.class, min=1, max=1) }, resources = { @RelatedResourcesEntry(source=Configuration.class, relation=IsDerivationOf.class, target=ConfigurationTemplate.class), 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 b9cd277..b1218a0 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 @@ -51,7 +51,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Manage @JsonDeserialize(as = DatasetImpl.class) @ResourceSchema( facets = { - @ResourceSchemaEntry(relation = IsIdentifiedBy.class, facet = IdentifierFacet.class, min = 1, description = "The set of Identifiers associated with the Dataset instance."), + @ResourceSchemaEntry(relation = IsIdentifiedBy.class, facet = IdentifierFacet.class, min = 1, max=1, description = "The set of Identifiers associated with the Dataset instance."), @ResourceSchemaEntry(relation = HasContact.class, facet = ContactFacet.class, min = 1, description = "The contact information of the entity responsible for the dataset."), @ResourceSchemaEntry(relation = HasContributor.class, facet = ContactFacet.class, description = "The contact information on contributors supporting the creation and development of the Dataset."), @ResourceSchemaEntry(relation = HasCreator.class, facet = ContactFacet.class, description = " The contact information of the creator of the Dataset."), 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 541ead3..c4e1e2d 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 @@ -33,7 +33,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Uses; @JsonDeserialize(as = EServiceImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation = IsIdentifiedBy.class, facet = SoftwareFacet.class, min = 1, description = "The main software enabling the EService capabilities."), + @ResourceSchemaEntry(relation = IsIdentifiedBy.class, facet = SoftwareFacet.class, min = 1, max=1, description = "The main software enabling the EService capabilities."), @ResourceSchemaEntry(facet = SoftwareFacet.class, description = "Software available in the EService environment that characterizes the specific EService instance."), @ResourceSchemaEntry(facet = AccessPointFacet.class, min = 1, description = "Identify the endpoints of the EService."), @ResourceSchemaEntry(facet = EventFacet.class, min = 1, description = "Events characterising the current status and lifecycle of the service, e.g. ActivationTime, DeploymentTime."), diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java index dea35d4..a67dfa2 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/HostingNode.java @@ -50,7 +50,7 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent @JsonDeserialize(as=HostingNodeImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=NetworkingFacet.class, min=1, description="The Network ID characterising the Hosting Node."), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=NetworkingFacet.class, min=1, max=1, description="The Network ID characterising the Hosting Node."), @ResourceSchemaEntry(facet=CPUFacet.class, min=1, description="The CPU equipping the Hosting Node."), @ResourceSchemaEntry(relation=HasPersistentMemory.class, facet=MemoryFacet.class, min=1, description="The Disk Space Capacity of the Hosting Node."), @ResourceSchemaEntry(relation=HasVolatileMemory.class, facet=MemoryFacet.class, min=1, description="The RAM Capacity of the Hosting Node."), 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 84598fa..fec31f9 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 @@ -32,7 +32,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsComp @JsonDeserialize(as=SchemaImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=SchemaFacet.class, min=1), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=SchemaFacet.class, min=1, max=1), @ResourceSchemaEntry(relation=HasContact.class, facet=ContactFacet.class, min=1), @ResourceSchemaEntry(facet=DescriptiveMetadataFacet.class), @ResourceSchemaEntry(facet=SubjectFacet.class) 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 a96f161..dcc4451 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 @@ -41,7 +41,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwne @JsonDeserialize(as=SiteImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=IdentifierFacet.class, min=1, description="The Site Identifier."), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=IdentifierFacet.class, min=1, max=1, description="The Site Identifier."), @ResourceSchemaEntry(relation=HasContact.class, facet=ContactFacet.class, min=1, description="The main contact for the Site."), @ResourceSchemaEntry(relation=HasMaintainer.class, facet=ContactFacet.class, min=1, description="Contact information of the maintainer of the Site."), @ResourceSchemaEntry(relation=HasManager.class, facet=ContactFacet.class, min=1, description="Contact information of the Site Manager."), 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 96baaab..0f6c1d0 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 @@ -34,7 +34,7 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Requir @JsonDeserialize(as=SoftwareImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=SoftwareFacet.class, min=1, description="Software coordinates which identify the Software per se."), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=SoftwareFacet.class, min=1, max=1, description="Software coordinates which identify the Software per se."), @ResourceSchemaEntry(facet=SoftwareFacet.class, min=1, description="Apart the one connected by the IsIdentifiedBy relation (gCube coordinates) the others identify the software in other way e.g. (Maven coordinates)."), @ResourceSchemaEntry(facet=CapabilityFacet.class) }, diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java index bdcd6eb..53f47f8 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java +++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/VirtualMachine.java @@ -37,7 +37,7 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent @JsonDeserialize(as=VirtualMachineImpl.class) @ResourceSchema( facets={ - @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=NetworkingFacet.class, min=1, description="The Network ID characterising the Virtual Machine."), + @ResourceSchemaEntry(relation=IsIdentifiedBy.class, facet=NetworkingFacet.class, min=1, max=1, description="The Network ID characterising the Virtual Machine."), @ResourceSchemaEntry(facet=CPUFacet.class, min=1, description="The CPU equipping the Virtual Machine."), @ResourceSchemaEntry(relation=HasPersistentMemory.class, facet=MemoryFacet.class, min=1, description="The Disk Space Capacity of the Virtual Machine."), @ResourceSchemaEntry(relation=HasVolatileMemory.class, facet=MemoryFacet.class, min=1, description="The RAM Capacity of the Virtual Machine."),