Use common test classes in dataformat-uanodeset

Daespen · Daespen · commit a83f389d9e92 · 2021-09-10T16:22:35.000+02:00
- AASSimple in dataformat-core replaced with updated AASSimple from uanodeset
- uanodeset now uses AASSimple and AASFull from dataformat-core
- Adds assets to AASEnv in xml- and json- serializer
diff --git a/dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASSimple.java b/dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASSimple.java
diff --git a/dataformat-json/src/test/resources/jsonExample.json b/dataformat-json/src/test/resources/jsonExample.json
@@ -63,7 +63,7 @@
                     "keys": [
                         {
                             "type": "Submodel",
-                            "value": "http.//i40.customer.com/type/1/1/7A7104BDAB57E184",
+                            "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184",
                             "idType": "Iri"
                         }
                     ]
@@ -89,6 +89,18 @@
             ]
         }
     ],
+   "assets": [
+      {
+         "modelType": {
+            "name": "Asset"
+         },
+         "idShort": "ServoDCMotor",
+         "identification": {
+            "idType": "Iri",
+            "id": "http://customer.com/assets/KHBVZJSQKIY"
+         }
+      }
+   ],
     "submodels": [
         {
             "modelType": {
diff --git a/dataformat-uanodeset/pom.xml b/dataformat-uanodeset/pom.xml
@@ -26,6 +26,13 @@
 			<artifactId>dataformat-core</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.admin-shell.aas</groupId>
+			<artifactId>dataformat-core</artifactId>
+			<version>${revision}</version>
+			<classifier>tests</classifier>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/AASFull.java b/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/AASFull.java
diff --git a/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/AASSimple.java b/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/AASSimple.java
diff --git a/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/IntegrationTests.java b/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/IntegrationTests.java
@@ -24,6 +24,7 @@
 
 import io.adminshell.aas.v3.dataformat.DeserializationException;
 import io.adminshell.aas.v3.dataformat.SerializationException;
+import io.adminshell.aas.v3.dataformat.core.AASFull;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.MappingContext;
 import io.adminshell.aas.v3.model.Asset;
 import io.adminshell.aas.v3.model.AssetAdministrationShell;
diff --git a/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/SerializerTest.java b/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/SerializerTest.java
@@ -16,14 +16,19 @@
 package io.adminshell.aas.v3.dataformat.i4aas;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import io.adminshell.aas.v3.dataformat.SerializationException;
+import io.adminshell.aas.v3.dataformat.core.AASFull;
+import io.adminshell.aas.v3.dataformat.core.AASSimple;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.MappingContext;
 import io.adminshell.aas.v3.model.impl.DefaultAssetAdministrationShellEnvironment;
 
@@ -38,14 +43,13 @@ public static void before() {
 	public void testEmpty() throws SerializationException {
 		I4AASSerializer i4aasSerializer = new I4AASSerializer();
 		String write = i4aasSerializer.write(new DefaultAssetAdministrationShellEnvironment());
-		//System.out.println(write);
 	}
 
 	@Test
 	public void testSimple() throws SerializationException, IllegalArgumentException, IllegalAccessException {
 		I4AASSerializer i4aasSerializer = new I4AASSerializer();
 		String write = i4aasSerializer.write(AASSimple.ENVIRONMENT);
-		for (String toCheck : AASSimple.getContainedStrings()) {
+        for (String toCheck : getContainedStrings(AASSimple.class)) {
 			if (toCheck.toLowerCase().contains("thumbnail")) {
 				//gets remapped to DefaultThumbnail
 				toCheck = "DefaultThumbnail";
@@ -64,14 +68,23 @@ public void testSimpleToFile() throws SerializationException, IOException {
 		Path createTempFile = Files.createTempFile("testSimpleToFile", ".xml");
 		I4AASSerializer i4aasSerializer = new I4AASSerializer();
 		i4aasSerializer.write(createTempFile.toFile(), AASSimple.ENVIRONMENT);
-		//System.out.println(createTempFile.toAbsolutePath().toString());
 	}
 
 	@Test
 	public void testFull() throws SerializationException {
 		I4AASSerializer i4aasSerializer = new I4AASSerializer();
 		String write = i4aasSerializer.write(AASFull.ENVIRONMENT);
-		//System.out.println(write);
 	}
 
+    private static List<String> getContainedStrings(Class<?> testModelClass) throws IllegalArgumentException, IllegalAccessException {
+        List<String> results = new ArrayList<>();
+        for (Field field : AASSimple.class.getDeclaredFields()) {
+            field.setAccessible(true);
+            if (field.getType() == String.class) {
+                Object object = field.get(null);
+                results.add((String) object);
+            }
+        }
+        return results;
+    }
 }
diff --git a/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/SubmodelMapperTest.java b/dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/SubmodelMapperTest.java
@@ -15,14 +15,13 @@
  */
 package io.adminshell.aas.v3.dataformat.i4aas.mappers;
 
-
 import javax.xml.bind.JAXBException;
 
 import org.junit.Test;
 import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
 import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
 
-import io.adminshell.aas.v3.dataformat.i4aas.AASSimple;
+import io.adminshell.aas.v3.dataformat.core.AASSimple;
 import io.adminshell.aas.v3.dataformat.i4aas.UANodeSetMarshaller;
 import io.adminshell.aas.v3.model.impl.DefaultAssetAdministrationShellEnvironment;
 
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/serialization/AssetAdministrationShellEnvironmentSerializer.java b/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/serialization/AssetAdministrationShellEnvironmentSerializer.java
@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 
 import io.adminshell.aas.v3.dataformat.xml.AasXmlNamespaceContext;
+import io.adminshell.aas.v3.model.Asset;
 import io.adminshell.aas.v3.model.AssetAdministrationShell;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 import io.adminshell.aas.v3.model.ConceptDescription;
@@ -47,6 +48,8 @@ public class AssetAdministrationShellEnvironmentSerializer extends JsonSerialize
     private static final QName CONCEPTDICTIONARY_TAGNAME = new QName(AasXmlNamespaceContext.AAS_URI, "conceptDescription");
     private static final QName SUBMODELLIST_TAGNAME = new QName(AasXmlNamespaceContext.AAS_URI, "submodels");
     private static final QName SUBMODEL_TAGNAME = new QName(AasXmlNamespaceContext.AAS_URI, "submodel");
+    private static final QName ASSETLIST_TAGNAME = new QName(AasXmlNamespaceContext.AAS_URI, "assets");
+    private static final QName ASSET_TAGNAME = new QName(AasXmlNamespaceContext.AAS_URI, "asset");
 
     private Map<String, String> namespacePrefixes;
 
@@ -94,10 +97,18 @@ private void writeOpeningTag(ToXmlGenerator xgen, XMLStreamWriter streamWriter)
 
     private void writeContent(AssetAdministrationShellEnvironment value, ToXmlGenerator xgen) throws IOException {
         writeAssetAdministrationShells(xgen, value.getAssetAdministrationShells());
+        writeAssets(xgen, value.getAssets());
         writeConceptDescriptions(xgen, value.getConceptDescriptions());
         writeSubmodels(xgen, value.getSubmodels());
     }
 
+    private void writeAssets(ToXmlGenerator xgen, List<Asset> assets) throws IOException {
+        if (assets.isEmpty()) {
+            return;
+        }
+        writeWrappedArray(xgen, ASSETLIST_TAGNAME, ASSET_TAGNAME, assets);
+    }
+
     private void writeAssetAdministrationShells(ToXmlGenerator xgen, List<AssetAdministrationShell> aasList)
             throws IOException {
         if (aasList.isEmpty()) {
diff --git a/dataformat-xml/src/main/resources/AAS.xsd b/dataformat-xml/src/main/resources/AAS.xsd
@@ -25,7 +25,7 @@
 	<complexType name="aasenv_t">
 		<sequence>
 			<element maxOccurs="1" minOccurs="0" name="assetAdministrationShells" type="aas:assetAdministrationShells_t"/>
-			<!--<element maxOccurs="1" minOccurs="0" name="assets" type="aas:assets_t"/>-->
+			<element maxOccurs="1" minOccurs="0" name="assets" type="aas:assets_t"/>
 			<element maxOccurs="1" minOccurs="0" name="conceptDescriptions" type="aas:conceptDescriptions_t"/>
 			<element maxOccurs="1" minOccurs="0" name="submodels" type="aas:submodels_t"/>
 		</sequence>
@@ -45,6 +45,12 @@
 			</extension>
 		</complexContent>
 	</complexType>
+	<complexType name="asset_t">
+		<sequence>
+			<group ref="aas:identifiable"/>
+			<group ref="aas:hasDataSpecification"/>
+		</sequence>
+	</complexType>
 	<complexType name="assetAdministrationShell_t">
 		<sequence>
 			<group ref="aas:identifiable"/>
@@ -75,6 +81,11 @@
 			<element maxOccurs="unbounded" minOccurs="0" name="specificAssetId" type="aas:identifierKeyValuePair_t"/>
 		</sequence>
 	</complexType>
+    <complexType name="assets_t">
+		<sequence>
+			<element maxOccurs="unbounded" minOccurs="0" name="asset" type="aas:asset_t"/>
+		</sequence>
+	</complexType>
 	<complexType name="basicEvent_t">
 		<complexContent>
 			<extension base="aas:eventAbstract_t">
diff --git a/dataformat-xml/src/test/resources/xmlExample.xml b/dataformat-xml/src/test/resources/xmlExample.xml
@@ -10,7 +10,7 @@
             <aas:submodelRefs>
                 <aas:submodelRef>
                     <aas:keys>
-                        <aas:key idType="Iri" type="Submodel">http.//i40.customer.com/type/1/1/7A7104BDAB57E184</aas:key>
+                        <aas:key idType="Iri" type="Submodel">http://i40.customer.com/type/1/1/7A7104BDAB57E184</aas:key>
                     </aas:keys>
                 </aas:submodelRef>
                 <aas:submodelRef>
@@ -60,6 +60,12 @@
             </aas:assetInformation>
         </aas:assetAdministrationShell>
     </aas:assetAdministrationShells>
+    <aas:assets>
+        <aas:asset>
+            <aas:idShort>ServoDCMotor</aas:idShort>
+            <aas:identification idType="Iri">http://customer.com/assets/KHBVZJSQKIY</aas:identification>
+        </aas:asset>
+    </aas:assets>
     <aas:conceptDescriptions>
         <aas:conceptDescription>
             <aas:idShort>Title</aas:idShort>
diff --git a/dataformat-xml/src/test/resources/xmlExampleWithModifiedPrefix.xml b/dataformat-xml/src/test/resources/xmlExampleWithModifiedPrefix.xml
@@ -10,7 +10,7 @@
             <test:submodelRefs>
                 <test:submodelRef>
                     <test:keys>
-                        <test:key idType="Iri" type="Submodel">http.//i40.customer.com/type/1/1/7A7104BDAB57E184</test:key>
+                        <test:key idType="Iri" type="Submodel">http://i40.customer.com/type/1/1/7A7104BDAB57E184</test:key>
                     </test:keys>
                 </test:submodelRef>
                 <test:submodelRef>
@@ -60,6 +60,16 @@
             </test:assetInformation>
         </test:assetAdministrationShell>
     </test:assetAdministrationShells>
+    <test:assets>
+        <test:asset>
+            <test:idShort>
+                ServoDCMotor
+            </test:idShort>
+            <test:identification idType="Iri">
+                http://customer.com/assets/KHBVZJSQKIY
+            </test:identification>
+        </test:asset>
+    </test:assets>
     <test:conceptDescriptions>
         <test:conceptDescription>
             <test:idShort>Title</test:idShort>

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`"keys": [`
`64`	`64`	`{`
`65`	`65`	`"type": "Submodel",`
`66`		`- "value": "http.//i40.customer.com/type/1/1/7A7104BDAB57E184",`
	`66`	`+ "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184",`
`67`	`67`	`"idType": "Iri"`
`68`	`68`	`}`
`69`	`69`	`]`
`@@ -89,6 +89,18 @@`
`89`	`89`	`]`
`90`	`90`	`}`
`91`	`91`	`],`
	`92`	`+ "assets": [`
	`93`	`+ {`
	`94`	`+ "modelType": {`
	`95`	`+ "name": "Asset"`
	`96`	`+ },`
	`97`	`+ "idShort": "ServoDCMotor",`
	`98`	`+ "identification": {`
	`99`	`+ "idType": "Iri",`
	`100`	`+ "id": "http://customer.com/assets/KHBVZJSQKIY"`
	`101`	`+ }`
	`102`	`+ }`
	`103`	`+ ],`
`92`	`104`	`"submodels": [`
`93`	`105`	`{`
`94`	`106`	`"modelType": {`