Merge branch 'master'

Author: sebbader

src/main/java/io/adminshell/aas/v3/model/DataSpecification.java

@@ -9,11 +9,61 @@
 import io.adminshell.aas.v3.model.impl.*;
 
 /**
- * TODO.
+ * Link to the included description of the Data Specification.
  */
 @KnownSubtypes({
     @KnownSubtypes.Type(value = DefaultEmbeddedDataSpecification.class)
 })
 public interface EmbeddedDataSpecification {
 
+    /**
+     * Global reference to the data specification template used by the element. Reference points to a
+     * Data Specification.
+     *
+     * Reference must point to a Data Specification.
+     *
+     * More information under
+     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification
+     *
+     * @return Returns the Reference for the property dataSpecification.
+     */
+    @IRI("https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification")
+    Reference getDataSpecification();
+
+    /**
+     * Global reference to the data specification template used by the element. Reference points to a
+     * Data Specification.
+     *
+     * Reference must point to a Data Specification.
+     *
+     * More information under
+     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification
+     *
+     * @param dataSpecification desired value for the property dataSpecification.
+     */
+    void setDataSpecification(Reference dataSpecification);
+
+    /**
+     * Property links to a Data Specification Content, which contains the formalized definitions
+     * specifying this Data Specification.
+     *
+     * More information under
+     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent
+     *
+     * @return Returns the DataSpecificationContent for the property dataSpecificationContent.
+     */
+    @IRI("https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent")
+    DataSpecificationContent getDataSpecificationContent();
+
+    /**
+     * Property links to a Data Specification Content, which contains the formalized definitions
+     * specifying this Data Specification.
+     *
+     * More information under
+     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent
+     *
+     * @param dataSpecificationContent desired value for the property dataSpecificationContent.
+     */
+    void setDataSpecificationContent(DataSpecificationContent dataSpecificationContent);
+
 }

src/main/java/io/adminshell/aas/v3/model/EmbeddedDataSpecification.java

@@ -61,12 +61,12 @@ public interface Entity extends SubmodelElement {
      * Constraint AASd-014: Either the attribute globalAssetId or externalAssetId of an Entity must be
      * set if Entity/entityType is set to 'SelfManagedEntity'. They are not existing otherwise.
      *
-     * More information under https://admin-shell.io/aas/3/0/RC01/Entity/externalAssetId
+     * More information under https://admin-shell.io/aas/3/0/RC01/Entity/specificAssetId
      *
-     * @return Returns the IdentifierKeyValuePair for the property externalAssetId.
+     * @return Returns the IdentifierKeyValuePair for the property specificAssetId.
      */
-    @IRI("https://admin-shell.io/aas/3/0/RC01/Entity/externalAssetId")
-    IdentifierKeyValuePair getExternalAssetId();
+    @IRI("https://admin-shell.io/aas/3/0/RC01/Entity/specificAssetId")
+    IdentifierKeyValuePair getSpecificAssetId();
 
     /**
      * Reference to an identifier key value pair representing an external identifier of the asset
@@ -78,11 +78,11 @@ public interface Entity extends SubmodelElement {
      * Constraint AASd-014: Either the attribute globalAssetId or externalAssetId of an Entity must be
      * set if Entity/entityType is set to 'SelfManagedEntity'. They are not existing otherwise.
      *
-     * More information under https://admin-shell.io/aas/3/0/RC01/Entity/externalAssetId
+     * More information under https://admin-shell.io/aas/3/0/RC01/Entity/specificAssetId
      *
-     * @param externalAssetId desired value for the property externalAssetId.
+     * @param specificAssetId desired value for the property specificAssetId.
      */
-    void setExternalAssetId(IdentifierKeyValuePair externalAssetId);
+    void setSpecificAssetId(IdentifierKeyValuePair specificAssetId);
 
     /**
      * Describes whether the entity is a co-managed entity or a self-managed entity.

src/main/java/io/adminshell/aas/v3/model/Entity.java

@@ -14,11 +14,12 @@
  * template defines the additional attributes an element may or shall have. The data specifications
  * used are explicitly specified with their id. Constraint AASd-050: If the DataSpecificationContent
  * DataSpecificationIEC61360 is used for an element then the value of
- * hasDataSpecification/dataSpecification shall contain the global reference to the IRI of the
+ * hasDataSpecification/dataSpecification shall contain the global reference to the Iri of the
  * corresponding data specification template
  * https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/2/0.
  */
 @KnownSubtypes({
+    @KnownSubtypes.Type(value = DefaultHasDataSpecification.class),
     @KnownSubtypes.Type(value = Submodel.class),
     @KnownSubtypes.Type(value = AdministrativeInformation.class),
     @KnownSubtypes.Type(value = Asset.class),
@@ -29,56 +30,6 @@
 })
 public interface HasDataSpecification {
 
-    /**
-     * Global reference to the data specification template used by the element. Reference points to a
-     * Data Specification.
-     *
-     * Reference must point to a Data Specification.
-     *
-     * More information under
-     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification
-     *
-     * @return Returns the List of References for the property dataSpecifications.
-     */
-    @IRI("https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification")
-    List<Reference> getDataSpecifications();
-
-    /**
-     * Global reference to the data specification template used by the element. Reference points to a
-     * Data Specification.
-     *
-     * Reference must point to a Data Specification.
-     *
-     * More information under
-     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecification
-     *
-     * @param dataSpecifications desired value for the property dataSpecifications.
-     */
-    void setDataSpecifications(List<Reference> dataSpecifications);
-
-    /**
-     * Property links to a Data Specification Content, which contains the formalized definitions
-     * specifying this Data Specification.
-     *
-     * More information under
-     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent
-     *
-     * @return Returns the List of DataSpecificationContents for the property dataSpecificationContents.
-     */
-    @IRI("https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent")
-    List<DataSpecificationContent> getDataSpecificationContents();
-
-    /**
-     * Property links to a Data Specification Content, which contains the formalized definitions
-     * specifying this Data Specification.
-     *
-     * More information under
-     * https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent
-     *
-     * @param dataSpecificationContents desired value for the property dataSpecificationContents.
-     */
-    void setDataSpecificationContents(List<DataSpecificationContent> dataSpecificationContents);
-
     /**
      * Link to the included description of the Data Specification.
      *

src/main/java/io/adminshell/aas/v3/model/HasDataSpecification.java

@@ -36,7 +36,7 @@ public interface Identifier {
     void setIdentifier(String identifier);
 
     /**
-     * Type of the Identifier, e.g. IRI, IRDI etc. The supported Identifier types are defined in the
+     * Type of the Identifier, e.g. Iri, Irdi etc. The supported Identifier types are defined in the
      * enumeration 'IdentifierType'.
      *
      * More information under https://admin-shell.io/aas/3/0/RC01/Identifier/idType
@@ -47,7 +47,7 @@ public interface Identifier {
     IdentifierType getIdType();
 
     /**
-     * Type of the Identifier, e.g. IRI, IRDI etc. The supported Identifier types are defined in the
+     * Type of the Identifier, e.g. Iri, Irdi etc. The supported Identifier types are defined in the
      * enumeration 'IdentifierType'.
      *
      * More information under https://admin-shell.io/aas/3/0/RC01/Identifier/idType

src/main/java/io/adminshell/aas/v3/model/Identifier.java

@@ -73,7 +73,7 @@ public interface Key {
     void setType(KeyElements type);
 
     /**
-     * The key value, for example an IRDI if the idType=IRDI.
+     * The key value, for example an IRDI if the idType=Irdi.
      *
      * More information under https://admin-shell.io/aas/3/0/RC01/Key/value
      *
@@ -83,7 +83,7 @@ public interface Key {
     String getValue();
 
     /**
-     * The key value, for example an IRDI if the idType=IRDI.
+     * The key value, for example an IRDI if the idType=Irdi.
      *
      * More information under https://admin-shell.io/aas/3/0/RC01/Key/value
      *

src/main/java/io/adminshell/aas/v3/model/Key.java

@@ -101,7 +101,7 @@ public enum KeyElements {
 
     /** 
     */
-    RELATIONSHIPT_ELEMENT,
+    RELATIONSHIP_ELEMENT,
 
     /**
      * Submodel Element is abstract, i.e. if a key uses 'SubmodelElement' the reference may be a

src/main/java/io/adminshell/aas/v3/model/KeyElements.java

@@ -36,6 +36,6 @@ public enum KeyType {
     /**
      * idShort of a referable element
      */
-    IDSHORT;
+    ID_SHORT;
 
 }

src/main/java/io/adminshell/aas/v3/model/KeyType.java

@@ -15,22 +15,22 @@
 public enum LevelType {
 
     /**
-     * MAX according to IEC 61360 as an Identifier scheme for maximal levels.
+     * Max according to IEC 61360 as an Identifier scheme for maximal levels.
      */
     MAX,
 
     /**
-     * MIN according to IEC 61360 as an Identifier scheme for minimal levels.
+     * Min according to IEC 61360 as an Identifier scheme for minimal levels.
      */
     MIN,
 
     /**
-     * NOM according to IEC 61360 as an Identifier scheme for nominal levels.
+     * Nom according to IEC 61360 as an Identifier scheme for nominal levels.
      */
     NOM,
 
     /**
-     * TYP according to IEC 61360 as an Identifier scheme for typical levels.
+     * Typ according to IEC 61360 as an Identifier scheme for typical levels.
      */
     TYP;
 

src/main/java/io/adminshell/aas/v3/model/LevelType.java

@@ -21,6 +21,6 @@ public enum LocalKeyType {
     /**
      * idShort of a referable element
      */
-    IDSHORT;
+    ID_SHORT;
 
 }