From 478e8f5b63feded85caca7198417e83ed08ff8ad Mon Sep 17 00:00:00 2001 From: Mathias Vandaele Date: Wed, 26 Feb 2025 17:10:17 +0800 Subject: [PATCH] other(element-template-generator): add static feel into element template for boolean and Number properties 6 --- .../io/camunda/connector/generator/dsl/BooleanProperty.java | 1 + .../io/camunda/connector/generator/dsl/HiddenProperty.java | 1 + .../io/camunda/connector/generator/dsl/NumberProperty.java | 1 + .../io/camunda/connector/generator/dsl/StringProperty.java | 1 + .../java/io/camunda/connector/generator/dsl/TextProperty.java | 1 + .../java/processor/TemplatePropertyFieldProcessor.java | 4 ++-- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/BooleanProperty.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/BooleanProperty.java index c7871c5fed..223c2f2c83 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/BooleanProperty.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/BooleanProperty.java @@ -59,6 +59,7 @@ public static class BooleanPropertyBuilder extends PropertyBuilder { private BooleanPropertyBuilder() {} + @Override public BooleanProperty build() { if (value != null && !(value instanceof Boolean)) { throw new IllegalStateException("Value of a boolean property must be a boolean"); diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/HiddenProperty.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/HiddenProperty.java index 8eab74a20b..aad18c7724 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/HiddenProperty.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/HiddenProperty.java @@ -57,6 +57,7 @@ public static class HiddenPropertyBuilder extends PropertyBuilder { private HiddenPropertyBuilder() {} + @Override public HiddenProperty build() { if (value != null && !(value instanceof String)) { throw new IllegalStateException("Value of a hidden property must be a string"); diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/NumberProperty.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/NumberProperty.java index accec7f0ac..551d532807 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/NumberProperty.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/NumberProperty.java @@ -59,6 +59,7 @@ public static class NumberPropertyBuilder extends PropertyBuilder { private NumberPropertyBuilder() {} + @Override public NumberProperty build() { if (value != null && !(value instanceof Number)) { throw new IllegalStateException("Value of a Number property must be a Number"); diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/StringProperty.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/StringProperty.java index 77ec8e75e2..b94a5624f2 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/StringProperty.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/StringProperty.java @@ -59,6 +59,7 @@ public static class StringPropertyBuilder extends PropertyBuilder { private StringPropertyBuilder() {} + @Override public StringProperty build() { if (feel == null) { feel = FeelMode.optional; diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/TextProperty.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/TextProperty.java index 73603314bf..788a48fa1d 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/TextProperty.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/dsl/TextProperty.java @@ -59,6 +59,7 @@ public static class TextPropertyBuilder extends PropertyBuilder { private TextPropertyBuilder() {} + @Override public TextProperty build() { if (feel == null) { feel = FeelMode.optional; diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java index 66c0d8b4da..2230aa1b8c 100644 --- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java +++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java @@ -138,7 +138,7 @@ public void process( case BooleanProperty.BooleanPropertyBuilder $ -> builder.feel(Property.FeelMode.staticFeel); default -> { if (annotation.feel() == Property.FeelMode.system_default) { - builder.feel(determineDefaultFeelModeBasedOnContext(context, builder)); + builder.feel(determineDefaultFeelModeBasedOnContext(context)); } else { builder.feel(annotation.feel()); } @@ -180,7 +180,7 @@ private Number parseNumber(String value, Class type) { } private Property.FeelMode determineDefaultFeelModeBasedOnContext( - final TemplateGenerationContext context, PropertyBuilder builder) { + final TemplateGenerationContext context) { return context instanceof TemplateGenerationContext.Inbound ? Property.FeelMode.disabled : Property.FeelMode.optional;