[camel] branch main updated: CAMEL-18904: Add functions to simple language to create empty map/list/string

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 251c7618d2a CAMEL-18904: Add functions to simple language to create 
empty map/list/string
251c7618d2a is described below

commit 251c7618d2ae9fde0f4a0fd77cfa4760e328e4ad
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 5 09:22:43 2023 +0200

    CAMEL-18904: Add functions to simple language to create empty 
map/list/string
---
 .../camel/language/simple/SimpleExpressionBuilder.java       |  9 ++++-----
 .../src/test/java/org/apache/camel/LanguageTestSupport.java  | 12 ------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index c10730c19e3..fcda2ed14d3 100644
--- 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -19,9 +19,8 @@ package org.apache.camel.language.simple;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Random;
 import java.util.TimeZone;
@@ -279,19 +278,19 @@ public final class SimpleExpressionBuilder {
     /**
      * Returns a new empty object of the given type
      */
-    public static Expression newEmptyExpression(String type) {
+    public static Expression newEmptyExpression(final String type) {
 
         return new ExpressionAdapter() {
             @Override
             public Object evaluate(Exchange exchange) {
                 if ("map".equalsIgnoreCase(type)) {
-                    return new HashMap<>();
+                    return new LinkedHashMap<>();
                 } else if ("string".equalsIgnoreCase(type)) {
                     return "";
                 } else if ("list".equalsIgnoreCase(type)) {
                     return new ArrayList<>();
                 }
-                throw new IllegalArgumentException("function empty(%s) has 
unknown type.".formatted(type));
+                throw new IllegalArgumentException("function empty(%s) has 
unknown type".formatted(type));
             }
 
             @Override
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java 
b/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
index ab1bb9377fe..1164071a65c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel;
 
-import java.util.function.Predicate;
-
 import org.apache.camel.spi.Language;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -65,16 +63,6 @@ public abstract class LanguageTestSupport extends 
ExchangeTestSupport {
         assertExpression(exchange, getLanguageName(), expressionText, 
expectedValue);
     }
 
-    /**
-     * Asserts that this language expression evaluates in a way that the 
handed over predicate is true
-     */
-    protected void assertExpression(String expressionText, Predicate<Object> 
assertion) {
-
-        Object value = evaluateExpression(expressionText, null);
-
-        assertTrue(assertion.test(value));
-    }
-
     /**
      * Asserts that this language expression evaluates to the given value on 
the current exchange
      */