Fix expression support in native mode

the Expression related classes were missing from native build; Registered all of them for reflection. It might be possible to be more specific and register a single one. to be investigated and potentially improved in another iteration fixes #617 Signed-off-by: Aurélien Pupier <[email protected]>
KaotoIO · Apr 10, 2023 · 1aea59f · 1aea59f
1 parent 8e657fb
commit 1aea59f
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 0 deletions.
diff --git a/...t-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/CSimple.java b/...t-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/CSimple.java
@@ -3,10 +3,13 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.util.HashMap;
 import java.util.Map;
 
 @JsonPropertyOrder({CSimple.EXPRESSION_LABEL, CSimple.ID_LABEL, CSimple.RESULT_TYPE_LABEL, CSimple.TRIM_LABEL})
+@RegisterForReflection
 public class CSimple {
     public static final String EXPRESSION_LABEL = "expression";
     public static final String ID_LABEL = "id";

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
@@ -7,10 +7,12 @@
 import io.kaoto.backend.model.deployment.kamelet.step.EIPStep;
 import io.kaoto.backend.model.parameter.Parameter;
 import io.kaoto.backend.model.step.Step;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.Map;
 
 @JsonPropertyOrder({"name", "constant", "simple", "jq", "jsonpath", "expression"})
+@RegisterForReflection
 public class Expression extends EIPStep {
     public static final String CONSTANT_LABEL = KameletRepresenter.CONSTANT;
     public static final String SIMPLE_LABEL = KameletRepresenter.SIMPLE;

diff --git a/...et-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Groovy.java b/...et-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Groovy.java
@@ -3,10 +3,13 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.util.HashMap;
 import java.util.Map;
 
 @JsonPropertyOrder({Groovy.EXPRESSION_LABEL, Groovy.ID_LABEL, Groovy.RESULT_TYPE_LABEL, Groovy.TRIM_LABEL})
+@RegisterForReflection
 public class Groovy {
     public static final String EXPRESSION_LABEL = "expression";
     public static final String ID_LABEL = "id";

diff --git a/...upport/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Javascript.java b/...upport/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Javascript.java
@@ -3,6 +3,8 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -11,6 +13,7 @@
         Javascript.ID_LABEL,
         Javascript.RESULT_TYPE_LABEL,
         Javascript.TRIM_LABEL})
+@RegisterForReflection
 public class Javascript {
     public static final String EXPRESSION_LABEL = "expression";
     public static final String ID_LABEL = "id";

diff --git a/kamelet-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Jq.java b/kamelet-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Jq.java
@@ -3,10 +3,13 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.util.HashMap;
 import java.util.Map;
 
 @JsonPropertyOrder({Jq.EXPRESSION_LABEL, Jq.ID_LABEL, Jq.RESULT_TYPE_LABEL, Jq.TRIM_LABEL})
+@RegisterForReflection
 public class Jq {
     public static final String EXPRESSION_LABEL = "expression";
     public static final String ID_LABEL = "id";

diff --git a/...-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/JsonPath.java b/...-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/JsonPath.java
@@ -3,10 +3,13 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 @JsonPropertyOrder({JsonPath.EXPRESSION_LABEL, JsonPath.ID_LABEL, JsonPath.RESULT_TYPE_LABEL, JsonPath.TRIM_LABEL})
+@RegisterForReflection
 public class JsonPath {
     public static final String EXPRESSION_LABEL = "expression";
     public static final String ALLOW_EASY_PREDICATE_LABEL = "allow-easy-predicate";

diff --git a/...et-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Script.java b/...et-support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Script.java
@@ -6,11 +6,13 @@
 import io.kaoto.backend.api.service.deployment.generator.kamelet.KameletRepresenter;
 import io.kaoto.backend.model.deployment.kamelet.step.EIPStep;
 import io.kaoto.backend.model.parameter.Parameter;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 @JsonPropertyOrder({"name", "groovy", "javascript", "expression"})
+@RegisterForReflection
 public class Script extends EIPStep {
     public static final String GROOVY_LABEL = KameletRepresenter.GROOVY;
     public static final String JAVASCRIPT_LABEL = KameletRepresenter.JAVASCRIPT;

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
@@ -7,10 +7,12 @@
 import io.kaoto.backend.model.deployment.kamelet.step.EIPStep;
 import io.kaoto.backend.model.parameter.Parameter;
 import io.kaoto.backend.model.step.Step;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.Map;
 
 @JsonPropertyOrder({"name", "groovy", "javascript", "expression"})
+@RegisterForReflection
 public class ScriptExpression extends EIPStep {
     public static final String GROOVY_LABEL = KameletRepresenter.GROOVY;
     public static final String JAVASCRIPT_LABEL = KameletRepresenter.JAVASCRIPT;

diff --git a/...support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Tokenizer.java b/...support/src/main/java/io/kaoto/backend/model/deployment/kamelet/expression/Tokenizer.java
@@ -3,10 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.kaoto.backend.model.parameter.Parameter;
 import io.kaoto.backend.model.step.Step;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@RegisterForReflection
 public class Tokenizer extends Expression {
     public static final String TOKEN_LABEL = "token";
     public static final String END_TOKEN_LABEL = "end-token-label";