gCubeSystem
/
gcube-model
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed wrong optional Facet from Actor definition

This commit is contained in:
Luca Frosini 2023-05-03 10:31:31 +02:00
parent 652a3093f1
commit 2f8bbf467b
4 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/gcube-model-consistsof.rst
View File

@ -136,8 +136,6 @@ HasContact is a base relation type to capture the diverse points of contact asso
+------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| **Source** | **Relation** | **Multiplicity** | **Target** | **Description** | | **Source** | **Relation** | **Multiplicity** | **Target** | **Description** |
+------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Actor | HasContact | 0..n | ContactFacet | An Actor can have other Contact Facets which provide secondary contact information. |
+------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Dataset | HasContact | 1..n | ContactFacet | The contact information of the entity responsible for the dataset. | | Dataset | HasContact | 1..n | ContactFacet | The contact information of the entity responsible for the dataset. |
+------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +------------------------------------------------------+--------------+------------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Schema | HasContact | 1..n | ContactFacet | | | Schema | HasContact | 1..n | ContactFacet | |

2
docs/gcube-model-facet.rst
View File

@ -180,8 +180,6 @@ ContactFacet captures information on a point of contact for the resource, i.e.,
+-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+ +-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
| **Source** | **Relation** | **Multiplicity** | **Target** | **Description** | | **Source** | **Relation** | **Multiplicity** | **Target** | **Description** |
+-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+ +-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
| Actor | HasContact | 0..n | ContactFacet | An Actor can have other Contact Facets which provide secondary contact information. |
+-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
| Actor | IsIdentifiedBy | 1..1 | ContactFacet | An Actor has at least a Contact Facet which permit to identify the Actor per se. | | Actor | IsIdentifiedBy | 1..1 | ContactFacet | An Actor has at least a Contact Facet which permit to identify the Actor per se. |
+-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+ +-----------------+----------------+-----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------+
| ConcreteDataset | HasMaintainer | 1..n | ContactFacet | The contact information of the entity responsible for the maintenance of the concrete dataset | | ConcreteDataset | HasMaintainer | 1..n | ContactFacet | The contact information of the entity responsible for the maintenance of the concrete dataset |

32
docs/gcube-model-resource.rst
View File

@ -39,23 +39,21 @@ Actor (Abstract) is any entity (human or machine) playing an active role in the
.. table:: **Actor** ``extends`` **GCubeResource** .. table:: **Actor** ``extends`` **GCubeResource**
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Source | Relation | Multiplicity | Target | Description | | Source | Relation | Multiplicity | Target | Description |
+========================+================+==============+=======================+=======================================================================================+ +========================+================+==============+=======================+====================================================================================+
| **Facets** | | **Facets** |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Actor | ConsistsOf | 0..n | ContactReferenceFacet | | | Actor | ConsistsOf | 0..n | ContactReferenceFacet | |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Actor | HasContact | 0..n | ContactFacet | An Actor can have other Contact Facets which provide secondary contact information. | | Actor | IsIdentifiedBy | 1..1 | ContactFacet | An Actor has at least a Contact Facet which permit to identify the Actor per se. |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Actor | IsIdentifiedBy | 1..1 | ContactFacet | An Actor has at least a Contact Facet which permit to identify the Actor per se. | | **Resource Relations** |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| **Resource Relations** | | Dataset | Involves | 0..n | Actor | |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Dataset | Involves | 0..n | Actor | | | Site | IsOwnedBy | 0..n | Actor | |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+ +------------------------+----------------+--------------+-----------------------+------------------------------------------------------------------------------------+
| Site | IsOwnedBy | 0..n | Actor | |
+------------------------+----------------+--------------+-----------------------+---------------------------------------------------------------------------------------+
The **Actor** current version is 1.0.0. The **Actor** current version is 1.0.0.

1
src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java
View File

@ -40,7 +40,6 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.IsOwne
@ResourceSchema( @ResourceSchema(
facets={ facets={
@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=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) @ResourceSchemaEntry(facet=ContactReferenceFacet.class)
}, },
resources= { resources= {