chore: rename expr to expression

kestra-io · Aug 5, 2024 · bb8dcfb · bb8dcfb
1 parent c03c860
commit bb8dcfb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/JSONataInterface.java b/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/JSONataInterface.java
@@ -9,7 +9,7 @@ public interface JSONataInterface {
     @PluginProperty(dynamic = true)
     @Schema(title = "The JSONata expression to apply on the JSON object.")
     @NotNull
-    String getExpr();
+    String getExpression();
 
     @PluginProperty(dynamic = true)
     @Schema(title = "The maximum number of recursive calls allowed for the JSONata transformation.")

diff --git a/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/Transform.java b/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/Transform.java
@@ -32,7 +32,7 @@ public abstract class Transform extends Task implements JSONataInterface, Runnab
 
     private static final ObjectMapper ION_OBJECT_MAPPER = JacksonMapper.ofIon();
 
-    private String expr;
+    private String expression;
 
     @Builder.Default
     private Integer maxDepth = 1000;
@@ -55,7 +55,7 @@ protected JsonNode evaluateExpression(JsonNode jsonNode) {
 
     private Expressions parseExpression(RunContext runContext) throws IllegalVariableEvaluationException {
         try {
-            return Expressions.parse(runContext.render(this.expr));
+            return Expressions.parse(runContext.render(this.expression));
         } catch (ParseException | IOException e) {
             throw new IllegalArgumentException("Invalid JSONata expression. Error: " + e.getMessage(), e);
         }

diff --git a/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/TransformItems.java b/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/TransformItems.java
@@ -47,7 +47,7 @@
                 - id: transformJson
                   type: io.kestra.plugin.transform.jsonata.TransformItems
                   from: {{ previousTask.outputs.uri }}
-                  expr: |
+                  expression: |
                      {
                         "order_id": order_id,
                         "customer_name": customer_name,

diff --git a/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/TransformValue.java b/plugin-transform-json/src/main/java/io/kestra/plugin/transform/jsonata/TransformValue.java
@@ -64,7 +64,7 @@
                           }
                         ]
                       }
-                    expr: |
+                    expression: |
                        {
                         "order_id": order_id,
                         "customer_name": customer_name,

diff --git a/...n-transform-json/src/test/java/io/kestra/plugin/transform/jsonata/TransformItemsTest.java b/...n-transform-json/src/test/java/io/kestra/plugin/transform/jsonata/TransformItemsTest.java
@@ -40,7 +40,7 @@ void shouldGetOutputForValidExprReturningStringForFromURI() throws Exception {
 
         TransformItems task = TransformItems.builder()
             .from(uri.toString())
-            .expr(Features.DATASET_ACCOUNT_ORDER_EXPR)
+            .expression(Features.DATASET_ACCOUNT_ORDER_EXPR)
             .build();
 
         // When

diff --git a/...n-transform-json/src/test/java/io/kestra/plugin/transform/jsonata/TransformValueTest.java b/...n-transform-json/src/test/java/io/kestra/plugin/transform/jsonata/TransformValueTest.java
@@ -19,7 +19,7 @@ void shouldGetOutputForValidExprReturningStringForFromJSON() throws Exception {
         RunContext runContext = runContextFactory.of();
         TransformValue task = TransformValue.builder()
             .from(Features.DATASET_ACCOUNT_ORDER_JSON)
-            .expr(Features.DATASET_ACCOUNT_ORDER_EXPR)
+            .expression(Features.DATASET_ACCOUNT_ORDER_EXPR)
             .build();
 
         // When
@@ -62,7 +62,7 @@ void shouldGetOutputForValidExprReturningObjectForFromJSON() throws Exception {
                   ]
                 }
                 """)
-            .expr("""
+            .expression("""
                      {
                         "order_id": order_id,
                         "customer_name": customer_name,
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ @@
                               }
                             ]
                           }
-                        expr: |
+                        expression: |
                            {
                             "order_id": order_id,
                             "customer_name": customer_name,
@@ Expand Down @@