Merge pull request #12 from kenwenzel/refactor-and-adapt

Partially fixed TransformationIntegrationTest.

Author: br-iosb

src/main/java/com/sap/dsc/aas/lib/expressions/Expressions.java

@@ -10,20 +10,20 @@
 import static com.sap.dsc.aas.lib.expressions.Helpers.valueToStream;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.Stack;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import org.dom4j.Node;
+
 import com.google.common.hash.Hashing;
 
 public class Expressions {
@@ -137,6 +137,19 @@ public class Expressions {
 			String concatenated = stream.map(Object::toString).collect(Collectors.joining());
 			return Hashing.sha256().hashString(concatenated, StandardCharsets.UTF_8).toString();
 		});
+
+		// string encoding
+        functions.put("base64", args -> {
+            Stream<Object> stream = (Stream<Object>) valueToStream(args);
+            String concatenated = stream.flatMap(o -> valueToStream(o)).map(o -> {
+                if (o instanceof Node) {
+                    return ((Node) o).getStringValue();
+                } else {
+                    return String.valueOf(o);
+                }
+            }).collect(Collectors.joining());
+            return Base64.getEncoder().encodeToString(concatenated.getBytes());
+        });
     }
 
     public static Function<Object, Object> getFunctionByName(String name) {

src/test/java/com/sap/dsc/aas/lib/TransformationIntegrationTest.java

@@ -384,7 +384,7 @@ SubmodelElement getElement(String idShort, Submodel submodel) {
         assertThat(submodel.getSubmodelElements()).isNotNull();
 
         return submodel.getSubmodelElements().stream()
-            .filter(submodelElement -> submodelElement.getIdShort().equals(idShort))
+            .filter(submodelElement -> idShort.equals(submodelElement.getIdShort()))
             .findFirst()
             .orElseThrow(() -> new AssertionFailedError("SubmodelElement with IdShort '" + idShort + "' not found"));
     }
@@ -393,7 +393,7 @@ Submodel getSubmodel(String idShort) {
         assertNotNull(shellEnv.getSubmodels());
 
         return shellEnv.getSubmodels().stream()
-            .filter(submodel -> submodel.getIdShort().equals(idShort))
+            .filter(submodel -> idShort.equals(submodel.getIdShort()))
             .findFirst()
             .orElseThrow(() -> new AssertionFailedError("Submodel with IdShort '" + idShort + "' not found"));
     }

src/test/resources/config/simpleConfig.json

@@ -33,19 +33,17 @@
       }
     },
     "@variables": {
-      "submodel3Id": {
-        "@xpath": "submodel3"
-      },
+      "submodel3Id": "submodel3",
       "submodelDocsId": "submodelDocuments"
     }
   },
   "aasEnvironmentMapping": {
+    "@foreach": {
+      "@xpath": "//caex:SystemUnitClass[caex:SupportedRoleClass/@RefRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent' or caex:RoleRequirements/@RefBaseRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent'] | //caex:InternalElement[caex:SupportedRoleClass/@RefRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent' or caex:RoleRequirements/@RefBaseRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent']"
+    },
     "assets": [],
     "assetAdministrationShells": [
       {
-        "@foreach": {
-          "@xpath": "//caex:SystemUnitClass[caex:SupportedRoleClass/@RefRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent' or caex:RoleRequirements/@RefBaseRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent'] | //caex:InternalElement[caex:SupportedRoleClass/@RefRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent' or caex:RoleRequirements/@RefBaseRoleClassPath='AutomationMLComponentStandardRCL/AutomationComponent']"
-        },
         "@bind": {
           "idShort": {
             "@xpath": "@Name"
@@ -88,9 +86,7 @@
           ]
         },
         "@variables": {
-          "submodel3Id": {
-            "@xpath": "this is an updated Variable"
-          }
+          "submodel3Id": "this is an updated Variable"
         },
         "identification": {
           "@bind": {
@@ -255,10 +251,10 @@
                 "value": [
                   {
                     "@bind": {
-                      "lang": {
+                      "language": {
                         "@xpath": "'en'"
                       },
-                      "value": {
+                      "text": {
                         "@xpath": "caex:Value"
                       }
                     }
@@ -325,7 +321,12 @@
       },
       {
         "@foreach": {
-          "@xpath": "caex:Attribute[@Name='GeneralTechnicalData']"
+          "@caexAttributeName": "GeneralTechnicalData"
+        },
+        "@bind": {
+          "idShort": {
+            "@xpath": "@Name"
+          }
         },
         "semanticId": {
           "keys": [
@@ -354,6 +355,11 @@
             "@foreach": {
               "@caexAttributeName": "AmbientTemperature"
             },
+            "@bind": {
+              "idShort": {
+                "@xpath": "@Name"
+              }
+            },
             "modelType": {
               "name": "Range"
             },
@@ -378,16 +384,50 @@
             "@foreach": {
               "@caexAttributeName": "Material"
             },
+            "@bind": {
+              "idShort": {
+                "@xpath": "@Name"
+              }
+            },
             "modelType": {
               "name": "MultiLanguageProperty"
-            }
+            },
+            "value": [
+              {
+                "@foreach": {
+                  "@caexAttributeName": "aml-lang=en-US"
+                },
+                "@bind": {
+                  "language": "en",
+                  "text": {
+                    "@xpath": "caex:Value"
+                  }
+                }
+              },
+              {
+                "@foreach": {
+                  "@caexAttributeName": "aml-lang=de-DE"
+                },
+                "@bind": {
+                  "language": "de",
+                  "text": {
+                    "@xpath": "caex:Value"
+                  }
+                }
+              }
+            ]
           }
         ]
       },
       {
         "@foreach": {
           "@caexAttributeName": "ParameterData"
         },
+        "@bind": {
+          "idShort": {
+            "@xpath": "@Name"
+          }
+        },
         "semanticId": {
           "keys": [
             {
@@ -497,7 +537,9 @@
                 "@xpath": "'BetriebsanleitungBIN'"
               },
               "value": {
-                "@xpath": "caex:Attribute[@Name='refURI']/caex:Value"
+                "@base64": {
+                  "@xpath": "caex:Attribute[@Name='refURI']/caex:Value"
+                }
               },
               "mimeType": {
                 "@xpath": "caex:Attribute[@Name='MIMEType']/caex:Value"