From 0983c65505963994589829e21ff83702dcb5c7b8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 26 Jan 2023 18:51:22 +0100 Subject: [PATCH] Improving documentation --- docs/index.rst | 67 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index fdc2b08..7326ca9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,7 @@ https://openportal.isti.cnr.it/doc?id=people______::470484e51fcb9e307a418c800efc If you need to refer to such work you can cite the PhD Thesis. -.. code:: BibText +.. code:: @phdthesis{frosini2019transactional, title={Transactional REST Information System for Federated Research Infrastructures enabling Virtual Research Environments}, @@ -23,7 +23,7 @@ An previous paper about this work is: -.. code:: BibText +.. code:: @article{frosini2018facet, title={A Facet-based Open and Extensible Resource Model for Research Data Infrastructures.}, @@ -87,7 +87,7 @@ Merriam Webster Dictionary defines facet as “any of the definable aspects that The Free Dictionary defines a facet as “One of numerous aspects, as of a subject” [#FacetFreeDictionaryDef]_ . -.... + Type Attributes =============== @@ -124,19 +124,76 @@ Regex (Reg)): Basic Types ----------- +.. table:: Basic Types + + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Type | Java type | Description | + +==========+===========================================================================================+===========================================================+ + | Boolean | java.lang.Boolean or boolean | Handles only the values True or False. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Integer | java.lang.Integer or int or java.math.BigInteger | 32-bit signed Integers. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Short | java.lang.Short or short | Small 16-bit signed integers. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Long | java.lang.Long or long | Big 64-bit signed integers. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Float | java.lang.Float or float | Decimal numbers. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Double | java.lang.Double or double | Decimal numbers with high precision. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Date | java.util.Date | Any date with the precision up to milliseconds. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | String | java.lang.String | Any string as alphanumeric sequence of chars. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Byte | java.lang.Byte or byte | Single byte. useful to store small 8-bit signed integers. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + | Binary | java.lang.Byte[] or byte[] | Can contain any value as byte array. | + +----------+-------------------------------------------------------------------------------------------+-----------------------------------------------------------+ + + Derived Types ------------ +------------- The following are obtained using a String as real type and adding a validation regex. +.. table:: Derived Types + + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Type | Java type | Description | + +==============+=============================================================+=============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================+ + | Enum | java.lang.Enum or enum | By default it is represented using the String representation of the Enum. So that the primitive type used will be String. The enumeration is checked by setting Regexpr property. The Regular Expression is auto-generated and it will be something like ^(FIRST-ENUM-STRING_REPRESENTATION SECOND-ENUM-STRING_REPRESENTATION... LAST_ENUM_STRING_REPRESENTATION)$. Otherwise (if indicated using an annotation), it can be represented using the Integer value of the Enum. So that the primitive type used will be Integer. The enumeration is checked using Max and Min properties. | + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | UUID | java.util.UUID | String representation of the UUID. The check is obtained using the regular expression ^([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}){1}$ | + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | URL | java.net.URL | String representation of the URL. No check actually. | + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | URI | java.net.URI | String representation of the URI. No check actually. | + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | TypeVersion | org.gcube.informationsystem.utils.TypeVersion | A type representing and validating a version in the following format X.X.X Major(Integer).Minor(Integer).Revision(Integer) (e.g 1.0.0, 2.3.0, 2.0.1). The check is obtained using the regular expression '''^[1-9][0-9]{0,}\.(0 | + +--------------+-------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + Complex Types ------------ +------------- Any property defined by composing basic types, complex types and other complex types. Any complex type can be defined by extending Property type. +.. table:: Complex Types + + +---------------------------+-----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Type | Java type | Description | + +===========================+=================================================================================================================+===================================================================================================================================================================+ + | Property | ? extends org.gcube.informationsystem.model.reference.properties.Property | This is an Object contained inside the owner Entity and has no Header. It is reachable only by navigating the owner Entity/Relation. | + +---------------------------+-----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Property list | List<? extends org.gcube.informationsystem.model.reference.properties.Property> | List of Objects contained inside the owner Entity and have no Header. They are reachable only by navigating the owner Entity/Relation. | + +---------------------------+-----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Property set | Set<? org.gcube.informationsystem.model.reference.properties.Property> | Set (no duplicates) of Objects contained inside the owner Entity and have no Header. They are reachable only by navigating the owner Entity/Relation. | + +---------------------------+-----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + | Property map | Map<String, ? extends org.gcube.informationsystem.model.reference.properties.Propertyd> | Map of Objects contained inside the owner Entity and have no Header. They are reachable only by navigating the owner Entity/Relation. | + +---------------------------+-----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + Property ========