Merge branch 'feature/i4aas_deserialize' into feature/i4aas

Author: br-iosb

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.adminshell.aas.v3.dataformat.i4aas;
+
+import java.util.List;
+
+import javax.xml.bind.JAXBException;
+
+import org.opcfoundation.ua._2011._03.uanodeset.UANode;
+import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
+
+import io.adminshell.aas.v3.dataformat.DeserializationException;
+import io.adminshell.aas.v3.dataformat.Deserializer;
+import io.adminshell.aas.v3.dataformat.i4aas.parsers.EnvironmentParser;
+import io.adminshell.aas.v3.dataformat.i4aas.parsers.ParserContext;
+import io.adminshell.aas.v3.dataformat.i4aas.parsers.UANodeWrapper;
+import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
+
+public class I4AASDeserializer implements Deserializer {
+
+	@Override
+	public AssetAdministrationShellEnvironment read(String value) throws DeserializationException {
+		try {
+			UANodeSet uaNodeSet = new UANodeSetUnmarshaller().unmarshall(value);
+			ParserContext parserContext = new ParserContext(uaNodeSet);
+			UANodeWrapper environment = parserContext.getPreparsedEnvironment();
+			return new EnvironmentParser(environment, new ParserContext(uaNodeSet)).parse();
+		} catch (JAXBException e) {
+			throw new DeserializationException("Deserialization failed due to a JAXBException.", e);
+		}
+	}
+
+	protected UANode findAASEnvironment(UANodeSet nodeSet) throws DeserializationException {
+		List<UANode> uaObjectOrUAVariableOrUAMethod = nodeSet.getUAObjectOrUAVariableOrUAMethod();
+		for (UANode uaNode : uaObjectOrUAVariableOrUAMethod) {
+			if (uaNode.getBrowseName().contains("AASEnvironment")) {
+				return uaNode;
+			}
+		}
+		throw new DeserializationException("No AASEnvironment found.");
+	}
+
+	@Override
+	public <T> void useImplementation(Class<T> aasInterface, Class<? extends T> implementation) {
+	}
+
+}

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

@@ -22,7 +22,7 @@
 import io.adminshell.aas.v3.dataformat.SerializationException;
 import io.adminshell.aas.v3.dataformat.Serializer;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.EnvironmentMapper;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
+import io.adminshell.aas.v3.dataformat.i4aas.mappers.MappingContext;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 
 public class I4AASSerializer implements Serializer {

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.adminshell.aas.v3.dataformat.i4aas;
+
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
+import org.opcfoundation.ua._2008._02.types.ListOfExtensionObject;
+import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
+import org.opcfoundation.ua.i4aas.types.AASKeyDataType;
+
+public class UANodeSetUnmarshaller {
+
+	private JAXBContext jaxbCtx;
+	private Unmarshaller unmarshaller;
+
+	public UANodeSetUnmarshaller() throws JAXBException {
+		jaxbCtx = org.eclipse.persistence.jaxb.JAXBContextFactory.createContext(
+				new Class[] { UANodeSet.class, ListOfExtensionObject.class, AASKeyDataType.class }, null);
+		unmarshaller = jaxbCtx.createUnmarshaller();
+	}
+
+	public UANodeSet unmarshall(String input) throws JAXBException {
+		return (UANodeSet) unmarshaller.unmarshal(new StringReader(input));
+	}
+
+	public UANodeSet unmarshall(InputStream input) throws JAXBException {
+		return (UANodeSet) unmarshaller.unmarshal(input);
+	}
+}

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

@@ -20,7 +20,6 @@
 
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.model.AdministrativeInformation;
 
 public class AdministrationMapper extends I4AASMapper<AdministrativeInformation, UAObject>

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

@@ -19,7 +19,6 @@
 
 import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.model.AssetAdministrationShell;
 import io.adminshell.aas.v3.model.AssetInformation;
 import io.adminshell.aas.v3.model.DataTypeIEC61360;

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

@@ -21,7 +21,6 @@
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.sme.FileMapper;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
 import io.adminshell.aas.v3.model.AssetInformation;
 import io.adminshell.aas.v3.model.AssetKind;

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

@@ -21,7 +21,6 @@
 import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
 
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
 
 public class BooleanPropertyMapper extends I4AASMapper<Boolean, UAVariable> {

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

@@ -20,7 +20,6 @@
 import org.opcfoundation.ua._2008._02.types.ObjectFactory;
 import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
 
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
 
 public class ByteStringPropertyMapper extends I4AASMapper<byte[], UAVariable> {

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

@@ -18,7 +18,6 @@
 import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
 
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.model.ConceptDescription;
 import io.adminshell.aas.v3.model.IdentifierType;
 import io.adminshell.aas.v3.model.Reference;

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

@@ -20,7 +20,6 @@
 
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
 import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
-import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
 import io.adminshell.aas.v3.model.DataSpecificationIEC61360;
 import io.adminshell.aas.v3.model.DataTypeIEC61360;
 import io.adminshell.aas.v3.model.Reference;