You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/01/31 16:08:25 UTC

(camel) branch main updated (ad22fc95bb3 -> ddc7c362069)

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

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


    from ad22fc95bb3 CAMEL-20376: camel-xpath - XPath language add support for variables (#12964)
     new 6923c8654cf camel-wasm - Polish
     new ddc7c362069 CAMEL-19749: variables - Should also copy message headers into variable when using EIP variables

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../resources/org/apache/camel/catalog/components/wasm.json         | 2 +-
 .../resources/org/apache/camel/catalog/languages/wasm.json          | 6 +++---
 .../generated/resources/org/apache/camel/catalog/models/wasm.json   | 4 ++--
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd     | 2 +-
 components/camel-wasm/pom.xml                                       | 1 +
 .../generated/resources/org/apache/camel/component/wasm/wasm.json   | 2 +-
 .../generated/resources/org/apache/camel/language/wasm/wasm.json    | 6 +++---
 components/camel-wasm/src/main/docs/wasm-component.adoc             | 2 +-
 components/camel-wasm/src/main/docs/wasm-language.adoc              | 4 ++--
 .../generated/resources/org/apache/camel/model/language/wasm.json   | 4 ++--
 .../main/java/org/apache/camel/model/language/WasmExpression.java   | 6 ++----
 dsl/camel-componentdsl/src/generated/resources/metadata.json        | 2 +-
 .../java/org/apache/camel/builder/endpoint/FromVariableTest.java    | 2 +-
 13 files changed, 21 insertions(+), 22 deletions(-)


(camel) 02/02: CAMEL-19749: variables - Should also copy message headers into variable when using EIP variables

Posted by da...@apache.org.
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

commit ddc7c36206972fe3698bffee802963c600ca6e77
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 31 17:08:16 2024 +0100

    CAMEL-19749: variables - Should also copy message headers into variable when using EIP variables
---
 .../test/java/org/apache/camel/builder/endpoint/FromVariableTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FromVariableTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FromVariableTest.java
index d10b4de92f1..4b75ba3efbd 100644
--- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FromVariableTest.java
+++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FromVariableTest.java
@@ -24,7 +24,7 @@ public class FromVariableTest extends BaseEndpointDslTest {
 
     @Test
     public void testOriginalBody() throws Exception {
-        getMockEndpoint("mock:foo").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:foo").expectedBodiesReceived("Bye ");
         getMockEndpoint("mock:result").expectedBodiesReceived("World");
 
         template.sendBody("direct:start", "World");


(camel) 01/02: camel-wasm - Polish

Posted by da...@apache.org.
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

commit 6923c8654cfbf7b73709e7f37dbb3e26a3d25dbe
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 31 17:06:02 2024 +0100

    camel-wasm - Polish
---
 .../resources/org/apache/camel/catalog/components/wasm.json         | 2 +-
 .../resources/org/apache/camel/catalog/languages/wasm.json          | 6 +++---
 .../generated/resources/org/apache/camel/catalog/models/wasm.json   | 4 ++--
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd     | 2 +-
 components/camel-wasm/pom.xml                                       | 1 +
 .../generated/resources/org/apache/camel/component/wasm/wasm.json   | 2 +-
 .../generated/resources/org/apache/camel/language/wasm/wasm.json    | 6 +++---
 components/camel-wasm/src/main/docs/wasm-component.adoc             | 2 +-
 components/camel-wasm/src/main/docs/wasm-language.adoc              | 4 ++--
 .../generated/resources/org/apache/camel/model/language/wasm.json   | 4 ++--
 .../main/java/org/apache/camel/model/language/WasmExpression.java   | 6 ++----
 dsl/camel-componentdsl/src/generated/resources/metadata.json        | 2 +-
 12 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wasm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wasm.json
index 08ae6f23348..0a3306f015b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wasm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wasm.json
@@ -8,7 +8,7 @@
     "firstVersion": "4.4.0",
     "label": "core,script",
     "javaType": "org.apache.camel.component.wasm.WasmComponent",
-    "supportLevel": "Preview",
+    "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wasm",
     "version": "4.4.0-SNAPSHOT",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/wasm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/wasm.json
index 6562994e416..2c6e12ae3c3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/wasm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/wasm.json
@@ -3,12 +3,12 @@
     "kind": "language",
     "name": "wasm",
     "title": "Wasm",
-    "description": "Wasm TODO.",
+    "description": "Call a wasm (web assembly) function.",
     "deprecated": false,
     "firstVersion": "4.5.0",
-    "label": "language,core",
+    "label": "language",
     "javaType": "org.apache.camel.language.wasm.WasmLanguage",
-    "supportLevel": "Preview",
+    "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wasm",
     "version": "4.4.0-SNAPSHOT",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wasm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wasm.json
index 185552c57ed..6f18359cdff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wasm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wasm.json
@@ -3,10 +3,10 @@
     "kind": "model",
     "name": "wasm",
     "title": "Wasm",
-    "description": "Wasm TODO.",
+    "description": "Call a wasm (web assembly) function.",
     "deprecated": false,
     "firstVersion": "4.5.0",
-    "label": "language,core",
+    "label": "language",
     "javaType": "org.apache.camel.model.language.WasmExpression",
     "abstract": false,
     "input": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 362634f1b26..edad93e52b6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -2179,7 +2179,7 @@ Gets a variable
     <xs:annotation>
       <xs:documentation xml:lang="en">
 <![CDATA[
-Wasm TODO.
+Call a wasm (web assembly) function.
 ]]>
       </xs:documentation>
     </xs:annotation>
diff --git a/components/camel-wasm/pom.xml b/components/camel-wasm/pom.xml
index 835e83d6031..022217dccee 100644
--- a/components/camel-wasm/pom.xml
+++ b/components/camel-wasm/pom.xml
@@ -34,6 +34,7 @@
 
     <properties>
         <camel.surefire.fork.additional-vmargs>-Dwasm.resources.path=${project.basedir}/src/test/resources</camel.surefire.fork.additional-vmargs>
+        <supportLevel>Experimental</supportLevel>
     </properties>
 
     <dependencies>
diff --git a/components/camel-wasm/src/generated/resources/org/apache/camel/component/wasm/wasm.json b/components/camel-wasm/src/generated/resources/org/apache/camel/component/wasm/wasm.json
index 08ae6f23348..0a3306f015b 100644
--- a/components/camel-wasm/src/generated/resources/org/apache/camel/component/wasm/wasm.json
+++ b/components/camel-wasm/src/generated/resources/org/apache/camel/component/wasm/wasm.json
@@ -8,7 +8,7 @@
     "firstVersion": "4.4.0",
     "label": "core,script",
     "javaType": "org.apache.camel.component.wasm.WasmComponent",
-    "supportLevel": "Preview",
+    "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wasm",
     "version": "4.4.0-SNAPSHOT",
diff --git a/components/camel-wasm/src/generated/resources/org/apache/camel/language/wasm/wasm.json b/components/camel-wasm/src/generated/resources/org/apache/camel/language/wasm/wasm.json
index 6562994e416..2c6e12ae3c3 100644
--- a/components/camel-wasm/src/generated/resources/org/apache/camel/language/wasm/wasm.json
+++ b/components/camel-wasm/src/generated/resources/org/apache/camel/language/wasm/wasm.json
@@ -3,12 +3,12 @@
     "kind": "language",
     "name": "wasm",
     "title": "Wasm",
-    "description": "Wasm TODO.",
+    "description": "Call a wasm (web assembly) function.",
     "deprecated": false,
     "firstVersion": "4.5.0",
-    "label": "language,core",
+    "label": "language",
     "javaType": "org.apache.camel.language.wasm.WasmLanguage",
-    "supportLevel": "Preview",
+    "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wasm",
     "version": "4.4.0-SNAPSHOT",
diff --git a/components/camel-wasm/src/main/docs/wasm-component.adoc b/components/camel-wasm/src/main/docs/wasm-component.adoc
index b767d99e9fb..bfce5520a30 100644
--- a/components/camel-wasm/src/main/docs/wasm-component.adoc
+++ b/components/camel-wasm/src/main/docs/wasm-component.adoc
@@ -4,7 +4,7 @@
 :artifactid: camel-wasm
 :description: Invoke Wasm functions.
 :since: 4.4
-:supportlevel: Preview
+:supportlevel: Experimental
 :tabs-sync-option:
 :component-header: Only producer is supported
 :core:
diff --git a/components/camel-wasm/src/main/docs/wasm-language.adoc b/components/camel-wasm/src/main/docs/wasm-language.adoc
index df275b3665f..59aa6f5d1d0 100644
--- a/components/camel-wasm/src/main/docs/wasm-language.adoc
+++ b/components/camel-wasm/src/main/docs/wasm-language.adoc
@@ -2,9 +2,9 @@
 :doctitle: Wasm
 :shortname: wasm
 :artifactid: camel-wasm
-:description: Wasm TODO.
+:description: Call a wasm (web assembly) function.
 :since: 4.5
-:supportlevel: Preview
+:supportlevel: Experimental
 :tabs-sync-option:
 //Manually maintained attributes
 :camel-spring-boot-name: wasm
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/wasm.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/wasm.json
index 185552c57ed..6f18359cdff 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/wasm.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/wasm.json
@@ -3,10 +3,10 @@
     "kind": "model",
     "name": "wasm",
     "title": "Wasm",
-    "description": "Wasm TODO.",
+    "description": "Call a wasm (web assembly) function.",
     "deprecated": false,
     "firstVersion": "4.5.0",
-    "label": "language,core",
+    "label": "language",
     "javaType": "org.apache.camel.model.language.WasmExpression",
     "abstract": false,
     "input": false,
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/WasmExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/WasmExpression.java
index f1b898477f7..31636ac9e52 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/WasmExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/WasmExpression.java
@@ -25,9 +25,9 @@ import jakarta.xml.bind.annotation.XmlTransient;
 import org.apache.camel.spi.Metadata;
 
 /**
- * Wasm TODO.
+ * Call a wasm (web assembly) function.
  */
-@Metadata(firstVersion = "4.5.0", label = "language,core", title = "Wasm")
+@Metadata(firstVersion = "4.5.0", label = "language", title = "Wasm")
 @XmlRootElement(name = "wasm")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class WasmExpression extends TypedExpressionDefinition {
@@ -45,13 +45,11 @@ public class WasmExpression extends TypedExpressionDefinition {
 
     public WasmExpression(String expression, String module) {
         super(expression);
-
         this.module = module;
     }
 
     private WasmExpression(Builder builder) {
         super(builder);
-
         this.module = builder.module;
     }
 
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index ee49b33a954..6b5ee810d60 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -7294,7 +7294,7 @@
     "firstVersion": "4.4.0",
     "label": "core,script",
     "javaType": "org.apache.camel.component.wasm.WasmComponent",
-    "supportLevel": "Preview",
+    "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wasm",
     "version": "4.4.0-SNAPSHOT",