minor fixes

Author: br-iosb

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

@@ -2,17 +2,26 @@
 
 import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
 import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import io.adminshell.aas.v3.dataformat.core.serialization.EmbeddedDataSpecificationSerializer;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.model.HasKind;
+import io.adminshell.aas.v3.model.ModelingKind;
 
 public interface HasKindMapper {
 
+	static final Logger logger = LoggerFactory.getLogger(HasKindMapper.class);
+
 	default void mapKind(HasKind kind, UAObject target, MappingContext ctx) {
-		if (kind.getKind() != null) {
-			UAVariable mappedKind = new I4AASEnumMapper(kind.getKind(), ctx).map();
-			I4AASMapper.attachAsProperty(target, mappedKind);
+		ModelingKind modelingKind = kind.getKind();
+		if (modelingKind == null) {
+			logger.warn("Missing ModelingKind attribute, fallback to 'Instance'");
+			modelingKind = ModelingKind.INSTANCE;
 		}
+		UAVariable mappedKind = new I4AASEnumMapper(modelingKind, ctx).map();
+		I4AASMapper.attachAsProperty(target, mappedKind);
 	}
 
 }

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

@@ -26,7 +26,7 @@ default void mapSemantics(HasSemantics source, UAObject target, MappingContext c
 			UANode nodeForIdentification = ctx.getNodeIdForIdentification(key.getValue());
 
 
-			if (nodeForIdentification == null) {
+			if (nodeForIdentification == null && key.getValue() != null && !key.getValue().isBlank()) {
 				nodeForIdentification = fixedConceptDescription(ctx, key);
 			}
 
@@ -70,7 +70,7 @@ public String getIdentifier() {
 			}
 			@Override
 			public IdentifierType getIdType() {
-				return IdentifierType.valueOf(key.getIdType().name());
+				return key.getIdType() == null ? null : IdentifierType.valueOf(key.getIdType().name());
 			}
 		});
 

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

@@ -34,8 +34,6 @@ protected UAVariable createTargetObject() {
 
 	@Override
 	protected void mapAndAttachChildren() {
-		// TODO Auto-generated method stub
-
 	}
 
 }

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

@@ -27,7 +27,7 @@ protected void mapAndAttachChildren() {
 		super.mapAndAttachChildren();
 		String mimeType = source.getMimeType();
 		if (mimeType != null) {
-			UAVariable map = new StringPropertyMapper("MimeType", mimeType, ctx, ctx.getI4aasNsIndex()).map();
+			UAVariable map = new MimeTypeMapper(mimeType, ctx).map();
 			attachAsProperty(target, map);
 		}
 		byte[] value = source.getValue();

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

@@ -40,7 +40,7 @@ protected void mapAndAttachChildren() {
 			attachAsProperty(target, map);
 		}
 		if (source.getValue() != null) {
-			UAVariable map = new StringPropertyMapper("Value", source.getValue(), ctx, ctx.getI4aasNsIndex()).map();
+			UAVariable map = new PathTypeMapper(source.getValue(), ctx).map();
 			attachAsProperty(target, map);
 		}
 	}

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

@@ -0,0 +1,35 @@
+package io.adminshell.aas.v3.dataformat.i4aas.mappers.sme;
+
+import javax.xml.bind.JAXBElement;
+
+import org.opcfoundation.ua._2008._02.types.ObjectFactory;
+import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.I4AASMapper;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
+
+public class PathTypeMapper extends I4AASMapper<String, UAVariable> {
+
+	public PathTypeMapper(String src, MappingContext ctx) {
+		super(src, ctx);
+	}
+
+	@Override
+	protected UAVariable createTargetObject() {
+		JAXBElement<String> idStringValue = new ObjectFactory().createString(source);
+		org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Builder<Void> idVarBuilder = UAVariable.builder()
+				.withValue().withAny(idStringValue).end().withDisplayName(createLocalizedText("Value"))
+				.withDataType(I4aasId.AASPathDataType.getName()).withNodeId(ctx.newModelNodeIdAsString())
+				.withBrowseName(createI4AASBrowseName("Value")).withAccessLevel(3L);
+		target = idVarBuilder.build();
+		addTypeReferenceFor(target, UaId.PropertyType);
+		return target;
+	}
+
+	@Override
+	protected void mapAndAttachChildren() {
+	}
+
+}