Fix/ua nodeset fixes (#41)

* Fix QualifierType

* Fix for Operations

* Fixes for Optional Category and AdministrativeInformation

* Updated NodeSet

* Operation Mapping

* Update Opc.Ua.I4AAS_V3Draft.NodeSet2.xml

* Folders are optional now, only created when list is not empty

* fix IdShort in test objects

* first adjustments to AASUtils resolve

* fix for NPE when no implementation class is available

* optimized logger statement

* Changed UAObject as Key since Reference Object might be duplicates

* experimental tests and adjustments

* Fix LangString for DisplayName

* Comment IDShort of CD

* Comment on missing mapping rule for KeyElements of CD

* Added missing ValueTypeParser

* Update ValueTypeMapper.java

* Test Updates with Validation

* Update IntegrationTests.java

* Added License Header

Author: br-iosb

.gitignore

@@ -34,3 +34,5 @@ local.properties
 **.flattened-pom.xml
 nbactions.xml
 testJsonSerialization.json
+dataformat-uanodeset/jsonExpected.json
+dataformat-uanodeset/jsonActual.json

dataformat-core/src/main/java/io/adminshell/aas/v3/dataformat/core/util/AasUtils.java

@@ -513,6 +513,11 @@ public static <T extends Referable> T resolve(Reference reference, AssetAdminist
         int i = reference.getKeys().size() - 1;
         if (type != null) {
             Class<?> actualType = keyTypeToClass(reference.getKeys().get(i).getType());
+            if (actualType == null) {
+                log.warn("reference {} could not be resolved as key type has no known class.",
+                        asString(reference));
+                return null;
+            }
             if (!type.isAssignableFrom(actualType)) {
                 log.warn("reference {} could not be resolved as target type is not assignable from actual type (target: {}, actual: {})",
                         asString(reference), type.getName(), actualType.getName());

dataformat-uanodeset/nodeset/i4aas/Opc.Ua.I4AAS_V3Draft.NodeSet2.csv

@@ -91,6 +91,7 @@ AASIdentifiableType_Identification,5037,Object
 AASKeyDataType_Encoding_DefaultBinary,5038,Object
 AASKeyDataType_Encoding_DefaultXml,5039,Object
 AASKeyDataType_Encoding_DefaultJson,5040,Object
+AASOperationType_InputVariable,5041,Object
 AASOrderedSubmodelElementCollectionType_SubmodelElement,5042,Object
 AASCustomConceptDescriptionType_DataSpecification,5043,Object
 AASIrdiConceptDescriptionType_IsCaseOf,5044,Object
@@ -100,6 +101,8 @@ AASEnvironmentType_AAS_AssetInformation_BillOfMaterial,5047,Object
 AASCustomConceptDescriptionType_IsCaseOf,5048,Object
 AASAssetInformationType_SpecificAssetId,5049,Object
 AASAssetAdministrationShellType_AssetInformation_SpecificAssetId,5050,Object
+AASOperationType_OutputVariable,5051,Object
+AASOperationType_InOutputVariable,5052,Object
 AASEnvironmentType_AAS_Identification,5101,Object
 AASEnvironmentType_Asset,5103,Object
 AASEnvironmentType_Asset_Administration,5150,Object

dataformat-uanodeset/nodeset/i4aas/Opc.Ua.I4AAS_V3Draft.NodeSet2.xml

@@ -24,6 +24,24 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.admin-shell.aas</groupId>
+            <artifactId>dataformat-json</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.admin-shell.aas</groupId>
+            <artifactId>validator</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>${jsonassert.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

dataformat-uanodeset/pom.xml

@@ -23,7 +23,8 @@
 import io.adminshell.aas.v3.model.AssetAdministrationShell;
 import io.adminshell.aas.v3.model.AssetInformation;
 
-public class AssetAdministrationShellMapper extends IdentifiableMapper<AssetAdministrationShell> implements HasDataSpecificationMapper {
+public class AssetAdministrationShellMapper extends IdentifiableMapper<AssetAdministrationShell>
+		implements HasDataSpecificationMapper {
 
 	public AssetAdministrationShellMapper(AssetAdministrationShell src, MappingContext ctx) {
 		super(src, ctx);
@@ -47,14 +48,15 @@ protected void mapAndAttachChildren() {
 
 	private void mapAsset() {
 		AssetInformation assetInformation = source.getAssetInformation();
-		if (assetInformation != null) {			
+		if (assetInformation != null) {
 			UAObject uaAsset = new AssetInformationMapper(assetInformation, ctx).map();
 			attachAsComponent(target, uaAsset);
 		}
 	}
 
 	private void mapSubmodels() {
-		UAObject smFolder = createReferenceList(AAS_SUBMODELREFERENCES_LIST_BROWSENAME);
+		UAObject smFolder = source.getSubmodels().isEmpty() ? null
+				: createReferenceList(AAS_SUBMODELREFERENCES_LIST_BROWSENAME);
 		List<io.adminshell.aas.v3.model.Reference> submodels = source.getSubmodels();
 		for (int i = 0; i < submodels.size(); i++) {
 			io.adminshell.aas.v3.model.Reference reference = submodels.get(i);

dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/AssetAdministrationShellMapper.java

@@ -55,8 +55,8 @@ protected void mapAndAttachChildren() {
 			attachAsComponent(target, uaIdentification);
 		}
 
-		UAObject uaBomList = createReferenceList(ASSETINFO_BILL_OF_MATERIAL_BROWSENAME);
 		List<Reference> billOfMaterials = source.getBillOfMaterials();
+		UAObject uaBomList = billOfMaterials.isEmpty() ? null : createReferenceList(ASSETINFO_BILL_OF_MATERIAL_BROWSENAME);
 		for (int i = 0; i < billOfMaterials.size(); i++) {
 			Reference reference = billOfMaterials.get(i);
 			UAObject uaBomListEntry = new ReferenceMapper(reference, ctx, ASSETINFO_BILL_OF_MATERIAL_BROWSENAME + "_" + i).map();
@@ -70,7 +70,7 @@ protected void mapAndAttachChildren() {
 			attachAsComponent(target, uaThumbnail);
 		}
 
-		UAObject folder = createIdentifierKeyValuePairList(ASSETINFO_SPECIFIC_ASSET_ID_BROWSENAME);
+		UAObject folder = source.getSpecificAssetIds().isEmpty() ? null : createIdentifierKeyValuePairList(ASSETINFO_SPECIFIC_ASSET_ID_BROWSENAME);
 		for (IdentifierKeyValuePair identifierKeyValuePair : source.getSpecificAssetIds()) {
 			UAObject uaIdKVP = new IdentifierKeyValuePairMapper(identifierKeyValuePair, ctx).map();
 			attachAsComponent(folder, uaIdKVP);

dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/AssetInformationMapper.java

@@ -23,7 +23,8 @@
 import io.adminshell.aas.v3.model.IdentifierType;
 import io.adminshell.aas.v3.model.Reference;
 
-public class ConceptDescriptionMapper extends IdentifiableMapper<ConceptDescription> implements HasDataSpecificationMapper {
+public class ConceptDescriptionMapper extends IdentifiableMapper<ConceptDescription>
+		implements HasDataSpecificationMapper {
 
 	public ConceptDescriptionMapper(ConceptDescription src, MappingContext ctx) {
 		super(src, ctx);
@@ -43,12 +44,12 @@ protected UAObject createTargetObject() {
 			} else if (IdentifierType.CUSTOM == idType) {
 				addTypeReference(I4AASIdentifier.AASCustomConceptDescriptionType);
 			}
-			if (identification.getIdentifier() != null) {
-				//conflict: I4AAS says idshort, OPC UA says value
-				target.setBrowseName(createModelBrowseName(identification.getIdentifier()));
-			}
+//			if (identification.getIdentifier() != null) {
+//				// TODO: I4AAS says idshort, OPC UA says value. Currently there is no mapping target for IdShort of ConceptDescription
+//				target.setBrowseName(createModelBrowseName(identification.getIdentifier()));
+//			}
 		}
-		
+
 		return target;
 	}
 
@@ -58,12 +59,11 @@ protected void mapAndAttachChildren() {
 
 		mapDataSpecification(source, target, ctx);
 
-		UAObject createFolder = createReferenceList("IsCaseOf");
+		UAObject createFolder = source.getIsCaseOfs().isEmpty() ? null : createReferenceList("IsCaseOf");
 		for (Reference reference : source.getIsCaseOfs()) {
 			UAObject uaRef = new ReferenceMapper(reference, ctx, reference.getKeys().get(0).getValue()).map();
 			attachAsComponent(createFolder, uaRef);
 		}
 	}
 
-
 }

dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/ConceptDescriptionMapper.java

@@ -31,8 +31,9 @@ public interface HasDataSpecificationMapper {
 
 	public default void mapDataSpecification(HasDataSpecification source, UAObject target, MappingContext ctx) {
 
-		UAObject folder = I4AASMapper.createFolder(target, I4AASConstants.DATASPECIFICATION_BROWSENAME, ctx,
-				I4AASIdentifier.AASReferenceList);
+		UAObject folder = source.getEmbeddedDataSpecifications().isEmpty() ? null
+				: I4AASMapper.createFolder(target, I4AASConstants.DATASPECIFICATION_BROWSENAME, ctx,
+						I4AASIdentifier.AASReferenceList);
 
 		List<EmbeddedDataSpecification> embeddedDataSpecifications = source.getEmbeddedDataSpecifications();
 		for (int i = 0; i < embeddedDataSpecifications.size(); i++) {

dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/HasDataSpecificationMapper.java

@@ -85,6 +85,9 @@ protected String deriveDefaultName() {
 		if (source instanceof io.adminshell.aas.v3.model.IdentifierType) {
 			return IDENTIFICATION_IDTYPE_BROWSENAME;
 		}
+		if (source instanceof io.adminshell.aas.v3.model.DataTypeIEC61360) {
+			return IDENTIFICATION_DATATYPE_BROWSENAME;
+		}
 		return source.getClass().getSimpleName();
 	}