Merge pull request #8 from JensMueller2709/feature/aml-deserializer

accepted merge request Feature/aml deserializer

Author: br-iosb

dataformat-aml/pom.xml

@@ -66,6 +66,11 @@
             <version>${xmlunit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>5.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -15,17 +15,9 @@
  */
 package io.adminshell.aas.v3.dataformat.aml.deserialization;
 
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.AssetAdministrationShellEnvironmentMapper;
+import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.*;
 import io.adminshell.aas.v3.dataformat.aml.AmlDeserializationConfig;
 import io.adminshell.aas.v3.dataformat.aml.AmlDocumentInfo;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.AssetAdministrationShellMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.EnumMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.IdentifiableMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.LangStringCollectionMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.ReferableMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.ReferenceElementMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.ReferenceMapper;
-import io.adminshell.aas.v3.dataformat.aml.deserialization.mappers.RelationshipElementMapper;
 import io.adminshell.aas.v3.dataformat.aml.model.caex.CAEXFile;
 import io.adminshell.aas.v3.dataformat.aml.serialization.naming.AbstractClassNamingStrategy;
 import io.adminshell.aas.v3.dataformat.aml.serialization.naming.NumberingClassNamingStrategy;
@@ -36,6 +28,9 @@
 import io.adminshell.aas.v3.model.Identifiable;
 import io.adminshell.aas.v3.model.MultiLanguageProperty;
 import io.adminshell.aas.v3.model.Referable;
+import io.adminshell.aas.v3.model.Qualifiable;
+
+
 import java.util.List;
 
 /**
@@ -71,12 +66,24 @@ public AssetAdministrationShellEnvironment map(CAEXFile aml) throws MappingExcep
         mappingProvider.register(new ReferenceElementMapper());
         mappingProvider.register(new ReferableMapper<Referable>());
         mappingProvider.register(new IdentifiableMapper<Identifiable>());
+        mappingProvider.register(new ConstraintCollectionMapper());
+        mappingProvider.register(new QualifierMapper());
+        mappingProvider.register(new OperationCollectionMapper());
+        mappingProvider.register(new FileMapper());
+        mappingProvider.register(new RangeMapper());
+        mappingProvider.register(new ViewMapper());
+        mappingProvider.register(new PropertyMapper());
+        mappingProvider.register(new ConceptDescriptionMapper());
+        mappingProvider.register(new EmbeddedDataSpecificationCollectionMapper());
+        mappingProvider.register(new DataSpecificationIEC61360Mapper());
+        mappingProvider.register(new EnumDataTypeIEC61360Mapper());
         AbstractClassNamingStrategy classNamingStrategy = new NumberingClassNamingStrategy();
 
         PropertyNamingStrategy propertyNamingStrategy = new PropertyNamingStrategy();
         propertyNamingStrategy.registerCustomNaming(Referable.class, "descriptions", "description");
         propertyNamingStrategy.registerCustomNaming(MultiLanguageProperty.class, "values", "value");
-//        propertyNamingStrategy.registerCustomNaming(Qualifier.class, x -> "qualifier:" + x.getType() + "=" + x.getValue(), false);
+        //propertyNamingStrategy.registerCustomNaming(Qualifier.class, x -> "qualifier:" + x.getType() + "=" + x.getValue(), false);
+        propertyNamingStrategy.registerCustomNaming(Qualifiable.class, "qualifiers", "qualifier","qualifier");
         MappingContext context = new MappingContext(mappingProvider, classNamingStrategy, propertyNamingStrategy, config.getTypeFactory());
         context.setDocumentInfo(AmlDocumentInfo.fromFile(aml));
         AssetAdministrationShellEnvironment result = context.map(AssetAdministrationShellEnvironment.class, parser);

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

@@ -42,6 +42,9 @@ public class AmlParser {
     private final Map<String, Reference> idToReference = new HashMap<>();
     private final Map<ObjectLocationByProperty, List<String>> idsToResolve = new HashMap<>();
 
+    public static final String DEFAULT_REFSEMANTIC_PREFIX = "AAS";
+    private String refSemanticPrefix = DEFAULT_REFSEMANTIC_PREFIX;
+
     public AmlParser(CAEXFile content) {
         this.content = content;
     }
@@ -177,4 +180,31 @@ private ObjectLocationByProperty(Object parent, PropertyDescriptor property) {
     public Map<String, Reference> getIdToReference() {
         return idToReference;
     }
+
+    /**
+     * Gets the prefix for the RefSemantic
+     *
+     * @return
+     */
+    public String getRefSemanticPrefix() {
+        return refSemanticPrefix;
+    }
+
+    /**
+     * Sets the prefix for the RefSemantic
+     *
+     * @param refSemanticPrefix
+     */
+    public void setRefSemanticPrefix(String refSemanticPrefix) {
+        this.refSemanticPrefix = refSemanticPrefix;
+    }
+
+    /**
+     * Sets the prefix for the RefSemantic to the default value
+     *
+     */
+    public void setRefSemanticPrefixToDefault() {
+        this.refSemanticPrefix = DEFAULT_REFSEMANTIC_PREFIX;
+    }
+
 }