updated dataformat-core, dataformat-aml, dataformat-xml

Author: mjacoby

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/Aas2AmlConfig.java

@@ -0,0 +1,20 @@
+/*
+ * 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.aml;
+
+public class AmlDeserializationConfig {
+
+}

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/Aml2AasConfig.java

@@ -17,7 +17,7 @@
 
 import io.adminshell.aas.v3.dataformat.DeserializationException;
 import io.adminshell.aas.v3.dataformat.Deserializer;
-import io.adminshell.aas.v3.dataformat.aml.aml2aas.Aml2AasObjectMapper;
+import io.adminshell.aas.v3.dataformat.aml.aml2aas.Aml2AasMapper;
 import io.adminshell.aas.v3.dataformat.aml.model.caex.CAEXFile;
 import io.adminshell.aas.v3.dataformat.mapping.MappingException;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
@@ -38,7 +38,7 @@ public AssetAdministrationShellEnvironment read(String value) throws Deserializa
             Unmarshaller unmarshaller = JAXBContextFactory.createContext(new Class[]{CAEXFile.class}, null).createUnmarshaller();
             StringReader reader = new StringReader(value);
             CAEXFile aml = (CAEXFile) unmarshaller.unmarshal(reader);
-            Aml2AasObjectMapper mapper = new Aml2AasObjectMapper(new Aml2AasConfig());
+            Aml2AasMapper mapper = new Aml2AasMapper(new AmlDeserializationConfig());
             return mapper.map(aml);
         } catch (JAXBException ex) {
             throw new DeserializationException("error deserializing AssetAdministrationShellEnvironment", ex);

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/AmlDeserializationConfig.java

@@ -1,3 +1,18 @@
+/*
+ * 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.aml;
 
 public class AmlDocumentInfo {

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/AmlDeserializer.java

@@ -0,0 +1,150 @@
+/*
+ * 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.aml;
+
+import io.adminshell.aas.v3.dataformat.aml.header.WriterInfo;
+import io.adminshell.aas.v3.dataformat.aml.id.UuidGenerator;
+import io.adminshell.aas.v3.dataformat.aml.id.IdGenerator;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class AmlSerializationConfig {
+
+    public static final String DEFAULT_SCHEMA_VERSION = "2.15";
+    public static final String DEFAULT_AML_VERSION = "2.0";
+    public static final String DEFAULT_FILENAME = "AssetAdministrationShellEnvironment.aml";
+    public static final AmlSerializationConfig DEFAULT = new Builder().build();
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    private final IdGenerator idGenerator;
+    private final String schemaVersion;
+    private final String amlVersion;
+    private final String filename;
+    private final boolean includeLibraries;
+    private final WriterInfo writerInfo;
+    private final List<Object> additionalInformation;
+
+    private AmlSerializationConfig(
+            IdGenerator idGenerator,
+            String schemaVersion,
+            String amlVersion,
+            String filename,
+            boolean includeLibraries,
+            WriterInfo writerInfo,
+            List<Object> additionalInformation) {
+        this.idGenerator = idGenerator;
+        this.schemaVersion = schemaVersion;
+        this.amlVersion = amlVersion;
+        this.filename = filename;
+        this.includeLibraries = includeLibraries;
+        this.writerInfo = writerInfo;
+        this.additionalInformation = additionalInformation;
+    }
+
+    public boolean isIncludeLibraries() {
+        return includeLibraries;
+    }
+
+    public IdGenerator getIdGenerator() {
+        return idGenerator;
+    }
+
+    public List<Object> getAdditionalInformation() {
+        return additionalInformation;
+    }
+
+    public String getSchemaVersion() {
+        return schemaVersion;
+    }
+
+    public String getAmlVersion() {
+        return amlVersion;
+    }
+
+    public WriterInfo getWriterInfo() {
+        return writerInfo;
+    }
+
+    public static class Builder {
+
+        private IdGenerator idGenerator = new UuidGenerator();
+        private String schemaVersion = DEFAULT_SCHEMA_VERSION;
+        private String amlVersion = DEFAULT_AML_VERSION;
+        private String filename = DEFAULT_FILENAME;
+        private boolean includeLibraries = true;
+        private WriterInfo writerInfo = null;
+        private List<Object> additionalInformation = new ArrayList<>();
+
+        public AmlSerializationConfig build() {
+            return new AmlSerializationConfig(
+                    idGenerator,
+                    schemaVersion,
+                    amlVersion,
+                    filename,
+                    includeLibraries,
+                    writerInfo,
+                    additionalInformation);
+        }
+
+        public Builder includeLibraries() {
+            this.includeLibraries = true;
+            return this;
+        }
+
+        public Builder excludeLibraries() {
+            this.includeLibraries = true;
+            return this;
+        }
+
+        public Builder idGenerator(IdGenerator idGenerator) {
+            this.idGenerator = idGenerator;
+            return this;
+        }
+
+        public Builder schemaVersion(String value) {
+            this.schemaVersion = value;
+            return this;
+        }
+
+        public Builder amlVersion(String value) {
+            this.amlVersion = value;
+            return this;
+        }
+
+        public Builder filename(String value) {
+            this.filename = value;
+            return this;
+        }
+
+        public Builder writerInfo(WriterInfo value) {
+            this.writerInfo = value;
+            return this;
+        }
+
+        public Builder additionalInformation(Object... values) {
+            this.additionalInformation.addAll(Arrays.asList(values));
+            return this;
+        }
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+}

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/AmlDocumentInfo.java

@@ -19,7 +19,7 @@
 import io.adminshell.aas.v3.dataformat.SerializationException;
 import io.adminshell.aas.v3.dataformat.Serializer;
 import io.adminshell.aas.v3.dataformat.aml.header.AutomationMLVersion;
-import io.adminshell.aas.v3.dataformat.aml.header.WriterHeader;
+import io.adminshell.aas.v3.dataformat.aml.header.WriterInfo;
 import io.adminshell.aas.v3.dataformat.aml.model.caex.CAEXFile;
 import io.adminshell.aas.v3.dataformat.mapping.MappingException;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
@@ -42,23 +42,21 @@ public AmlSerializer() {
 
     @Override
     public String write(AssetAdministrationShellEnvironment aasEnvironment) throws SerializationException {
-        return write(aasEnvironment, Aas2AmlConfig.DEFAULT);
+        return write(aasEnvironment, AmlSerializationConfig.DEFAULT);
     }
 
-    public String write(AssetAdministrationShellEnvironment aasEnvironment, Aas2AmlConfig config) throws SerializationException {
-        AasToAmlMapper mapper = new AasToAmlMapper(config);
+    public String write(AssetAdministrationShellEnvironment aasEnvironment, AmlSerializationConfig config) throws SerializationException {
         try {
-            CAEXFile aml = mapper.map(aasEnvironment);
+            CAEXFile aml = new AasToAmlMapper().map(aasEnvironment, config);
             if (config.isIncludeLibraries()) {
                 aml = addAASLibrary(aml);
             }
-            Marshaller marshaller = JAXBContextFactory.createContext(
-                    new Class[]{
-                        CAEXFile.class,
-                        AutomationMLVersion.class,
-                        WriterHeader.class,
-                        WriterHeader.Wrapper.class
-                    },
+            Marshaller marshaller = JAXBContextFactory.createContext(new Class[]{
+                CAEXFile.class,
+                AutomationMLVersion.class,
+                WriterInfo.class,
+                WriterInfo.Wrapper.class
+            },
                     null).createMarshaller();
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
             StringWriter writer = new StringWriter();