Upgrade RDF dataformat to RC02

Fix JSON dataformat bugs which appeared after closing some leftovers from the model/mixins updates
eclipse-aas4j · Aug 3, 2022 · 89694e9 · 89694e9
1 parent fe5e096
commit 89694e9
Show file tree

Hide file tree

Showing 111 changed files with 1,077 additions and 933 deletions.
diff --git a/...clipse/aas4j/v3/dataformat/core/visitor/AssetAdministrationShellElementWalkerVisitor.java b/...clipse/aas4j/v3/dataformat/core/visitor/AssetAdministrationShellElementWalkerVisitor.java
@@ -47,7 +47,7 @@ public default void visit(AssetInformation assetInformation) {
             return;
         }
         visit(assetInformation.getGlobalAssetId());
-        assetInformation.getSpecificAssetId().forEach(x -> visit(x));
+        assetInformation.getSpecificAssetIds().forEach(x -> visit(x));
         visit(assetInformation.getDefaultThumbnail());
         AssetAdministrationShellElementVisitor.super.visit(assetInformation);
     }
@@ -174,8 +174,8 @@ public default void visit(Referable referable) {
         if (referable == null) {
             return;
         }
-        referable.getDescription().forEach(x -> visit(x));
-        referable.getDisplayName().forEach(x -> visit(x));
+        referable.getDescriptions().forEach(x -> visit(x));
+        referable.getDisplayNames().forEach(x -> visit(x));
         AssetAdministrationShellElementVisitor.super.visit(referable);
     }
 

diff --git a/dataformat-core/src/test/java/org/eclipse/aas4j/v3/dataformat/core/AASFull.java b/dataformat-core/src/test/java/org/eclipse/aas4j/v3/dataformat/core/AASFull.java
diff --git a/dataformat-core/src/test/java/org/eclipse/aas4j/v3/dataformat/core/CustomProperty.java b/dataformat-core/src/test/java/org/eclipse/aas4j/v3/dataformat/core/CustomProperty.java
@@ -122,12 +122,12 @@ final public void setCategory(String category) {
 	}
 
 	@Override
-	final public List<LangString> getDescription() {
+	final public List<LangString> getDescriptions() {
 		return descriptions;
 	}
 
 	@Override
-	final public void setDescription(List<LangString> description) {
+	final public void setDescriptions(List<LangString> description) {
 		this.descriptions = description;
 	}
 
@@ -142,12 +142,12 @@ public void setChecksum(String checksum) {
 	}
 
 	@Override
-	final public List<LangString> getDisplayName() {
+	final public List<LangString> getDisplayNames() {
 		return displayNames;
 	}
 
 	@Override
-	final public void setDisplayName(List<LangString> displayName) {
+	final public void setDisplayNames(List<LangString> displayName) {
 		this.displayNames = displayName;
 	}
 

diff --git a/dataformat-json/src/test/resources/assetAdministrationShell.json b/dataformat-json/src/test/resources/assetAdministrationShell.json
@@ -1,6 +1,6 @@
 {
   "idShort": "TestAssetAdministrationShell",
-  "description": [
+  "descriptions": [
       {
         "language": "en-us",
         "text": "An Example Asset Administration Shell for the test application"

diff --git a/dataformat-json/src/test/resources/assetAdministrationShellList.json b/dataformat-json/src/test/resources/assetAdministrationShellList.json
@@ -1,7 +1,7 @@
 [
   {
     "idShort": "TestAssetAdministrationShell",
-    "description": [
+    "descriptions": [
       {
         "language": "en-us",
         "text": "An Example Asset Administration Shell for the test application"

diff --git a/dataformat-json/src/test/resources/jsonExample.json b/dataformat-json/src/test/resources/jsonExample.json
@@ -16,7 +16,7 @@
                     ],
                     "type": "GlobalReference"
                 },
-                "specificAssetId": [
+                "specificAssetIds": [
                     {
                         "name": "EquipmentID",
                         "value": "538fd1b3-f99f-4a52-9c75-72e9fa921270",

diff --git a/dataformat-json/src/test/resources/submodel.json b/dataformat-json/src/test/resources/submodel.json
@@ -57,7 +57,7 @@
                 }
             ],
             "idShort": "ManufacturerName",
-            "description": [
+            "descriptions": [
                     {
                         "language": "en-us",
                         "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -93,7 +93,7 @@
                     },
             "valueType": "xs:string",
             "idShort": "InstanceId",
-            "description": [
+            "descriptions": [
                 {
                     "language": "en-us",
                     "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -105,7 +105,7 @@
             ]
         }
     ],
-    "description": [
+    "descriptions": [
         {
             "language": "en-us",
             "text": "An example asset identification submodel for the test application"

diff --git a/dataformat-json/src/test/resources/submodelElement.json b/dataformat-json/src/test/resources/submodelElement.json
@@ -36,7 +36,7 @@
         }
     ],
     "idShort": "ManufacturerName",
-    "description": [
+    "descriptions": [
         {
             "language": "en-us",
             "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."

diff --git a/dataformat-json/src/test/resources/submodelElementCollection.json b/dataformat-json/src/test/resources/submodelElementCollection.json
@@ -1,7 +1,7 @@
 {
   "idShort": "ExampleSubmodelCollectionOrdered",
   "category": "Parameter",
-  "description": [
+  "descriptions": [
     {
       "language": "en-us",
       "text": "Example SubmodelElementCollectionOrdered object"
@@ -27,7 +27,7 @@
     {
       "idShort": "ExampleProperty",
       "category": "Constant",
-      "description": [
+      "descriptions": [
         {
           "language": "en-us",
           "text": "Example Property object"
@@ -54,7 +54,7 @@
     {
       "idShort": "ExampleMultiLanguageProperty",
       "category": "Constant",
-      "description": [
+      "descriptions": [
         {
           "language": "en-us",
           "text": "Example MultiLanguageProperty object"
@@ -80,7 +80,7 @@
     {
       "idShort": "ExampleRange",
       "category": "Parameter",
-      "description":
+      "descriptions":
        [
         {
           "language": "en-us",
@@ -109,7 +109,7 @@
     {
       "idShort": "ExampleRange2",
       "category": "Parameter",
-      "description":
+      "descriptions":
       [
         {
           "language": "en-us",

diff --git a/dataformat-json/src/test/resources/submodelElementList.json b/dataformat-json/src/test/resources/submodelElementList.json
@@ -36,7 +36,7 @@
             }
         ],
         "idShort": "ManufacturerName",
-        "description": [
+        "descriptions": [
             {
                 "language": "en-us",
                 "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -72,7 +72,7 @@
                 },
         "valueType": "xs:string",
         "idShort": "InstanceId",
-        "description": [
+        "descriptions": [
             {
                 "language": "en-us",
                 "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."

diff --git a/dataformat-json/src/test/resources/submodelList.json b/dataformat-json/src/test/resources/submodelList.json
@@ -57,7 +57,7 @@
                     }
                 ],
                 "idShort": "ManufacturerName",
-                "description": [
+                "descriptions": [
                     {
                         "language": "en-us",
                         "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -93,7 +93,7 @@
                         },
                 "valueType": "xs:string",
                 "idShort": "InstanceId",
-                "description": [
+                "descriptions": [
                     {
                         "language": "en-us",
                         "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -105,7 +105,7 @@
                 ]
             }
         ],
-        "description": [
+        "descriptions": [
             {
                 "language": "en-us",
                 "text": "An example asset identification submodel for the test application"
@@ -166,7 +166,7 @@
                         "valueType": "xs:string",
                         "category": "Constant",
                         "idShort": "ExampleProperty2",
-                        "description": [
+                        "descriptions": [
                             {
                                 "language": "en-us",
                                 "text": "Example Property object"
@@ -203,7 +203,7 @@
                         "valueType": "xs:string",
                         "category": "Constant",
                         "idShort": "ExampleProperty",
-                        "description": [
+                        "descriptions": [
                             {
                                 "language": "en-us",
                                 "text": "Example Property object"
@@ -226,7 +226,7 @@
                             "type": "GlobalReference"
                         },
                 "idShort": "ExampleEntity",
-                "description": [
+                "descriptions": [
                     {
                         "language": "en-us",
                         "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -261,7 +261,7 @@
                             "type": "GlobalReference"
                         },
                 "idShort": "ExampleEntity2",
-                "description": [
+                "descriptions": [
                     {
                         "language": "en-us",
                         "text": "Legally valid designation of the natural or judicial person which is directly responsible for the design, production, packaging and labeling of a product in respect to its being brought into circulation."
@@ -273,7 +273,7 @@
                 ]
             }
         ],
-        "description": [
+        "descriptions": [
             {
                 "language": "en-us",
                 "text": "An example bill of material submodel for the test application"