fix: fix try-catch on-when expression object

Fixes: #554
KaotoIO · Mar 24, 2023 · d92edf5 · d92edf5
1 parent 6bb67a0
commit d92edf5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/api/src/test/java/io/kaoto/backend/api/resource/v1/IntegrationsResourceTest.java b/api/src/test/java/io/kaoto/backend/api/resource/v1/IntegrationsResourceTest.java
@@ -336,7 +336,7 @@ void expressionObject() throws Exception {
         System.out.println(yaml2);
         List<Object> parsed = new Yaml().load(yaml2);
         List<Object> steps = (List<Object>) ((Map)((Map)parsed.get(0)).get("from")).get("steps");
-        assertEquals(19, steps.size());
+        assertEquals(20, steps.size());
         var choice = (Map<String, Object>) ((Map<String, Object>) steps.get(0)).get("choice");
         var when0 = (Map<String, Object>) ((List<Object>)choice.get("when")).get(0);
         assertExpression("choice", "simple", when0);
@@ -376,6 +376,10 @@ void expressionObject() throws Exception {
         assertExpression("transform", "jq", transform);
         var validate =  (Map<String, Object>) ((Map<String, Object>) steps.get(18)).get("validate");
         assertExpression("validate", "simple", validate);
+        var dotry = (Map<String, Object>) ((Map<String, Object>) steps.get(19)).get("do-try");
+        var docatch0 = (Map<String, Object>) ((List<Object>) dotry.get("do-catch")).get(0);
+        var onwhen = (Map<String, Object>) docatch0.get("on-when");
+        assertExpression("on-when", "simple", onwhen);
     }
 
     private void assertExpression(String name, String syntax, Map<String, Object> step) {

diff --git a/api/src/test/resources/io/kaoto/backend/api/resource/expression-object.yaml b/api/src/test/resources/io/kaoto/backend/api/resource/expression-object.yaml
@@ -80,3 +80,15 @@
           expression:
             simple:
               expression: validate
+      - do-try:
+          steps: [ ]
+          do-catch:
+            - exception:
+                - java.lang.Exception
+              on-when:
+                expression:
+                  simple:
+                    expression: on-when
+              steps: [ ]
+          do-finally:
+            steps: [ ]
diff --git a/...upport/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Expression.java b/...upport/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Expression.java
@@ -105,7 +105,10 @@ protected void setPropertiesFromMap(final Map map, final Expression expression)
             expression.setResultType(String.valueOf(map.get(RESULT_TYPE2)));
         }
         if (map.containsKey(EXPRESSION_LABEL) && map.get(EXPRESSION_LABEL) != null) {
-            expression.setExpression((Expression) map.get(EXPRESSION_LABEL));
+            Object nested = map.get(EXPRESSION_LABEL);
+            Expression nestedExpression =
+                    nested instanceof Expression ne ? ne : new Expression(nested);
+            expression.setExpression(nestedExpression);
         }
         if (map.containsKey("id") && map.get("id") != null) {
             expression.setId(String.valueOf(map.get("id")));

diff --git a/.../src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/ScriptExpression.java b/.../src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/ScriptExpression.java
@@ -88,7 +88,10 @@ protected void setPropertiesFromMap(final Map map, final ScriptExpression expres
             expression.setResultType(String.valueOf(map.get(RESULT_TYPE2)));
         }
         if (map.containsKey(EXPRESSION_LABEL) && map.get(EXPRESSION_LABEL) != null) {
-            expression.setExpression((ScriptExpression) map.get(EXPRESSION_LABEL));
+            Object nested = map.get(EXPRESSION_LABEL);
+            ScriptExpression nestedExpression =
+                    nested instanceof ScriptExpression ne ? ne : new ScriptExpression(nested);
+            expression.setExpression(nestedExpression);
         }
         if (map.containsKey("id") && map.get("id") != null) {
             expression.setId(String.valueOf(map.get("id")));