adding sample new mappings, #38

SoftwareAG · Jul 7, 2023 · 719e717 · 719e717
1 parent 22ab6fa
commit 719e717
Show file tree

Hide file tree

Showing 7 changed files with 1,237 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ bin/
 .vscode/settings.json
 resources/script/createSampleMappings_private.sh
 resources/script/attic/createSampleMappings_private.sh
+attic/*
diff --git a/mqtt-mapping-service/src/main/java/mqtt/mapping/model/MappingSubstitution.java b/mqtt-mapping-service/src/main/java/mqtt/mapping/model/MappingSubstitution.java
@@ -62,8 +62,12 @@ public Object typedValue() {
             switch (type) {
                 case OBJECT:
                 case ARRAY:
-                    dc = JsonPath.parse(value.toString());
-                    result = dc.read("$");
+                    if (value != null && !value.isNull()) {
+                        dc = JsonPath.parse(value.toString());
+                        result = dc.read("$");
+                    } else {
+                        result= value;
+                    }
                     return result;
                 case IGNORE:
                     return null;

diff --git a/mqtt-mapping-service/src/main/java/mqtt/mapping/processor/inbound/BasePayloadProcessor.java b/mqtt-mapping-service/src/main/java/mqtt/mapping/processor/inbound/BasePayloadProcessor.java
@@ -219,8 +219,9 @@ public ProcessingContext<T> substituteInTargetAndSend(ProcessingContext<T> conte
 
     public void substituteValueInObject(SubstituteValue sub, DocumentContext jsonObject, String keys)
             throws JSONException {
-        boolean subValueEmpty = sub.value == null || sub.value.isEmpty();
-        if (( sub.repairStrategy.equals(RepairStrategy.REMOVE_IF_MISSING) || sub.repairStrategy.equals(RepairStrategy.REMOVE_IF_NULL)) && subValueEmpty) {
+        boolean subValueMissing = sub.value == null ;
+        boolean subValueNull = sub.value.isNull() ;
+        if (( sub.repairStrategy.equals(RepairStrategy.REMOVE_IF_MISSING) && subValueMissing ) || ( sub.repairStrategy.equals(RepairStrategy.REMOVE_IF_NULL) && subValueNull)) {
             jsonObject.delete(keys);
         } else {
             jsonObject.set(keys, sub.typedValue());

diff --git a/mqtt-mapping-ui/mqtt-mapping/src/mqtt-mapping/stepper/mapping-stepper.component.ts b/mqtt-mapping-ui/mqtt-mapping/src/mqtt-mapping/stepper/mapping-stepper.component.ts
@@ -684,7 +684,7 @@ export class MappingStepperComponent implements OnInit, AfterContentChecked {
               label: "Repair strategy",
               description: `Strategy defining what should happen when extracted arrays in
               different expressions do not have the same size. How are missing values handled?`,
-              options: Object.keys(RepairStrategy).map((key) => {
+              options: Object.keys(RepairStrategy).filter( (key) =>  key != 'IGNORE' ).map((key) => {
                 return {
                   label: key,
                   value: key,

diff --git a/resources/script/mapping/sampleMapping/Sample Mappings 05.pdf b/resources/script/mapping/sampleMapping/Sample Mappings 05.pdf
diff --git a/resources/script/mapping/sampleMapping/Sample Mappings 05.xlsx b/resources/script/mapping/sampleMapping/Sample Mappings 05.xlsx