[camel] branch regen_bot updated (bf98522eb05 -> a3670a3d2b0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit bf98522eb05 Polished This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (a3670a3d2b0) \ O -- O -- O (bf98522eb05) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (375674e4558 -> bf98522eb05)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 375674e4558 change the source type to module for JS dsl + fix test scripts (#8796) add a3670a3d2b0 java-js-dsl/javascript - Set mimeType and name add bf98522eb05 Polished No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/language/js/JavaScriptExpression.java| 7 ++- .../main/java/org/apache/camel/language/js/JavaScriptLanguage.java | 7 ++- .../org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java | 5 +++-- parent/pom.xml | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #8797: CAMEL-18363: Added note on requirements for making updates to CouchDB documents
github-actions[bot] commented on PR #8797: URL: https://github.com/apache/camel/pull/8797#issuecomment-1331712133 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] shikhar97gupta opened a new pull request, #8797: CAMEL-18363: Added note on requirements for making updates to CouchDB documents
shikhar97gupta opened a new pull request, #8797: URL: https://github.com/apache/camel/pull/8797 JIRA issue: https://issues.apache.org/jira/browse/CAMEL-18363 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (de618ec7f31 -> 375674e4558)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from de618ec7f31 camel-salesforce: Fix param name/usage add 375674e4558 change the source type to module for JS dsl + fix test scripts (#8796) No new revisions were added by this update. Summary of changes: .../camel/dsl/js/JavaScriptRoutesBuilderLoader.java | 2 +- .../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 19 --- dsl/camel-js-dsl/src/test/resources/module.mjs| 1 + .../routes/routes-with-component-configuration.js | 2 +- .../test/resources/routes/routes-with-endpoint-dsl.js | 4 ++-- .../src/test/resources/routes/routes-with-modules.js | 4 .../routes/routes-with-rest-configuration.js | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 dsl/camel-js-dsl/src/test/resources/module.mjs create mode 100644 dsl/camel-js-dsl/src/test/resources/routes/routes-with-modules.js
[GitHub] [camel-k] tadayosi opened a new pull request, #3859: chore(build): upgrade Maven and ubi-quarkus-mandrel base image (1.10.x)
tadayosi opened a new pull request, #3859: URL: https://github.com/apache/camel-k/pull/3859 backport #3825 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch quarkus-main updated (30d8f32a48 -> 48f4e2aa73)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 30d8f32a48 Add temporary dependency override for JSONata4Java #4294 discard 6c1f5bcd18 Disable DatasonnetIT due to #4284 discard 5f93c44fb1 Disable microprofile-fault-tolerance testing due to #4225 discard 439cce4753 Upgrade Quarkus to 2.15.0.CR1 add 4b2a0cc928 camel-quarkus-catalog - Make it possible to get the camel version #4301 new 558259d4d0 Upgrade Quarkus to 2.15.0.CR1 new e02d76f941 Disable microprofile-fault-tolerance testing due to #4225 new 0543d35006 Disable DatasonnetIT due to #4284 new 48f4e2aa73 Add temporary dependency override for JSONata4Java #4294 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (30d8f32a48) \ N -- N -- N refs/heads/quarkus-main (48f4e2aa73) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 4 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: .../quarkus/maven/PrepareCatalogQuarkusMojo.java | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-)
[camel-quarkus] 04/04: Add temporary dependency override for JSONata4Java #4294
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 48f4e2aa73c5113c30ede6f6dbddbc37f22160b5 Author: James Netherton AuthorDate: Fri Nov 25 08:24:15 2022 + Add temporary dependency override for JSONata4Java #4294 --- pom.xml | 1 + poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 5 files changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index 7b3d634e88..00e11f91f8 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ 6.3.0.202209071007-r 5.6.0 2.1.2 +2.2.4 ${json-path-version} 2.4.7 3.3.1 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3b660bfc6c..3a67785200 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -9920,6 +9920,11 @@ core ${zxing.version} + +com.ibm.jsonata4java +JSONata4Java +${jsonata4java.version} + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 5b3e051f2a..f2581fb674 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a4633c..c2bd6fbd1d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 91f16ce100..7df75aed3f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path
[camel-quarkus] 02/04: Disable microprofile-fault-tolerance testing due to #4225
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e02d76f941c3bba7b3971781e8c75c31417ac861 Author: James Netherton AuthorDate: Mon Oct 31 08:56:00 2022 + Disable microprofile-fault-tolerance testing due to #4225 --- .../it/CoreFaultToleranceProducers.java| 35 -- integration-tests/foundation-grouped/pom.xml | 6 +++- integration-tests/microprofile/pom.xml | 2 ++ .../MicroProfileFaultToleranceRoutes.java | 20 ++--- .../MicroprofileFaultToleranceIT.java | 2 ++ .../MicroprofileFaultToleranceTest.java| 2 ++ tooling/scripts/group-tests.groovy | 6 +++- 7 files changed, 58 insertions(+), 15 deletions(-) diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java index aa9394108c..67f580041d 100644 --- a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java +++ b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java @@ -18,29 +18,32 @@ package org.apache.camel.quarkus.core.faulttolerance.it; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Disposes; import javax.inject.Named; import io.smallrye.faulttolerance.core.FaultToleranceStrategy; import io.smallrye.faulttolerance.core.InvocationContext; import io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker; import io.smallrye.faulttolerance.core.stopwatch.SystemStopwatch; +import io.smallrye.faulttolerance.core.timer.ThreadTimer; import io.smallrye.faulttolerance.core.util.ExceptionDecision; public class CoreFaultToleranceProducers { @ApplicationScoped @Named("customCircuitBreaker") -CircuitBreaker produceCustomCircuitBreaker() { +CircuitBreaker produceCustomCircuitBreaker(ThreadTimer threadTimer) { FaultToleranceStrategy delegate = new FaultToleranceStrategy() { @Override public Integer apply(InvocationContext ctx) { return null; } }; -return new CircuitBreaker(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1, -2, new SystemStopwatch()) { +return new CircuitBreaker<>(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1, +2, SystemStopwatch.INSTANCE, threadTimer) { @Override public String toString() { return "customCircuitBreaker"; @@ -54,4 +57,30 @@ public class CoreFaultToleranceProducers { return Executors.newFixedThreadPool(2); } +@ApplicationScoped +@Named("threadTimer") +ThreadTimer threadTimer(@Named("threadTimerExecutor") ExecutorService executorService) { +return new ThreadTimer(executorService); +} + +@ApplicationScoped +@Named("threadTimerExecutor") +ExecutorService threadTimerExecutor() { +return Executors.newSingleThreadExecutor(); +} + +void disposeThreadTimerExecutor(@Disposes @Named("threadTimerExecutor") ExecutorService threadTimerExecutor, +ThreadTimer timer) { +try { +timer.shutdown(); +} catch (InterruptedException e) { +Thread.currentThread().interrupt(); +} + +try { +threadTimerExecutor.awaitTermination(10, TimeUnit.SECONDS); +} catch (InterruptedException e) { +Thread.currentThread().interrupt(); +} +} } diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml index 70cf7efb29..741e00836a 100644 --- a/integration-tests/foundation-grouped/pom.xml +++ b/integration-tests/foundation-grouped/pom.xml @@ -96,10 +96,12 @@ org.apache.camel.quarkus camel-quarkus-log + org.apache.camel.quarkus camel-quarkus-mock @@ -210,7 +212,9 @@ ${maven.multiModuleProjectDirectory}/integration-test-groups/foundation ${project.basedir} - src/main/resources/application.properties + src/main/resources/application.properties + +
[camel-quarkus] 01/04: Upgrade Quarkus to 2.15.0.CR1
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 558259d4d0404c82def8990965ea64482385d620 Author: James Netherton AuthorDate: Fri Oct 28 07:24:15 2022 +0100 Upgrade Quarkus to 2.15.0.CR1 --- docs/antora.yml| 2 +- pom.xml| 14 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +- .../src/main/generated/flattened-reduced-verbose-pom.xml | 10 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 347e2c9a10..66590918f5 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 3.18.2 # replace ${camel.version} camel-docs-version: 3.18.x # replace ${camel.docs.components.version} -quarkus-version: 2.14.0.Final # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.2.0 # replace ${graalvm.version} graalvm-docs-version: 22.2 min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/pom.xml b/pom.xml index 11047a34e8..7b3d634e88 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.0.4 1.0.6 1.0.3 -2.14.0.Final +999-SNAPSHOT 3.0.0 0.39.0 @@ -95,15 +95,15 @@ 1.111 1.7.0 ${google-oauth-client-version} -22.2.0 -1.50.2 +22.3.0 +1.51.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} 4.2.0 ${hbase-version} 4.2.0-incubating -14.0.1.Final +14.0.2.Final ${influx-java-driver-version} 1.9.13 ${jackson1.version} @@ -124,7 +124,7 @@ 2.4.7 3.3.1 ${kudu-version} -1.7.20 +1.7.21 2.24.0 ${libthrift-version} 1.13.1 @@ -132,11 +132,11 @@ ${squareup-okio-version} 0.31.0 0.25.0 -3.19.6 +3.21.9 3.4.22 ${reactor-netty-version} 2.5.0 - 3.21.0 + 3.22.0 ${spring5-version} 1.33 0.43.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c7ca68a085..5b3e051f2a 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -3.21.0 +3.22.0 jakarta.activation @@ -10326,12 +10326,12 @@ org.graalvm.js js -22.2.0 +22.3.0 org.graalvm.js js-scriptengine -22.2.0 +22.3.0 org.influxdb @@ -10346,17 +10346,17 @@ org.jetbrains.kotlin kotlin-script-util -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.7.20 +1.7.21 org.jruby.jcodings diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 149cdb7d6a..a4633c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -3.21.0 +3.22.0 jakarta.activation @@ -10321,7 +10321,7 @@ org.graalvm.js js -22.2.0 +22.3.0 org.influxdb @@ -10336,17 +10336,17 @@ org.jetbrains.kotlin kotlin-script-util -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.7.20 +1.7.21 org.jruby.jcodings diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index cee98cfa8e..91f16ce100 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -3.21.0 +
[camel-quarkus] 03/04: Disable DatasonnetIT due to #4284
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0543d35006f0b5846b738d2c8245228e4c7c2261 Author: James Netherton AuthorDate: Mon Nov 21 08:51:08 2022 + Disable DatasonnetIT due to #4284 --- .../org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java b/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java index 124bb7e75e..31fbf1e959 100644 --- a/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java +++ b/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.datasonnet.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/4284;) @QuarkusIntegrationTest class DatasonnetIT extends DatasonnetTest {
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2926 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1331696984 Build fixed with: * Camel Quarkus Commit: 48f4e2aa73c5113c30ede6f6dbddbc37f22160b5 * Quarkus Main Commit: 4b2a0cc9284b29586fb0176e11f214af4432537b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3579785879 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Polished
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 bf98522eb05 Polished bf98522eb05 is described below commit bf98522eb05c8e477c182f11d15c302e69d0bc0d Author: Claus Ibsen AuthorDate: Wed Nov 30 07:02:54 2022 +0100 Polished --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2b07c9539a1..173d658b53b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -92,7 +92,7 @@ 5.13.3 3.2.0 0.9.5.5 - 3.1.2 +3.1.2 2.7.2 2.7.4 4.15.0
[camel] branch main updated: java-js-dsl/javascript - Set mimeType and name
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 a3670a3d2b0 java-js-dsl/javascript - Set mimeType and name a3670a3d2b0 is described below commit a3670a3d2b032b43007af9f2d94f9add8a142c86 Author: Claus Ibsen AuthorDate: Wed Nov 30 07:02:03 2022 +0100 java-js-dsl/javascript - Set mimeType and name --- .../java/org/apache/camel/language/js/JavaScriptExpression.java| 7 ++- .../main/java/org/apache/camel/language/js/JavaScriptLanguage.java | 7 ++- .../org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptExpression.java b/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptExpression.java index 8d6258c161a..b675f70fd83 100644 --- a/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptExpression.java +++ b/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptExpression.java @@ -19,8 +19,11 @@ package org.apache.camel.language.js; import org.apache.camel.Exchange; import org.apache.camel.support.ExpressionSupport; import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; +import static org.graalvm.polyglot.Source.newBuilder; + public class JavaScriptExpression extends ExpressionSupport { private final String expressionString; @@ -54,7 +57,9 @@ public class JavaScriptExpression extends ExpressionSupport { b.putMember("properties", exchange.getAllProperties()); b.putMember("body", exchange.getMessage().getBody()); -Value o = cx.eval("js", expressionString); +Source source = newBuilder("js", expressionString, "Unnamed") +.mimeType("application/javascript+module").buildLiteral(); +Value o = cx.eval(source); Object answer = o != null ? o.as(Object.class) : null; if (type == Object.class) { return (T) answer; diff --git a/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptLanguage.java b/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptLanguage.java index 430bd99b947..e0d9e41575c 100644 --- a/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptLanguage.java +++ b/components/camel-javascript/src/main/java/org/apache/camel/language/js/JavaScriptLanguage.java @@ -24,8 +24,11 @@ import org.apache.camel.spi.ScriptingLanguage; import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.TypedLanguageSupport; import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Source; import org.graalvm.polyglot.Value; +import static org.graalvm.polyglot.Source.newBuilder; + @Language("js") public class JavaScriptLanguage extends TypedLanguageSupport implements ScriptingLanguage { @@ -45,7 +48,9 @@ public class JavaScriptLanguage extends TypedLanguageSupport implements Scriptin try (Context cx = JavaScriptHelper.newContext()) { Value b = cx.getBindings("js"); bindings.forEach(b::putMember); -Value o = cx.eval("js", script); +Source source = newBuilder("js", script, "Unnamed") +.mimeType("application/javascript+module").buildLiteral(); +Value o = cx.eval(source); Object answer = o != null ? o.as(resultType) : null; return resultType.cast(answer); } diff --git a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java index 93c74d40c63..d4cc4ff3c49 100644 --- a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java +++ b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java @@ -24,6 +24,7 @@ import org.apache.camel.builder.endpoint.EndpointRouteBuilder; import org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport; import org.apache.camel.spi.annotations.RoutesLoader; import org.apache.camel.support.LifecycleStrategySupport; +import org.apache.camel.util.FileUtil; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.HostAccess; import org.graalvm.polyglot.PolyglotAccess; @@ -53,6 +54,7 @@ public class JavaScriptRoutesBuilderLoader extends EndpointRouteBuilderLoaderSup final Context context = contextBuilder.build(); final Value bindings = context.getBindings(LANGUAGE_ID); +final String name = FileUtil.onlyName(builder.getResource().getLocation(), true) + "." +
[camel-spring-boot] branch main updated: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new ba61daa0943 [create-pull-request] automated change ba61daa0943 is described below commit ba61daa09435d92069b859a209dc4fb363a35c84 Author: oscerd AuthorDate: Wed Nov 30 01:05:50 2022 + [create-pull-request] automated change --- .../springboot/catalog/components/splunk-hec.json | 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 233 +++-- 2 files changed, 76 insertions(+), 159 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json index 04ffbf62046..a2b93654f78 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json @@ -37,7 +37,7 @@ "index": { "kind": "parameter", "displayName": "Index", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk index to write to" }, "source": { "kind": "parameter", "displayName": "Source", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk source argument" }, "sourceType": { "kind": "parameter", "displayName": "Source Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk sourcetype argument" }, -"splunkEndpoint": { "kind": "parameter", "displayName": "Splunk Endpoint", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/collector\/event", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk endpoint Defaults to \/services\/collector\/event To writ [...] +"splunkEndpoint": { "kind": "parameter", "displayName": "Splunk Endpoint", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/collector\/event", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk endpoint Defaults to \/services\/collector\/event To writ [...] "time": { "kind": "parameter", "displayName": "Time", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Time this even occurred. By default, the time will be when this event hits the splunk server." }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...] "https": { "kind": "parameter", "displayName": "Https", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Contact HEC over https." }, diff --git
[GitHub] [camel-spring-boot] oscerd merged pull request #676: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged PR #676: URL: https://github.com/apache/camel-spring-boot/pull/676 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: change the source type to module for JS dsl + fix test scripts (#8796)
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 375674e4558 change the source type to module for JS dsl + fix test scripts (#8796) 375674e4558 is described below commit 375674e455848e27904a5e89e8814604b777c459 Author: Hugo Guerrero <1001939+hguerr...@users.noreply.github.com> AuthorDate: Wed Nov 30 00:45:53 2022 -0500 change the source type to module for JS dsl + fix test scripts (#8796) * allow ES modules in JS DSL * update routes for tests * add tests for modules --- .../camel/dsl/js/JavaScriptRoutesBuilderLoader.java | 2 +- .../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 19 --- dsl/camel-js-dsl/src/test/resources/module.mjs| 1 + .../routes/routes-with-component-configuration.js | 2 +- .../test/resources/routes/routes-with-endpoint-dsl.js | 4 ++-- .../src/test/resources/routes/routes-with-modules.js | 4 .../routes/routes-with-rest-configuration.js | 2 +- 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java index b0c99ce6acb..93c74d40c63 100644 --- a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java +++ b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java @@ -77,7 +77,7 @@ public class JavaScriptRoutesBuilderLoader extends EndpointRouteBuilderLoaderSup // Run the script. // context.eval( -newBuilder(LANGUAGE_ID, reader, "Unnamed").buildLiteral()); +newBuilder(LANGUAGE_ID, reader, "Unnamed").mimeType("application/javascript+module").buildLiteral()); // // Close the polyglot context when the camel context stops diff --git a/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java b/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java index 34b0afc59fa..8e81496c0b7 100644 --- a/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java +++ b/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java @@ -52,7 +52,8 @@ public class JavaScriptRoutesBuilderLoaderTest { @Test void componentsCanBeCustomized() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { -Resource resource = context.getResourceLoader().resolveResource("/routes/routes-with-component-configuration.js"); +Resource resource = context.getResourceLoader() + .resolveResource("/routes/routes-with-component-configuration.js"); context.getRoutesLoader().loadRoutes(resource); assertThat(context.getComponent("seda", SedaComponent.class)).satisfies(c -> { @@ -64,7 +65,8 @@ public class JavaScriptRoutesBuilderLoaderTest { @Test void contextCanBeCustomized() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { -Resource resource = context.getResourceLoader().resolveResource("/routes/routes-with-context-configuration.js"); +Resource resource = context.getResourceLoader() + .resolveResource("/routes/routes-with-context-configuration.js"); context.getRoutesLoader().loadRoutes(resource); assertThat(context.isTypeConverterStatisticsEnabled()).isTrue(); @@ -91,7 +93,8 @@ public class JavaScriptRoutesBuilderLoaderTest { @Test void restCanBeConfigured() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { -Resource resource = context.getResourceLoader().resolveResource("/routes/routes-with-rest-configuration.js"); +Resource resource = context.getResourceLoader() + .resolveResource("/routes/routes-with-rest-configuration.js"); context.getRoutesLoader().loadRoutes(resource); assertThat(context.getRestConfiguration()).satisfies(c -> { @@ -122,4 +125,14 @@ public class JavaScriptRoutesBuilderLoaderTest { }); } } + +@Test +void modulesCanBeImported() throws Exception { +try (DefaultCamelContext context = new DefaultCamelContext()) { +Resource resource = context.getResourceLoader().resolveResource("/routes/routes-with-modules.js"); +context.getRoutesLoader().loadRoutes(resource); + +assertThat(context.getRouteDefinitions()).hasSize(1); +} +} } diff --git a/dsl/camel-js-dsl/src/test/resources/module.mjs
[GitHub] [camel] davsclaus merged pull request #8796: change the source type to module for JS dsl + fix test scripts
davsclaus merged PR #8796: URL: https://github.com/apache/camel/pull/8796 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/02: chore: regen resources
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 02a54b0dc960008282c66004a83eb9c96ac12861 Author: Tadayoshi Sato AuthorDate: Wed Nov 30 13:29:11 2022 +0900 chore: regen resources --- pkg/resources/resources.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index d8486fc67..279833963 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -172,7 +172,7 @@ var assets = func() http.FileSystem { modTime: time.Time{}, uncompressedSize: 2752, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4f\x8f\xe2\xc6\x13\xbd\xfb\x53\x3c\xe1\xcb\xae\x34\x98\x61\x7f\x97\x95\x7f\x27\x67\x60\xb2\x56\x36\x06\x61\x36\xa3\x3d\x45\x4d\xbb\xb0\x5b\xb4\xbb\x9d\xee\x36\x2c\xf9\xf4\x51\x1b\xcc\x00\xf3\x27\x99\x68\xa4\xf8\x84\x5d\x55\xaf\x5e\xbd\x57\x6d\x13\x62\xf8\x7e\x57\x10\xe2\xab\xe0\xa4\x2c\x15\x70\x1a\xae\x22\x24\x0d\xe3\x15\x21\xd7\x6b\xb7\x63\x86\x70\xaf\x5b\x55\x30\x27\xb4\xc2\x87\x24\xbf\xff\x88\x56\x15\x64\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4f\x8f\xe2\xc6\x13\xbd\xfb\x53\x3c\xe1\xcb\xae\x34\x98\x61\xf5\x3b\xac\xfc\x3b\x39\x03\x93\xb5\xb2\x31\x08\xb3\x19\xed\x29\x6a\xda\x85\xdd\xa2\xdd\xed\x74\xb7\x61\xc9\xa7\x8f\xda\x60\x06\x98\x3f\xc9\x44\x23\xc5\x27\xec\xaa\x7a\xf5\xea\xbd\x6a\x9b\x10\xc3\xf7\xbb\x82\x10\x5f\x05\x27\x65\xa9\x80\xd3\x70\x15\x21\x69\x18\xaf\x08\xb9\x5e\xbb\x1d\x33\x84\x7b\xdd\xaa\x82\x39\xa1\x15\x3e\x24\xf9\xfd\x47\xb4\xaa\x20\x [...] }, "/manager/operator-service-account.yaml": ۰CompressedFileInfo{ name: "operator-service-account.yaml",
[camel-k] 02/02: chore(e2e): disable fail-fast for builder tests
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d144f5db318a39a47ae9fe3b63bf9cea8353f5f7 Author: Tadayoshi Sato AuthorDate: Wed Nov 16 22:37:02 2022 +0900 chore(e2e): disable fail-fast for builder tests --- .github/workflows/builder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 1a474b422..e31e3dfbb 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -69,6 +69,7 @@ jobs: runs-on: ubuntu-20.04 strategy: + fail-fast: false matrix: publisher: ["Buildah", "Spectrum", "Kaniko"]
[camel-k] branch release-1.10.x updated (74f0be7a7 -> d144f5db3)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 74f0be7a7 chore: fix lints new 02a54b0dc chore: regen resources new d144f5db3 chore(e2e): disable fail-fast for builder tests 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: .github/workflows/builder.yml | 1 + pkg/resources/resources.go| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[GitHub] [camel-k] tadayosi opened a new pull request, #3858: fix(trait): trait error "camel-catalog already exists" during upgrade
tadayosi opened a new pull request, #3858: URL: https://github.com/apache/camel-k/pull/3858 Fix #3822 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 05/05: chore: fix lints
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 74f0be7a7460092bad45cb89f258e4dae3741874 Author: Tadayoshi Sato AuthorDate: Tue Nov 29 17:40:22 2022 +0900 chore: fix lints --- pkg/util/source/inspector.go | 9 - pkg/util/source/inspector_groovy_test.go | 8 pkg/util/source/inspector_java_script_test.go | 8 pkg/util/source/inspector_java_source_test.go | 8 pkg/util/source/inspector_kotlin_test.go | 8 pkg/util/source/inspector_xml.go | 3 +-- pkg/util/source/inspector_xml_test.go | 8 7 files changed, 25 insertions(+), 27 deletions(-) diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go index bda89542e..783662b0d 100644 --- a/pkg/util/source/inspector.go +++ b/pkg/util/source/inspector.go @@ -249,7 +249,7 @@ func (i *baseInspector) discoverDependencies(source v1.SourceSpec, meta *Metadat i.addDependency(dep, meta) } // some components require additional dependency resolution based on URI - i.addDependenciesFromUri(uri, scheme, meta) + i.addDependenciesFromURI(uri, scheme, meta) } } } @@ -263,7 +263,7 @@ func (i *baseInspector) discoverDependencies(source v1.SourceSpec, meta *Metadat i.addDependency(dep, meta) } // some components require additional dependency resolution based on URI - i.addDependenciesFromUri(uri, scheme, meta) + i.addDependenciesFromURI(uri, scheme, meta) } } } @@ -310,9 +310,8 @@ func (i *baseInspector) addDependency(dependency string, meta *Metadata) { meta.Dependencies.Add(dependency) } -func (i *baseInspector) addDependenciesFromUri(uri string, scheme *v1.CamelScheme, meta *Metadata) { - switch scheme.ID { - case "dataformat": +func (i *baseInspector) addDependenciesFromURI(uri string, scheme *v1.CamelScheme, meta *Metadata) { + if scheme.ID == "dataformat" { // dataformat:name:(marshal|unmarshal)[?options] parts := strings.Split(uri, ":") if len(parts) < 3 { diff --git a/pkg/util/source/inspector_groovy_test.go b/pkg/util/source/inspector_groovy_test.go index e082d9d74..5dc3f05ae 100644 --- a/pkg/util/source/inspector_groovy_test.go +++ b/pkg/util/source/inspector_groovy_test.go @@ -106,12 +106,12 @@ func TestGroovyKamelet(t *testing.T) { } } -const groovyJsonEip = ` +const groovyJSONEip = ` from("direct:start") .unmarshal().json() ` -const groovyJsonJacksonEip = ` +const groovyJSONJacksonEip = ` from("direct:start") .unmarshal().json(JsonLibrary.Jackson) ` @@ -137,11 +137,11 @@ func TestGroovyDataFormat(t *testing.T) { deps []string }{ { - source: groovyJsonEip, + source: groovyJSONEip, deps: []string{"camel:jackson"}, }, { - source: groovyJsonJacksonEip, + source: groovyJSONJacksonEip, deps: []string{"camel:jackson"}, }, { diff --git a/pkg/util/source/inspector_java_script_test.go b/pkg/util/source/inspector_java_script_test.go index 59f53f476..05d5efa89 100644 --- a/pkg/util/source/inspector_java_script_test.go +++ b/pkg/util/source/inspector_java_script_test.go @@ -88,12 +88,12 @@ func TestJavaScriptKamelet(t *testing.T) { } } -const javaScriptJsonEip = ` +const javaScriptJSONEip = ` from('direct:start') .unmarshal().json() ` -const javaScriptJsonJacksonEip = ` +const javaScriptJSONJacksonEip = ` from('direct:start') .unmarshal().json(JsonLibrary.Jackson) ` @@ -119,11 +119,11 @@ func TestJavaScriptDataFormat(t *testing.T) { deps []string }{ { - source: javaScriptJsonEip, + source: javaScriptJSONEip, deps: []string{"camel:jackson"}, }, { - source: javaScriptJsonJacksonEip, + source: javaScriptJSONJacksonEip, deps: []string{"camel:jackson"}, }, { diff --git a/pkg/util/source/inspector_java_source_test.go b/pkg/util/source/inspector_java_source_test.go index 6fddf4203..d84a0d868 100644 --- a/pkg/util/source/inspector_java_source_test.go +++
[camel-k] 03/05: test(source): add tests for dataformat deps resolution
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit e12978dd95188ff7579a308fb84e47ed40bac2a1 Author: Tadayoshi Sato AuthorDate: Tue Nov 29 15:55:09 2022 +0900 test(source): add tests for dataformat deps resolution --- pkg/util/source/inspector_groovy_test.go | 131 --- pkg/util/source/inspector_java_script_test.go | 122 +++--- pkg/util/source/inspector_java_source_test.go | 128 --- pkg/util/source/inspector_kotlin_test.go | 122 +++--- pkg/util/source/inspector_xml_test.go | 143 +--- pkg/util/source/inspector_yaml_test.go| 315 +- pkg/util/source/test_support.go | 58 + 7 files changed, 700 insertions(+), 319 deletions(-) diff --git a/pkg/util/source/inspector_groovy_test.go b/pkg/util/source/inspector_groovy_test.go index d0d2a5e80..e082d9d74 100644 --- a/pkg/util/source/inspector_groovy_test.go +++ b/pkg/util/source/inspector_groovy_test.go @@ -21,34 +21,46 @@ import ( "fmt" "testing" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/apache/camel-k/pkg/util/camel" ) -const GroovyKameletEip = ` +func newTestGroovyInspector(t *testing.T) GroovyInspector { + t.Helper() + + catalog, err := camel.DefaultCatalog() + require.NoError(t, err) + + return GroovyInspector{ + baseInspector: baseInspector{ + catalog: catalog, + }, + } +} + +const groovyKameletEip = ` from("direct:start") .kamelet("foo/bar?baz=test") ` -const GroovyKameletEipSingleQuote = ` +const groovyKameletEipSingleQuote = ` from("direct:start") .kamelet('foo/bar?baz=test') ` -const GroovyKameletEndpoint = ` +const groovyKameletEndpoint = ` from("direct:start") .to("kamelet:foo/bar?baz=test") ` -const GroovyKameletEndpointSingleQuote = ` +const groovyKameletEndpointSingleQuote = ` from("direct:start") .to('kamelet:foo/bar?baz=test') ` -const GroovyWireTapEipSingleQuote = ` +const groovyWireTapEipSingleQuote = ` from("direct:start") .wireTap('kamelet:foo/bar?baz=test') ` @@ -59,53 +71,102 @@ func TestGroovyKamelet(t *testing.T) { kamelets []string }{ { - source: GroovyKameletEip, + source: groovyKameletEip, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEndpoint, + source: groovyKameletEndpoint, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEipSingleQuote, + source: groovyKameletEipSingleQuote, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEndpointSingleQuote, + source: groovyKameletEndpointSingleQuote, kamelets: []string{"foo/bar"}, }, { - source: GroovyWireTapEipSingleQuote, + source: groovyWireTapEipSingleQuote, kamelets: []string{"foo/bar"}, }, } + inspector := newTestGroovyInspector(t) for i := range tc { test := tc[i] t.Run(fmt.Sprintf("TestGroovyKamelet-%d", i), func(t *testing.T) { - code := v1.SourceSpec{ - DataSpec: v1.DataSpec{ - Content: test.source, - }, - } - - catalog, err := camel.DefaultCatalog() - assert.Nil(t, err) - - meta := NewMetadata() - inspector := GroovyInspector{ - baseInspector: baseInspector{ - catalog: catalog, - }, - } - - err = inspector.Extract(code, ) - assert.Nil(t, err) - assert.True(t, meta.RequiredCapabilities.IsEmpty()) - - for _, k := range test.kamelets { - assert.Contains(t, meta.Kamelets, k) - } + assertExtract(t, inspector, test.source, func(meta *Metadata) { + assert.True(t, meta.RequiredCapabilities.IsEmpty()) + for _, k := range test.kamelets { + assert.Contains(t,
[camel-k] 04/05: fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8183f0a82a0d4441d9c81cbd1730abc3f0f8c9cb Author: Tadayoshi Sato AuthorDate: Tue Nov 29 17:35:11 2022 +0900 fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL --- pkg/util/source/inspector_xml.go | 11 +++ pkg/util/source/inspector_yaml.go | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/util/source/inspector_xml.go b/pkg/util/source/inspector_xml.go index 51baaee24..5fdb027ee 100644 --- a/pkg/util/source/inspector_xml.go +++ b/pkg/util/source/inspector_xml.go @@ -19,6 +19,7 @@ package source import ( "encoding/xml" + "fmt" "strings" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" @@ -48,6 +49,16 @@ func (i XMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error { meta.RequiredCapabilities.Add(v1.CapabilityRest) case "circuitBreaker": meta.RequiredCapabilities.Add(v1.CapabilityCircuitBreaker) + case "json": + dataFormatID := defaultJSONDataFormat + for _, a := range se.Attr { + if a.Name.Local == "library" { + dataFormatID = strings.ToLower(fmt.Sprintf("%s", a.Value)) + } + } + if dfDep := i.catalog.GetArtifactByDataFormat(dataFormatID); dfDep != nil { + meta.Dependencies.Add(dfDep.GetDependencyID()) + } case "language": for _, a := range se.Attr { if a.Name.Local == "language" { diff --git a/pkg/util/source/inspector_yaml.go b/pkg/util/source/inspector_yaml.go index a28ac260e..df3fb077d 100644 --- a/pkg/util/source/inspector_yaml.go +++ b/pkg/util/source/inspector_yaml.go @@ -65,9 +65,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata meta.RequiredCapabilities.Add(v1.CapabilityRest) case "circuitBreaker": meta.RequiredCapabilities.Add(v1.CapabilityCircuitBreaker) - case "unmarshal": - fallthrough - case "marshal": + case "marshal", "unmarshal": if cm, ok := content.(map[interface{}]interface{}); ok { if js, jsOk := cm["json"]; jsOk { dataFormatID := defaultJSONDataFormat
[camel-k] 02/05: chore: polish
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8ffc3459dd8b736c43ac2ce74361d90447360682 Author: Tadayoshi Sato AuthorDate: Tue Nov 29 14:44:24 2022 +0900 chore: polish --- pkg/apis/camel/v1/camelcatalog_types_support.go | 10 +- pkg/util/camel/camel_runtime_catalog.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/apis/camel/v1/camelcatalog_types_support.go b/pkg/apis/camel/v1/camelcatalog_types_support.go index 9c0ba615b..89c4c16eb 100644 --- a/pkg/apis/camel/v1/camelcatalog_types_support.go +++ b/pkg/apis/camel/v1/camelcatalog_types_support.go @@ -74,20 +74,20 @@ func (in *CamelArtifact) GetDependencyID() string { } } -func (in *CamelArtifact) GetConsumerDependencyIDs(schemeID string) (deps []string) { +func (in *CamelArtifact) GetConsumerDependencyIDs(schemeID string) []string { return in.getDependencyIDs(schemeID, consumerScheme) } -func (in *CamelArtifact) GetProducerDependencyIDs(schemeID string) (deps []string) { +func (in *CamelArtifact) GetProducerDependencyIDs(schemeID string) []string { return in.getDependencyIDs(schemeID, producerScheme) } -func (in *CamelArtifact) getDependencyIDs(schemeID string, scope func(CamelScheme) CamelSchemeScope) (deps []string) { +func (in *CamelArtifact) getDependencyIDs(schemeID string, scope func(CamelScheme) CamelSchemeScope) []string { ads := in.getDependencies(schemeID, scope) if ads == nil { - return deps + return nil } - deps = make([]string, 0, len(ads)) + deps := make([]string, 0, len(ads)) for _, ad := range ads { deps = append(deps, ad.GetDependencyID()) } diff --git a/pkg/util/camel/camel_runtime_catalog.go b/pkg/util/camel/camel_runtime_catalog.go index 511541911..28e52e4f6 100644 --- a/pkg/util/camel/camel_runtime_catalog.go +++ b/pkg/util/camel/camel_runtime_catalog.go @@ -159,9 +159,8 @@ func (c *RuntimeCatalog) DecodeComponent(uri string) (*v1.CamelArtifact, *v1.Cam return nil, nil } uriStart := uriSplit[0] - scheme, ok := c.GetScheme(uriStart) var schemeRef *v1.CamelScheme - if ok { + if scheme, ok := c.GetScheme(uriStart); ok { schemeRef = } return c.GetArtifactByScheme(uriStart), schemeRef
[camel-k] branch release-1.10.x updated (a0f459be7 -> 74f0be7a7)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from a0f459be7 fix: upgrade configuration docs to reflect the last release 1.10.3 new ad1245647 fix(source): dataformat dependencies not resolved new 8ffc3459d chore: polish new e12978dd9 test(source): add tests for dataformat deps resolution new 8183f0a82 fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL new 74f0be7a7 chore: fix lints The 5 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: pkg/apis/camel/v1/camelcatalog_types_support.go| 10 +- pkg/util/camel/camel_runtime_catalog.go| 3 +- pkg/util/source/inspector.go | 20 ++ pkg/util/source/inspector_groovy_test.go | 131 ++--- pkg/util/source/inspector_java_script_test.go | 122 ++-- pkg/util/source/inspector_java_source_test.go | 128 ++--- pkg/util/source/inspector_kotlin_test.go | 122 ++-- pkg/util/source/inspector_xml.go | 10 + pkg/util/source/inspector_xml_test.go | 143 -- pkg/util/source/inspector_yaml.go | 4 +- pkg/util/source/inspector_yaml_test.go | 315 ++--- .../source/test_support.go}| 49 ++-- 12 files changed, 704 insertions(+), 353 deletions(-) copy pkg/{metadata/metadata_capabilities_test.go => util/source/test_support.go} (56%)
[camel-k] 01/05: fix(source): dataformat dependencies not resolved
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit ad12456477ecc9edc91293188f8f995de66c45eb Author: Tadayoshi Sato AuthorDate: Tue Nov 29 14:42:59 2022 +0900 fix(source): dataformat dependencies not resolved --- pkg/util/source/inspector.go | 21 + 1 file changed, 21 insertions(+) diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go index be2b86ddc..bda89542e 100644 --- a/pkg/util/source/inspector.go +++ b/pkg/util/source/inspector.go @@ -248,6 +248,8 @@ func (i *baseInspector) discoverDependencies(source v1.SourceSpec, meta *Metadat for _, dep := range candidateComp.GetConsumerDependencyIDs(scheme.ID) { i.addDependency(dep, meta) } + // some components require additional dependency resolution based on URI + i.addDependenciesFromUri(uri, scheme, meta) } } } @@ -260,6 +262,8 @@ func (i *baseInspector) discoverDependencies(source v1.SourceSpec, meta *Metadat for _, dep := range candidateComp.GetProducerDependencyIDs(scheme.ID) { i.addDependency(dep, meta) } + // some components require additional dependency resolution based on URI + i.addDependenciesFromUri(uri, scheme, meta) } } } @@ -306,6 +310,23 @@ func (i *baseInspector) addDependency(dependency string, meta *Metadata) { meta.Dependencies.Add(dependency) } +func (i *baseInspector) addDependenciesFromUri(uri string, scheme *v1.CamelScheme, meta *Metadata) { + switch scheme.ID { + case "dataformat": + // dataformat:name:(marshal|unmarshal)[?options] + parts := strings.Split(uri, ":") + if len(parts) < 3 { + return + } + name := parts[1] + df := i.catalog.GetArtifactByDataFormat(name) + if df == nil { + return + } + meta.Dependencies.Add(df.GetDependencyID()) + } +} + // hasOnlyPassiveEndpoints returns true if the source has no endpoint that needs to remain always active. func (i *baseInspector) hasOnlyPassiveEndpoints(fromURIs []string) bool { passivePlusHTTP := make(map[string]bool)
[GitHub] [camel-k] tadayosi merged pull request #3857: fix(source): dataformat dependencies not resolved (1.10.x)
tadayosi merged PR #3857: URL: https://github.com/apache/camel-k/pull/3857 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 03/05: test(source): add tests for dataformat deps resolution
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit e9b8dd5d1369f6984b4241350afcb31257b26ead Author: Tadayoshi Sato AuthorDate: Tue Nov 29 15:55:09 2022 +0900 test(source): add tests for dataformat deps resolution --- pkg/util/source/inspector_groovy_test.go | 131 --- pkg/util/source/inspector_java_script_test.go | 122 +++--- pkg/util/source/inspector_java_source_test.go | 128 --- pkg/util/source/inspector_kotlin_test.go | 122 +++--- pkg/util/source/inspector_xml_test.go | 143 +--- pkg/util/source/inspector_yaml_test.go| 315 +- pkg/util/source/test_support.go | 58 + 7 files changed, 700 insertions(+), 319 deletions(-) diff --git a/pkg/util/source/inspector_groovy_test.go b/pkg/util/source/inspector_groovy_test.go index d0d2a5e80..e082d9d74 100644 --- a/pkg/util/source/inspector_groovy_test.go +++ b/pkg/util/source/inspector_groovy_test.go @@ -21,34 +21,46 @@ import ( "fmt" "testing" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/apache/camel-k/pkg/util/camel" ) -const GroovyKameletEip = ` +func newTestGroovyInspector(t *testing.T) GroovyInspector { + t.Helper() + + catalog, err := camel.DefaultCatalog() + require.NoError(t, err) + + return GroovyInspector{ + baseInspector: baseInspector{ + catalog: catalog, + }, + } +} + +const groovyKameletEip = ` from("direct:start") .kamelet("foo/bar?baz=test") ` -const GroovyKameletEipSingleQuote = ` +const groovyKameletEipSingleQuote = ` from("direct:start") .kamelet('foo/bar?baz=test') ` -const GroovyKameletEndpoint = ` +const groovyKameletEndpoint = ` from("direct:start") .to("kamelet:foo/bar?baz=test") ` -const GroovyKameletEndpointSingleQuote = ` +const groovyKameletEndpointSingleQuote = ` from("direct:start") .to('kamelet:foo/bar?baz=test') ` -const GroovyWireTapEipSingleQuote = ` +const groovyWireTapEipSingleQuote = ` from("direct:start") .wireTap('kamelet:foo/bar?baz=test') ` @@ -59,53 +71,102 @@ func TestGroovyKamelet(t *testing.T) { kamelets []string }{ { - source: GroovyKameletEip, + source: groovyKameletEip, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEndpoint, + source: groovyKameletEndpoint, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEipSingleQuote, + source: groovyKameletEipSingleQuote, kamelets: []string{"foo/bar"}, }, { - source: GroovyKameletEndpointSingleQuote, + source: groovyKameletEndpointSingleQuote, kamelets: []string{"foo/bar"}, }, { - source: GroovyWireTapEipSingleQuote, + source: groovyWireTapEipSingleQuote, kamelets: []string{"foo/bar"}, }, } + inspector := newTestGroovyInspector(t) for i := range tc { test := tc[i] t.Run(fmt.Sprintf("TestGroovyKamelet-%d", i), func(t *testing.T) { - code := v1.SourceSpec{ - DataSpec: v1.DataSpec{ - Content: test.source, - }, - } - - catalog, err := camel.DefaultCatalog() - assert.Nil(t, err) - - meta := NewMetadata() - inspector := GroovyInspector{ - baseInspector: baseInspector{ - catalog: catalog, - }, - } - - err = inspector.Extract(code, ) - assert.Nil(t, err) - assert.True(t, meta.RequiredCapabilities.IsEmpty()) - - for _, k := range test.kamelets { - assert.Contains(t, meta.Kamelets, k) - } + assertExtract(t, inspector, test.source, func(meta *Metadata) { + assert.True(t, meta.RequiredCapabilities.IsEmpty()) + for _, k := range test.kamelets { + assert.Contains(t, meta.Kamelets,
[camel-k] branch main updated (363ef36ac -> 9406a84a1)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 363ef36ac Updated CHANGELOG.md new c6f017163 fix(source): dataformat dependencies not resolved new 6374977a8 chore: polish new e9b8dd5d1 test(source): add tests for dataformat deps resolution new 895d5 fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL new 9406a84a1 chore: fix lints The 5 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: pkg/apis/camel/v1/camelcatalog_types_support.go| 10 +- pkg/util/camel/camel_runtime_catalog.go| 3 +- pkg/util/source/inspector.go | 23 ++ pkg/util/source/inspector_groovy_test.go | 131 ++--- pkg/util/source/inspector_java_script_test.go | 122 ++-- pkg/util/source/inspector_java_source_test.go | 128 ++--- pkg/util/source/inspector_kotlin_test.go | 122 ++-- pkg/util/source/inspector_xml.go | 10 + pkg/util/source/inspector_xml_test.go | 143 -- pkg/util/source/inspector_yaml.go | 4 +- pkg/util/source/inspector_yaml_test.go | 315 ++--- .../source/test_support.go}| 50 ++-- 12 files changed, 707 insertions(+), 354 deletions(-) copy pkg/{metadata/metadata_capabilities_test.go => util/source/test_support.go} (56%)
[camel-k] 01/05: fix(source): dataformat dependencies not resolved
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit c6f017163d20af9bbacfd89b77f4a1a3710408da Author: Tadayoshi Sato AuthorDate: Tue Nov 29 14:42:59 2022 +0900 fix(source): dataformat dependencies not resolved --- pkg/util/source/inspector.go | 24 1 file changed, 24 insertions(+) diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go index b8334bae6..8ab840f6d 100644 --- a/pkg/util/source/inspector.go +++ b/pkg/util/source/inspector.go @@ -353,6 +353,30 @@ func (i *baseInspector) addDependencies(uri string, meta *Metadata, consumer boo meta.AddDependency(dep) } + // some components require additional dependency resolution based on URI + if err := i.addDependenciesFromUri(uri, scheme, meta); err != nil { + return err + } + + return nil +} + +func (i *baseInspector) addDependenciesFromUri(uri string, scheme *v1.CamelScheme, meta *Metadata) error { + switch scheme.ID { + case "dataformat": + // dataformat:name:(marshal|unmarshal)[?options] + parts := strings.Split(uri, ":") + if len(parts) < 3 { + return fmt.Errorf("invalid dataformat uri: %s", uri) + } + name := parts[1] + df := i.catalog.GetArtifactByDataFormat(name) + if df == nil { + return fmt.Errorf("dataformat %q not found: %s", name, uri) + } + meta.AddDependency(df.GetDependencyID()) + } + return nil }
[camel-k] 05/05: chore: fix lints
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 9406a84a1b5713301b2c73c37ed3436e4a15ee2b Author: Tadayoshi Sato AuthorDate: Tue Nov 29 16:45:47 2022 +0900 chore: fix lints --- pkg/util/source/inspector.go | 7 +++ pkg/util/source/inspector_groovy_test.go | 8 pkg/util/source/inspector_java_script_test.go | 8 pkg/util/source/inspector_java_source_test.go | 8 pkg/util/source/inspector_kotlin_test.go | 8 pkg/util/source/inspector_xml.go | 3 +-- pkg/util/source/inspector_xml_test.go | 8 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go index 8ab840f6d..694cad3b8 100644 --- a/pkg/util/source/inspector.go +++ b/pkg/util/source/inspector.go @@ -354,16 +354,15 @@ func (i *baseInspector) addDependencies(uri string, meta *Metadata, consumer boo } // some components require additional dependency resolution based on URI - if err := i.addDependenciesFromUri(uri, scheme, meta); err != nil { + if err := i.addDependenciesFromURI(uri, scheme, meta); err != nil { return err } return nil } -func (i *baseInspector) addDependenciesFromUri(uri string, scheme *v1.CamelScheme, meta *Metadata) error { - switch scheme.ID { - case "dataformat": +func (i *baseInspector) addDependenciesFromURI(uri string, scheme *v1.CamelScheme, meta *Metadata) error { + if scheme.ID == "dataformat" { // dataformat:name:(marshal|unmarshal)[?options] parts := strings.Split(uri, ":") if len(parts) < 3 { diff --git a/pkg/util/source/inspector_groovy_test.go b/pkg/util/source/inspector_groovy_test.go index e082d9d74..5dc3f05ae 100644 --- a/pkg/util/source/inspector_groovy_test.go +++ b/pkg/util/source/inspector_groovy_test.go @@ -106,12 +106,12 @@ func TestGroovyKamelet(t *testing.T) { } } -const groovyJsonEip = ` +const groovyJSONEip = ` from("direct:start") .unmarshal().json() ` -const groovyJsonJacksonEip = ` +const groovyJSONJacksonEip = ` from("direct:start") .unmarshal().json(JsonLibrary.Jackson) ` @@ -137,11 +137,11 @@ func TestGroovyDataFormat(t *testing.T) { deps []string }{ { - source: groovyJsonEip, + source: groovyJSONEip, deps: []string{"camel:jackson"}, }, { - source: groovyJsonJacksonEip, + source: groovyJSONJacksonEip, deps: []string{"camel:jackson"}, }, { diff --git a/pkg/util/source/inspector_java_script_test.go b/pkg/util/source/inspector_java_script_test.go index 59f53f476..05d5efa89 100644 --- a/pkg/util/source/inspector_java_script_test.go +++ b/pkg/util/source/inspector_java_script_test.go @@ -88,12 +88,12 @@ func TestJavaScriptKamelet(t *testing.T) { } } -const javaScriptJsonEip = ` +const javaScriptJSONEip = ` from('direct:start') .unmarshal().json() ` -const javaScriptJsonJacksonEip = ` +const javaScriptJSONJacksonEip = ` from('direct:start') .unmarshal().json(JsonLibrary.Jackson) ` @@ -119,11 +119,11 @@ func TestJavaScriptDataFormat(t *testing.T) { deps []string }{ { - source: javaScriptJsonEip, + source: javaScriptJSONEip, deps: []string{"camel:jackson"}, }, { - source: javaScriptJsonJacksonEip, + source: javaScriptJSONJacksonEip, deps: []string{"camel:jackson"}, }, { diff --git a/pkg/util/source/inspector_java_source_test.go b/pkg/util/source/inspector_java_source_test.go index 6fddf4203..d84a0d868 100644 --- a/pkg/util/source/inspector_java_source_test.go +++ b/pkg/util/source/inspector_java_source_test.go @@ -88,12 +88,12 @@ func TestJavaSourceKamelet(t *testing.T) { } } -const javaSourceJsonEip = ` +const javaSourceJSONEip = ` from("direct:start") .unmarshal().json(); ` -const javaSourceJsonJacksonEip = ` +const javaSourceJSONJacksonEip = ` from("direct:start") .unmarshal().json(JsonLibrary.Jackson); ` @@ -119,11 +119,11 @@ func TestJavaSourceDataFormat(t *testing.T) { deps []string }{ { - source: javaSourceJsonEip, + source: javaSourceJSONEip, deps: []string{"camel:jackson"}, }, { - source: javaSourceJsonJacksonEip, + source:
[camel-k] 04/05: fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 895d510840ec6bd77302a72f5063018e5379 Author: Tadayoshi Sato AuthorDate: Tue Nov 29 16:39:27 2022 +0900 fix(source): dependency for marshal/unmarshal DSL not resolved in XML DSL --- pkg/util/source/inspector_xml.go | 11 +++ pkg/util/source/inspector_yaml.go | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/util/source/inspector_xml.go b/pkg/util/source/inspector_xml.go index 3e55eb3b9..2a3beb759 100644 --- a/pkg/util/source/inspector_xml.go +++ b/pkg/util/source/inspector_xml.go @@ -19,6 +19,7 @@ package source import ( "encoding/xml" + "fmt" "strings" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" @@ -48,6 +49,16 @@ func (i XMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error { meta.RequiredCapabilities.Add(v1.CapabilityRest) case "circuitBreaker": meta.RequiredCapabilities.Add(v1.CapabilityCircuitBreaker) + case "json": + dataFormatID := defaultJSONDataFormat + for _, a := range se.Attr { + if a.Name.Local == "library" { + dataFormatID = strings.ToLower(fmt.Sprintf("%s", a.Value)) + } + } + if dfDep := i.catalog.GetArtifactByDataFormat(dataFormatID); dfDep != nil { + meta.AddDependency(dfDep.GetDependencyID()) + } case "language": for _, a := range se.Attr { if a.Name.Local == "language" { diff --git a/pkg/util/source/inspector_yaml.go b/pkg/util/source/inspector_yaml.go index e672f763d..42cd9f58e 100644 --- a/pkg/util/source/inspector_yaml.go +++ b/pkg/util/source/inspector_yaml.go @@ -69,9 +69,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata meta.RequiredCapabilities.Add(v1.CapabilityRest) case "circuitBreaker": meta.RequiredCapabilities.Add(v1.CapabilityCircuitBreaker) - case "unmarshal": - fallthrough - case "marshal": + case "marshal", "unmarshal": if cm, ok := content.(map[interface{}]interface{}); ok { if js, jsOk := cm["json"]; jsOk { dataFormatID := defaultJSONDataFormat
[camel-k] 02/05: chore: polish
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 6374977a8759e286420207a3d51c44024ee3e783 Author: Tadayoshi Sato AuthorDate: Tue Nov 29 14:44:24 2022 +0900 chore: polish --- pkg/apis/camel/v1/camelcatalog_types_support.go | 10 +- pkg/util/camel/camel_runtime_catalog.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/apis/camel/v1/camelcatalog_types_support.go b/pkg/apis/camel/v1/camelcatalog_types_support.go index 1106a8b51..3434e255b 100644 --- a/pkg/apis/camel/v1/camelcatalog_types_support.go +++ b/pkg/apis/camel/v1/camelcatalog_types_support.go @@ -101,20 +101,20 @@ func (in *CamelArtifact) GetDependencyID() string { } } -func (in *CamelArtifact) GetConsumerDependencyIDs(schemeID string) (deps []string) { +func (in *CamelArtifact) GetConsumerDependencyIDs(schemeID string) []string { return in.getDependencyIDs(schemeID, consumerScheme) } -func (in *CamelArtifact) GetProducerDependencyIDs(schemeID string) (deps []string) { +func (in *CamelArtifact) GetProducerDependencyIDs(schemeID string) []string { return in.getDependencyIDs(schemeID, producerScheme) } -func (in *CamelArtifact) getDependencyIDs(schemeID string, scope func(CamelScheme) CamelSchemeScope) (deps []string) { +func (in *CamelArtifact) getDependencyIDs(schemeID string, scope func(CamelScheme) CamelSchemeScope) []string { ads := in.getDependencies(schemeID, scope) if ads == nil { - return deps + return nil } - deps = make([]string, 0, len(ads)) + deps := make([]string, 0, len(ads)) for _, ad := range ads { deps = append(deps, ad.GetDependencyID()) } diff --git a/pkg/util/camel/camel_runtime_catalog.go b/pkg/util/camel/camel_runtime_catalog.go index 25da254e4..3305bd10b 100644 --- a/pkg/util/camel/camel_runtime_catalog.go +++ b/pkg/util/camel/camel_runtime_catalog.go @@ -186,9 +186,8 @@ func (c *RuntimeCatalog) DecodeComponent(uri string) (*v1.CamelArtifact, *v1.Cam return nil, nil } uriStart := uriSplit[0] - scheme, ok := c.GetScheme(uriStart) var schemeRef *v1.CamelScheme - if ok { + if scheme, ok := c.GetScheme(uriStart); ok { schemeRef = } return c.GetArtifactByScheme(uriStart), schemeRef
[GitHub] [camel-k] tadayosi merged pull request #3856: fix(source): dataformat dependencies not resolved
tadayosi merged PR #3856: URL: https://github.com/apache/camel-k/pull/3856 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on pull request #3856: fix(source): dataformat dependencies not resolved
tadayosi commented on PR #3856: URL: https://github.com/apache/camel-k/pull/3856#issuecomment-1331611537 I'll fix the flaky tests in subsequent pull reqs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch automatic-periodic-sync updated (004c6178b -> d753363e1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git discard 004c6178b [create-pull-request] automated change add f62736785 Updated CHANGELOG.md add d753363e1 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (004c6178b) \ N -- N -- N refs/heads/automatic-periodic-sync (d753363e1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+)
[GitHub] [camel-karavan] mgubaidullin opened a new issue, #536: Add Fault Tolerance to Camel Status Collector
mgubaidullin opened a new issue, #536: URL: https://github.com/apache/camel-karavan/issues/536 https://github.com/apache/camel-karavan/blob/253b6090f6937d5272ed71518a12f27125b2df65/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java#L118 https://quarkus.io/guides/smallrye-fault-tolerance -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 363ef36ac Updated CHANGELOG.md 363ef36ac is described below commit 363ef36ac0655f579c3cdbe0df4785e44480c313 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 30 03:18:42 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ef116ead..1ae169fe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Drop support for Openshift 3 and related E2E test [\#3421](https://github.com/apache/camel-k/issues/3421) - Turn AWS region parameter into an enum? [\#3289](https://github.com/apache/camel-k/issues/3289) - Install Camel-K Operator based on Helm Chart with --global option [\#3054](https://github.com/apache/camel-k/issues/3054) +- Camel 3.15 - Data formats renamed [\#2880](https://github.com/apache/camel-k/issues/2880) ## [1.10.4-nightly](https://github.com/apache/camel-k/tree/1.10.4-nightly) (2022-11-14)
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 4a5cdc7769 Updated CHANGELOG.md 4a5cdc7769 is described below commit 4a5cdc77691629bdf7b53dd18d5c640f538d64a9 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 30 03:18:13 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 525d7a4a6a..ad797470d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ **Closed issues:** +- camel-quarkus-catalog - Make it possible to get the camel version [\#4301](https://github.com/apache/camel-quarkus/issues/4301) +- camel-quarkus-http - ClassNotFoundException - javax.servlet.http.HttpServletRequest [\#4300](https://github.com/apache/camel-quarkus/issues/4300) - The used Quarkus version in camel-quarkus 2.13.1 [\#4278](https://github.com/apache/camel-quarkus/issues/4278) - Remove `camel-quarkus-support-xstream` dependency from Salesforce extension [\#4272](https://github.com/apache/camel-quarkus/issues/4272) - Automatic configuration of FileLockClusterService [\#4262](https://github.com/apache/camel-quarkus/issues/4262) @@ -25,6 +27,7 @@ **Merged pull requests:** +- camel-quarkus-catalog - Make it possible to get the camel version [\#4302](https://github.com/apache/camel-quarkus/pull/4302) ([ppalaga](https://github.com/ppalaga)) - Minor tidy up of controlbus extension documentation [\#4296](https://github.com/apache/camel-quarkus/pull/4296) ([jamesnetherton](https://github.com/jamesnetherton)) - Extend tests with RAW and CXF\_MESSAGE dataFormats [\#4293](https://github.com/apache/camel-quarkus/pull/4293) ([llowinge](https://github.com/llowinge)) - Add a separate version property for FHIR core dependencies [\#4292](https://github.com/apache/camel-quarkus/pull/4292) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-kamelets] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 38fb581a Updated CHANGELOG.md 38fb581a is described below commit 38fb581ad7ee06814c99d36080001b266bf1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 30 03:13:25 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 776310d3..9bd95dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Add an Azure Storage Blob CDC Source Kamelet [\#1185](https://github.com/apache/camel-kamelets/issues/1185) - Azure Storage Blob Sink Kamelet: Add it-test [\#1182](https://github.com/apache/camel-kamelets/issues/1182) - Add delay parameter to all SQL Source Kamelets [\#1161](https://github.com/apache/camel-kamelets/issues/1161) - Azure Storage Blob Changefeed Source Kamelet: Add CredentialType to parameters [\#1158](https://github.com/apache/camel-kamelets/issues/1158) @@ -22,6 +23,8 @@ **Merged pull requests:** +- Add an Azure Storage Blob CDC Source Kamelet - Fix description [\#1187](https://github.com/apache/camel-kamelets/pull/1187) ([oscerd](https://github.com/oscerd)) +- Add an Azure Storage Blob CDC Source Kamelet [\#1186](https://github.com/apache/camel-kamelets/pull/1186) ([oscerd](https://github.com/oscerd)) - Added repeatCount parameter to timer source Kamelet [\#1184](https://github.com/apache/camel-kamelets/pull/1184) ([oscerd](https://github.com/oscerd)) - Azure Storage Blob Sink Kamelet: Add it-test to Makefile [\#1183](https://github.com/apache/camel-kamelets/pull/1183) ([oscerd](https://github.com/oscerd)) - Fix mail-sink Kamelet [\#1181](https://github.com/apache/camel-kamelets/pull/1181) ([christophd](https://github.com/christophd))
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new f62736785 Updated CHANGELOG.md f62736785 is described below commit f62736785bd730dab11106ed261ab978ea2e9a4e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 30 03:12:02 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37bb6ddb6..fbceaa912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- SCP / SFTP connectors do not allow setting private keys for SSH authentication [\#1470](https://github.com/apache/camel-kafka-connector/issues/1470) +- FTP/SFTP sink connectors do not allow setting binary mode for transferring files [\#1469](https://github.com/apache/camel-kafka-connector/issues/1469) - Upgrade to Camel 3.18.2 and Camel-Kamelets-catalog 0.9.1 [\#1449](https://github.com/apache/camel-kafka-connector/issues/1449) - camel-rabbitmq-source-kafka-connector: Unable to specify vhost [\#1442](https://github.com/apache/camel-kafka-connector/issues/1442)
[GitHub] [camel-karavan] mgubaidullin closed issue #495: Include // camel-k header to allow camel-k tooling assistance
mgubaidullin closed issue #495: Include // camel-k header to allow camel-k tooling assistance URL: https://github.com/apache/camel-karavan/issues/495 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on issue #4281: Change the "Add camel-foo jar" message to "Add camel-quarkus-foo" jar.
zhfeng commented on issue #4281: URL: https://github.com/apache/camel-quarkus/issues/4281#issuecomment-1331538345 It seems that we need to make some changes with https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/NoSuchEndpointException.java#L28-L29 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1331531208 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 3579109962-847-a41c081d-2f1f-4469-9467-b821be48c8a3 * Camel Quarkus Commit: d79822579b0d976bd70dde77ded366ec4fd3abfd * Camel Main Commit: 4b2a0cc9284b29586fb0176e11f214af4432537b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3579109962 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on issue #4281: Change the "Add camel-foo jar" message to "Add camel-quarkus-foo" jar.
zhfeng commented on issue #4281: URL: https://github.com/apache/camel-quarkus/issues/4281#issuecomment-1331529170 So it might be similar issue in camel-spring-boot to suggest adding `org.apache.camel.springboot:camel-foo-starter` ? It should be configurable for different runtime underly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (4700999c281 -> abbe1f435b0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 4700999c281 Regen add abbe1f435b0 [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../springboot/catalog/components/splunk-hec.json | 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 233 +++-- 2 files changed, 76 insertions(+), 159 deletions(-)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #676: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #676: URL: https://github.com/apache/camel-spring-boot/pull/676 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch automatic-periodic-sync updated (349c31bd -> 4a4c2cc4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git omit 349c31bd [create-pull-request] automated change add 4a4c2cc4 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (349c31bd) \ N -- N -- N refs/heads/automatic-periodic-sync (4a4c2cc4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel] github-actions[bot] commented on pull request #8796: change the source type to module for JS dsl + fix test scripts
github-actions[bot] commented on PR #8796: URL: https://github.com/apache/camel/pull/8796#issuecomment-1331470482 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] hguerrero opened a new pull request, #8796: change the source type to module for JS dsl + fix test scripts
hguerrero opened a new pull request, #8796: URL: https://github.com/apache/camel/pull/8796 The change to treat routes as modules are required to have a clear definition of the variables used. Adding `const` into the routes fixes the broken scripts. I left the same name but added the mime type for the source, as we need to treat everything as a module, including the route code. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] brokenjacobs closed issue #1469: FTP/SFTP sink connectors do not allow setting binary mode for transferring files
brokenjacobs closed issue #1469: FTP/SFTP sink connectors do not allow setting binary mode for transferring files URL: https://github.com/apache/camel-kafka-connector/issues/1469 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] brokenjacobs commented on issue #1469: FTP/SFTP sink connectors do not allow setting binary mode for transferring files
brokenjacobs commented on issue #1469: URL: https://github.com/apache/camel-kafka-connector/issues/1469#issuecomment-1331332139 Resolved in upstream -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] brokenjacobs commented on issue #1470: SCP / SFTP connectors do not allow setting private keys for SSH authentication
brokenjacobs commented on issue #1470: URL: https://github.com/apache/camel-kafka-connector/issues/1470#issuecomment-1331331938 Resolved in upstream -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] brokenjacobs closed issue #1470: SCP / SFTP connectors do not allow setting private keys for SSH authentication
brokenjacobs closed issue #1470: SCP / SFTP connectors do not allow setting private keys for SSH authentication URL: https://github.com/apache/camel-kafka-connector/issues/1470 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: camel-quarkus-catalog - Make it possible to get the camel version #4301
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 4b2a0cc928 camel-quarkus-catalog - Make it possible to get the camel version #4301 4b2a0cc928 is described below commit 4b2a0cc9284b29586fb0176e11f214af4432537b Author: Peter Palaga AuthorDate: Tue Nov 29 11:05:24 2022 +0100 camel-quarkus-catalog - Make it possible to get the camel version #4301 --- .../quarkus/maven/PrepareCatalogQuarkusMojo.java | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java index 5e2fc00ba8..056c10109f 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java @@ -49,6 +49,8 @@ import org.apache.maven.plugins.annotations.Parameter; public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo { public static final String CAMEL_ARTIFACT = "camelArtifact"; +public static final String CAMEL_VERSION = "camelVersion"; +public static final String QUARKUS_VERSION = "quarkusVersion"; /** * The output directory where the catalog files should be written. */ @@ -65,6 +67,14 @@ public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo { @Parameter(property = "cq.extendClassPathCatalog", defaultValue = "false") boolean extendClassPathCatalog; +/** + * Quarkus (core) version the current source tree depends on. + * + * @since 2.15.0 + */ +@Parameter(property = "quarkus.version", required = true) +String quarkusVersion; + @Override public void execute() throws MojoExecutionException, MojoFailureException { final Path catalogPath = catalogBaseDir.toPath().resolve(CqCatalog.CQ_CATALOG_DIR); @@ -135,12 +145,12 @@ public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo { "description is missing in " + ext.getRuntimePomXmlPath(; model.setDeprecated(CqUtils.isDeprecated(title, models, ext.isDeprecated())); model.setLabel(ext.getLabel().orElse("quarkus")); -update(model, ext, nativeSupported); +update(model, ext, nativeSupported, quarkusVersion); CqCatalog.serialize(catalogPath, model); schemesByKind.get(model.getKind()).add(model.getName()); } else { for (ArtifactModel model : models) { -update(model, ext, nativeSupported); +update(model, ext, nativeSupported, quarkusVersion); CqCatalog.serialize(catalogPath, model); schemesByKind.get(model.getKind()).add(model.getName()); } @@ -161,12 +171,16 @@ public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo { } -private static void update(ArtifactModel model, CamelQuarkusExtension ext, boolean nativeSupported) { +private static void update(ArtifactModel model, CamelQuarkusExtension ext, boolean nativeSupported, +String quarkusVersion) { final String firstVersion = ext.getJvmSince() .orElseThrow(() -> new RuntimeException( "firstVersion property is missing in " + ext.getRuntimePomXmlPath())); +final Map metadata = model.getMetadata(); +metadata.put(QUARKUS_VERSION, quarkusVersion); if (model.getArtifactId() != null && model.getGroupId() != null) { -model.getMetadata().put(CAMEL_ARTIFACT, model.getGroupId() + ":" + model.getArtifactId()); +metadata.put(CAMEL_ARTIFACT, model.getGroupId() + ":" + model.getArtifactId()); +metadata.put(CAMEL_VERSION, model.getVersion()); } // lets use the camel-quarkus version as first version instead of Apache Camel // version
[GitHub] [camel-quarkus] ppalaga closed issue #4301: camel-quarkus-catalog - Make it possible to get the camel version
ppalaga closed issue #4301: camel-quarkus-catalog - Make it possible to get the camel version URL: https://github.com/apache/camel-quarkus/issues/4301 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga merged pull request #4302: camel-quarkus-catalog - Make it possible to get the camel version
ppalaga merged PR #4302: URL: https://github.com/apache/camel-quarkus/pull/4302 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #4281: Change the "Add camel-foo jar" message to "Add camel-quarkus-foo" jar.
ppalaga commented on issue #4281: URL: https://github.com/apache/camel-quarkus/issues/4281#issuecomment-1331243745 Yes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8785: CAMEL-18766 Fixes bug in camel-support
github-actions[bot] commented on PR #8785: URL: https://github.com/apache/camel/pull/8785#issuecomment-1331165005 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 6 | 6 | 1 | 6 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #8785: CAMEL-18766 Fixes bug in camel-support
orpiske commented on PR #8785: URL: https://github.com/apache/camel/pull/8785#issuecomment-1331131377 > Thanks for the heads up. I'll retest tonight and I'll comment tomorrow morning about how it is going. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] christophd commented on a diff in pull request #1162: chore: Introduce Kamelet input/output data types
christophd commented on code in PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#discussion_r1035109793 ## library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java: ## @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.kamelets.utils.format.converter.aws2.s3; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.component.aws2.s3.AWS2S3Constants; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter; +import org.apache.camel.kamelets.utils.format.spi.annotations.DataType; + +/** + * Output data type represents AWS S3 get object response as CloudEvent V1. The data type sets Camel specific + * CloudEvent headers on the exchange. + */ +@DataType(scheme = "aws2-s3", name = "cloudevents", mediaType = "application/octet-stream") +public class AWS2S3CloudEventOutputType implements DataTypeConverter { + +static final String CAMEL_CLOUD_EVENT_TYPE = "CamelCloudEventType"; +static final String CAMEL_CLOUD_EVENT_SOURCE = "CamelCloudEventSource"; +static final String CAMEL_CLOUD_EVENT_SUBJECT = "CamelCloudEventSubject"; +static final String CAMEL_CLOUD_EVENT_TIME = "CamelCloudEventTime"; + +@Override +public void convert(Exchange exchange) { +final Map headers = exchange.getMessage().getHeaders(); + +headers.put(CAMEL_CLOUD_EVENT_TYPE, "kamelet.aws.s3.source"); Review Comment: Ah, these are good suggestions! So the type would be something like `org.apache.camel.event.aws.s3.{{operation}}` and the source something like `aws.s3.bucket.{{bucketName}}` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] christophd commented on a diff in pull request #1162: chore: Introduce Kamelet input/output data types
christophd commented on code in PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#discussion_r1035109793 ## library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java: ## @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.kamelets.utils.format.converter.aws2.s3; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.component.aws2.s3.AWS2S3Constants; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter; +import org.apache.camel.kamelets.utils.format.spi.annotations.DataType; + +/** + * Output data type represents AWS S3 get object response as CloudEvent V1. The data type sets Camel specific + * CloudEvent headers on the exchange. + */ +@DataType(scheme = "aws2-s3", name = "cloudevents", mediaType = "application/octet-stream") +public class AWS2S3CloudEventOutputType implements DataTypeConverter { + +static final String CAMEL_CLOUD_EVENT_TYPE = "CamelCloudEventType"; +static final String CAMEL_CLOUD_EVENT_SOURCE = "CamelCloudEventSource"; +static final String CAMEL_CLOUD_EVENT_SUBJECT = "CamelCloudEventSubject"; +static final String CAMEL_CLOUD_EVENT_TIME = "CamelCloudEventTime"; + +@Override +public void convert(Exchange exchange) { +final Map headers = exchange.getMessage().getHeaders(); + +headers.put(CAMEL_CLOUD_EVENT_TYPE, "kamelet.aws.s3.source"); Review Comment: Ah, these are good suggestions! So the type would be something like `org.apache.camel.event.aws.s3.{{operation}}` and the source something like `aws.s3.{{bucketName}}` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] thuri commented on pull request #8785: CAMEL-18766 Fixes bug in camel-support
thuri commented on PR #8785: URL: https://github.com/apache/camel/pull/8785#issuecomment-1331094435 I have squashed the changes that actual fix the issue and the small commit that has been made by github. I'd leave the other changes as separate commits because they're not really related to the issue. One commit is the default implementation of the run(Predicate) method. The other commit is moving the latch and the completed flag to the object level. @orpiske If possible it would be good to repeat the manual test especially because the completed flag and latch are now member variables. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (9f83da7a0a8 -> de618ec7f31)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 9f83da7a0a8 Fixed website build. add de618ec7f31 camel-salesforce: Fix param name/usage No new revisions were added by this update. Summary of changes: .../src/main/docs/salesforce-component.adoc | 4 ++-- .../internal/processor/CompositeSObjectCollectionsProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (89691a2a857 -> 9f83da7a0a8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 89691a2a857 CAMEL-18764: camel-core - Add unit test and fix regressions (#8794) add 9f83da7a0a8 Fixed website build. No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/components/splunk-hec.json | 2 +- .../resources/org/apache/camel/component/splunkhec/splunk-hec.json| 2 +- .../org/apache/camel/component/splunkhec/SplunkHECConfiguration.java | 4 +--- .../camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-)
[camel] branch main updated: camel-salesforce: Fix param name/usage
This is an automated email from the ASF dual-hosted git repository. jeremyross 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 de618ec7f31 camel-salesforce: Fix param name/usage de618ec7f31 is described below commit de618ec7f3103f8a4d2e1d877a356cdeb971907f Author: Jeremy Ross AuthorDate: Tue Nov 29 11:08:01 2022 -0600 camel-salesforce: Fix param name/usage for the retrieve sobject collections operation --- .../src/main/docs/salesforce-component.adoc | 4 ++-- .../internal/processor/CompositeSObjectCollectionsProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc index 7b7e6961839..6e57d7878e5 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc +++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc @@ -912,8 +912,8 @@ Retrieve one or more records of the same object type. |=== | Parameter | Type | Description | Default | Required -| ids | List of String or comma-separated string | A list of one or more IDs of the objects to return. All IDs must belong to the same object type. | | x -| fields | List of String or comma-separated string | A list of fields to include in the response. The field names you specify must be valid, and you must have read-level permissions to each field. | | x +| sObjectIds | List of String or comma-separated string | A list of one or more IDs of the objects to return. All IDs must belong to the same object type. | | x +| sObjectFields | List of String or comma-separated string | A list of fields to include in the response. The field names you specify must be valid, and you must have read-level permissions to each field. | | x | sObjectName | String | Type of SObject, e.g. `Account` | | x | sObjectClass | String | Fully-qualified class name of DTO class to use for deserializing the response. | | Required if `sObjectName` parameter does not resolve to a class that exists in the package specified by the `package` option. |=== diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java index 979c2d4708b..4627a02d830 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java @@ -93,8 +93,8 @@ public class CompositeSObjectCollectionsProcessor extends AbstractSalesforceProc private boolean processRetrieveSObjectCollections(Exchange exchange, AsyncCallback callback) throws SalesforceException { -List ids = getListParameter(SalesforceEndpointConfig.SOBJECT_IDS, exchange, USE_BODY, NOT_OPTIONAL); -List fields = getListParameter(SalesforceEndpointConfig.SOBJECT_FIELDS, exchange, USE_BODY, NOT_OPTIONAL); +List ids = getListParameter(SalesforceEndpointConfig.SOBJECT_IDS, exchange, IGNORE_BODY, NOT_OPTIONAL); +List fields = getListParameter(SalesforceEndpointConfig.SOBJECT_FIELDS, exchange, IGNORE_BODY, NOT_OPTIONAL); String sObjectName = getParameter(SalesforceEndpointConfig.SOBJECT_NAME, exchange, IGNORE_BODY, IS_OPTIONAL); // gets class by sObjectName if not null, otherwise tries the SOBJECT_CLASS option
[camel] branch main updated: Fixed website build.
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 9f83da7a0a8 Fixed website build. 9f83da7a0a8 is described below commit 9f83da7a0a8113cd3c58c65f8dbb765a1837c338 Author: Claus Ibsen AuthorDate: Tue Nov 29 18:05:47 2022 +0100 Fixed website build. --- .../resources/org/apache/camel/catalog/components/splunk-hec.json | 2 +- .../resources/org/apache/camel/component/splunkhec/splunk-hec.json| 2 +- .../org/apache/camel/component/splunkhec/SplunkHECConfiguration.java | 4 +--- .../camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json index 5ff292cb02e..9d4283165b2 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json @@ -37,7 +37,7 @@ "index": { "kind": "parameter", "displayName": "Index", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk index to write to" }, "source": { "kind": "parameter", "displayName": "Source", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk source argument" }, "sourceType": { "kind": "parameter", "displayName": "Source Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk sourcetype argument" }, -"splunkEndpoint": { "kind": "parameter", "displayName": "Splunk Endpoint", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/collector\/event", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk endpoint Defaults to \/services\/collector\/event To writ [...] +"splunkEndpoint": { "kind": "parameter", "displayName": "Splunk Endpoint", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "\/services\/collector\/event", "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Splunk endpoint Defaults to \/services\/collector\/event To writ [...] "time": { "kind": "parameter", "displayName": "Time", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Time this even occurred. By default, the time will be when this event hits the splunk server." }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...] "https": { "kind": "parameter", "displayName": "Https", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.splunkhec.SplunkHECConfiguration", "configurationField": "configuration", "description": "Contact HEC over https." }, diff --git
[GitHub] [camel] github-actions[bot] commented on pull request #8795: CAMEL-18739 fix by handing over the completion to the original exchange
github-actions[bot] commented on PR #8795: URL: https://github.com/apache/camel/pull/8795#issuecomment-1330897076 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] lx183 opened a new pull request, #8795: CAMEL-18739 fix by handing over the completion to the original exchange
lx183 opened a new pull request, #8795: URL: https://github.com/apache/camel/pull/8795 Handing over the completions in the MultiCastProcessor solves an issue, where temporary files were not cleaned up after using a route with a "Split Definition" Detaisl can be found in CAMEL-18739 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] lburgazzoli commented on a diff in pull request #1162: chore: Introduce Kamelet input/output data types
lburgazzoli commented on code in PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#discussion_r1034946699 ## library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java: ## @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.kamelets.utils.format.converter.aws2.s3; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.component.aws2.s3.AWS2S3Constants; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter; +import org.apache.camel.kamelets.utils.format.spi.annotations.DataType; + +/** + * Output data type represents AWS S3 get object response as CloudEvent V1. The data type sets Camel specific + * CloudEvent headers on the exchange. + */ +@DataType(scheme = "aws2-s3", name = "cloudevents", mediaType = "application/octet-stream") +public class AWS2S3CloudEventOutputType implements DataTypeConverter { + +static final String CAMEL_CLOUD_EVENT_TYPE = "CamelCloudEventType"; +static final String CAMEL_CLOUD_EVENT_SOURCE = "CamelCloudEventSource"; +static final String CAMEL_CLOUD_EVENT_SUBJECT = "CamelCloudEventSubject"; +static final String CAMEL_CLOUD_EVENT_TIME = "CamelCloudEventTime"; + +@Override +public void convert(Exchange exchange) { +final Map headers = exchange.getMessage().getHeaders(); + +headers.put(CAMEL_CLOUD_EVENT_TYPE, "kamelet.aws.s3.source"); Review Comment: I was more thinking on the line of the suggestion made here: https://github.com/apache/camel-k/issues/3668 so i.e: `org.apache.camel.event.aws.s3.bucket_create`, so i.e. you can distinguish what the event is about -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (ab0a7f170ca -> 89691a2a857)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from ab0a7f170ca CAMEL-18608: camel-elasticsearch - Adapt the test to behavior change in elasticsearch-java 8.5.1+ with ObjectMapper default config add 89691a2a857 CAMEL-18764: camel-core - Add unit test and fix regressions (#8794) No new revisions were added by this update. Summary of changes: .../org/apache/camel/cdi/CdiCamelExtension.java| 38 -- .../apache/camel/test/junit5/CamelTestSupport.java | 6 +++- ...a => CamelTestSupportOneContextForAllTest.java} | 17 +++--- .../java/org/apache/camel/spi/RoutesLoader.java| 3 ++ .../org/apache/camel/builder/RouteBuilder.java | 7 ++-- .../XmlMainTemplatedRouteFromDifferentDSLTest.java | 15 +++-- ...el-template.xml => camel-my-route-template.xml} | 2 +- 7 files changed, 59 insertions(+), 29 deletions(-) rename components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/{CamelTestSupporOneContextForAllTest.java => CamelTestSupportOneContextForAllTest.java} (86%) copy core/camel-main/src/test/java/org/apache/camel/main/MainTemplatedRouteTest.java => dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlMainTemplatedRouteFromDifferentDSLTest.java (85%) copy dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/{camel-template.xml => camel-my-route-template.xml} (93%)
[GitHub] [camel-kamelets] christophd commented on a diff in pull request #1162: chore: Introduce Kamelet input/output data types
christophd commented on code in PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#discussion_r1034943425 ## library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/DefaultDataTypeRegistry.java: ## @@ -0,0 +1,208 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.kamelets.utils.format; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import org.apache.camel.CamelContext; +import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; +import org.apache.camel.kamelets.utils.format.converter.standard.BinaryDataType; +import org.apache.camel.kamelets.utils.format.converter.standard.JsonModelDataType; +import org.apache.camel.kamelets.utils.format.converter.standard.StringDataType; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverterResolver; +import org.apache.camel.kamelets.utils.format.spi.DataTypeLoader; +import org.apache.camel.kamelets.utils.format.spi.DataTypeRegistry; +import org.apache.camel.kamelets.utils.format.spi.annotations.DataType; +import org.apache.camel.support.CamelContextHelper; +import org.apache.camel.support.service.ServiceSupport; +import org.apache.camel.util.ObjectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Default data type registry able to resolve data types converters in the project. Data types may be defined at the component level + * via {@link org.apache.camel.kamelets.utils.format.spi.annotations.DataType} annotations. Also, users can add data types directly + * to the Camel context or manually to the registry. + * + * The registry is able to retrieve converters for a given data type based on the component scheme and the given data type name. + */ +public class DefaultDataTypeRegistry extends ServiceSupport implements DataTypeRegistry, CamelContextAware { + +private static final Logger LOG = LoggerFactory.getLogger(DefaultDataTypeRegistry.class); + +private CamelContext camelContext; + +protected final List dataTypeLoaders = new ArrayList<>(); + +private DataTypeConverterResolver dataTypeConverterResolver; + +private boolean classpathScan = true; Review Comment: I am still having trouble to make factory finder mechanism work in the runtime with camel-quarkus. So the classpath scan is the only way to actually make it work for me at the moment. Locally in unit tests the factory finder mechanism is working fine but in the final Camel K integration runtime this is not working anymore. I have tried to make this work in setting the build time property `quarkus.camel.service.discovery.include-patterns=META-INF/services/org/apache/camel/datatype/converter/*` but this did not work for me. I need some more time to investigate. Once we have this working with camel-quarkus I am happy to disable the classpath scan by default. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (39717d73a86 -> ab0a7f170ca)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 39717d73a86 CAMEL-18772: camel-jbang - Fix run from gist causes long name that can lead to JMX MBean error. add ab0a7f170ca CAMEL-18608: camel-elasticsearch - Adapt the test to behavior change in elasticsearch-java 8.5.1+ with ObjectMapper default config No new revisions were added by this update. Summary of changes: .../es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java | 2 ++ 1 file changed, 2 insertions(+)
[GitHub] [camel-kamelets] christophd commented on a diff in pull request #1162: chore: Introduce Kamelet input/output data types
christophd commented on code in PR #1162: URL: https://github.com/apache/camel-kamelets/pull/1162#discussion_r1034935874 ## library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java: ## @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.camel.kamelets.utils.format.converter.aws2.s3; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.component.aws2.s3.AWS2S3Constants; +import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter; +import org.apache.camel.kamelets.utils.format.spi.annotations.DataType; + +/** + * Output data type represents AWS S3 get object response as CloudEvent V1. The data type sets Camel specific + * CloudEvent headers on the exchange. + */ +@DataType(scheme = "aws2-s3", name = "cloudevents", mediaType = "application/octet-stream") +public class AWS2S3CloudEventOutputType implements DataTypeConverter { + +static final String CAMEL_CLOUD_EVENT_TYPE = "CamelCloudEventType"; +static final String CAMEL_CLOUD_EVENT_SOURCE = "CamelCloudEventSource"; +static final String CAMEL_CLOUD_EVENT_SUBJECT = "CamelCloudEventSubject"; +static final String CAMEL_CLOUD_EVENT_TIME = "CamelCloudEventTime"; + +@Override +public void convert(Exchange exchange) { +final Map headers = exchange.getMessage().getHeaders(); + +headers.put(CAMEL_CLOUD_EVENT_TYPE, "kamelet.aws.s3.source"); Review Comment: The [(CloudEvents spec)](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type) states that it should be prefixed with a reverse DNS name. Something like: `org.apache.camel.kamelets.aws.s3.source` So does this make sense? Also the spec suggests to also include the type version. In our case I guess this would be the Kamelet version. Something like: `org.apache.camel.kamelets.aws.s3.source.v0.9` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba commented on issue #4281: Change the "Add camel-foo jar" message to "Add camel-quarkus-foo" jar.
zbendhiba commented on issue #4281: URL: https://github.com/apache/camel-quarkus/issues/4281#issuecomment-1330849750 So, my understanding is this is the error message we have when we start a Quarkus app with a camel extension that is not present in the dependencies. Is that correct? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] essobedo merged pull request #8794: CAMEL-18764: camel-core - Add unit test and fix regressions
essobedo merged PR #8794: URL: https://github.com/apache/camel/pull/8794 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18764: camel-core - Add unit test and fix regressions (#8794)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 89691a2a857 CAMEL-18764: camel-core - Add unit test and fix regressions (#8794) 89691a2a857 is described below commit 89691a2a857a14c498767944c651bae022f45a82 Author: Nicolas Filotto AuthorDate: Tue Nov 29 16:13:06 2022 +0100 CAMEL-18764: camel-core - Add unit test and fix regressions (#8794) ## Motivation The first fix allowing to build a templated route from a template defined using a different DSL, makes [several tests fail](https://ci-builds.apache.org/job/Camel/job/Apache%20Camel/job/main/810/testReport/) that should be fixed: * org.apache.camel.cdi.templatedroute.TemplatedRouteTest.sendMessageToInbound * org.apache.camel.component.kamelet.TemplatedRouteKameletTest.testKamelet * org.apache.camel.dsl.yaml.TemplatedRouteTest.create templated route * org.apache.camel.dsl.yaml.TemplatedRouteTest.create templated-route ## Modifications: * Add missing calls to the new method `addTemplatedRoutes` ensuring that it is called once all the route templates are added to the context * Provide the Camel context when it is known to `populateTemplatedRoutes` to prevent getting `CamelContext has not been injected` * Add a unit test ensuring that the bug is really fixed * Rename `CamelTestSupporOneContextForAllTest` to `CamelTestSupportOneContextForAllTest` and fix the violations inside (not related to the initial issue) --- .../org/apache/camel/cdi/CdiCamelExtension.java| 38 -- .../apache/camel/test/junit5/CamelTestSupport.java | 6 ++- ...a => CamelTestSupportOneContextForAllTest.java} | 17 ++ .../java/org/apache/camel/spi/RoutesLoader.java| 3 ++ .../org/apache/camel/builder/RouteBuilder.java | 7 ++- .../XmlMainTemplatedRouteFromDifferentDSLTest.java | 60 ++ .../camel/main/xml/camel-my-route-template.xml | 29 +++ 7 files changed, 142 insertions(+), 18 deletions(-) diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java index 0953d9de5f8..aac4b848071 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java @@ -23,9 +23,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.stream.Stream; @@ -432,13 +434,17 @@ public class CdiCamelExtension implements Extension { Set> routes = new HashSet<>(manager.getBeans(RoutesBuilder.class, Any.Literal.INSTANCE)); routes.addAll(manager.getBeans(RouteContainer.class, Any.Literal.INSTANCE)); for (Bean context : manager.getBeans(CamelContext.class, Any.Literal.INSTANCE)) { +List postAdditionActions = new ArrayList<>(); for (Bean route : routes) { Set qualifiers = new HashSet<>(context.getQualifiers()); qualifiers.retainAll(route.getQualifiers()); if (qualifiers.size() > 1) { -deploymentException |= !addRouteToContext(route, context, manager, adv); +deploymentException |= !addRouteToContext(route, context, manager, adv, postAdditionActions); } } +for (BooleanSupplier action : postAdditionActions) { +deploymentException |= !action.getAsBoolean(); +} } // Let's return to avoid starting misconfigured contexts if (deploymentException) { @@ -474,14 +480,40 @@ public class CdiCamelExtension implements Extension { Stream.of(producerBeans, producerQualifiers).forEach(Map::clear); } +/** + * Gives an action that adds the templated routes defined in the given builder to the given context. + * + * @return a {@link BooleanSupplier} that gives {@code true} if the addition was successful, {@code false} + * otherwise. + */ +private BooleanSupplier templatedRoutesAddition( +Bean routeBean, AfterDeploymentValidation adv, CamelContext context, RoutesBuilder builder) { +return () -> { +try { +context.addTemplatedRoutes(builder); +return true; +} catch (Exception cause) { +adv.addDeploymentProblem( +new
[GitHub] [camel] essobedo commented on pull request #8794: CAMEL-18764: camel-core - Add unit test and fix regressions
essobedo commented on PR #8794: URL: https://github.com/apache/camel/pull/8794#issuecomment-1330803234 The remaining test failures are not related to these changes but more to flaky tests in core -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18608: camel-elasticsearch - Adapt the test to behavior change in elasticsearch-java 8.5.1+ with ObjectMapper default config
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 ab0a7f170ca CAMEL-18608: camel-elasticsearch - Adapt the test to behavior change in elasticsearch-java 8.5.1+ with ObjectMapper default config ab0a7f170ca is described below commit ab0a7f170ca8dfca81cc693f7ee340ab0399cad4 Author: Nicolas Filotto AuthorDate: Tue Nov 29 16:08:22 2022 +0100 CAMEL-18608: camel-elasticsearch - Adapt the test to behavior change in elasticsearch-java 8.5.1+ with ObjectMapper default config --- .../es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java index 5dcae928c2e..a6673bf931b 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchGetSearchDeleteExistsUpdateIT.java @@ -40,6 +40,7 @@ import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody; import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader; import co.elastic.clients.elasticsearch.core.msearch.RequestItem; import co.elastic.clients.elasticsearch.core.search.HitsMetadata; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.camel.builder.RouteBuilder; @@ -831,6 +832,7 @@ class ElasticsearchGetSearchDeleteExistsUpdateIT extends ElasticsearchTestSuppor }; } +@JsonInclude(JsonInclude.Include.NON_NULL) public static class Product { private String id;
[GitHub] [camel-quarkus] ppalaga commented on issue #4281: Change the "Add camel-foo jar" message to "Add camel-quarkus-foo" jar.
ppalaga commented on issue #4281: URL: https://github.com/apache/camel-quarkus/issues/4281#issuecomment-1330750548 > Where do you want to have this message changed ? Frankly speaking, I do not know. It is probably set somewhere in Camel core. So we perhaps need to make it configurable there. Steps to reproduce are: add a route using a Camel component that is not in a class path: ``` from("direct:test") .to("foo") ``` The application should should fail to start suggesting to add `camel-foo` to class path. We want it to suggest adding `org.apache.camel.quarkus:camel-quarkus:foo` instead. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8794: CAMEL-18764: camel-core - Add unit test and fix regressions
github-actions[bot] commented on PR #8794: URL: https://github.com/apache/camel/pull/8794#issuecomment-1330747179 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 2 | 2 | 1 | 2 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch regen_bot updated (bc812c9a -> 2ec30dab)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from bc812c9a Add an Azure Storage Blob CDC Source Kamelet add 0f4604b0 Add an Azure Storage Blob CDC Source Kamelet - Fix description add 2ec30dab Add an Azure Storage Blob CDC Source Kamelet - Fix description No new revisions were added by this update. Summary of changes: kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- .../main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-kamelets] 02/02: Add an Azure Storage Blob CDC Source Kamelet - Fix description
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 2ec30dab7b159ebe0ab2b9da51d911a7418ae1e3 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:53:18 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet - Fix description Signed-off-by: Andrea Cosentino --- .../main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 253af45b..219ed0c0 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -31,7 +31,7 @@ spec: definition: title: Azure Storage Blob CDC Source description: |- - Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account. Connection string is the basic method for authenticating to the Azure Servicebus Queue.
[camel-kamelets] branch main updated (bc812c9a -> 2ec30dab)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from bc812c9a Add an Azure Storage Blob CDC Source Kamelet new 0f4604b0 Add an Azure Storage Blob CDC Source Kamelet - Fix description new 2ec30dab Add an Azure Storage Blob CDC Source Kamelet - Fix description 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: kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- .../main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-kamelets] 01/02: Add an Azure Storage Blob CDC Source Kamelet - Fix description
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 0f4604b0590b4a04dda296989bacad3802a5b5b8 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:52:21 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet - Fix description Signed-off-by: Andrea Cosentino --- kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 253af45b..219ed0c0 100644 --- a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -31,7 +31,7 @@ spec: definition: title: Azure Storage Blob CDC Source description: |- - Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account. Connection string is the basic method for authenticating to the Azure Servicebus Queue.
[GitHub] [camel-kamelets] oscerd merged pull request #1187: Add an Azure Storage Blob CDC Source Kamelet - Fix description
oscerd merged PR #1187: URL: https://github.com/apache/camel-kamelets/pull/1187 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 02/02: Add an Azure Storage Blob CDC Source Kamelet - Fix description
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch fix-cdc-azure-storage-blob in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 1ad219b5b291e7bb634a56f56736531dabf3ad28 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:53:18 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet - Fix description Signed-off-by: Andrea Cosentino --- .../main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 253af45b..219ed0c0 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -31,7 +31,7 @@ spec: definition: title: Azure Storage Blob CDC Source description: |- - Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account. Connection string is the basic method for authenticating to the Azure Servicebus Queue.
[camel-kamelets] branch fix-cdc-azure-storage-blob created (now 1ad219b5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch fix-cdc-azure-storage-blob in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 1ad219b5 Add an Azure Storage Blob CDC Source Kamelet - Fix description This branch includes the following new commits: new c1d52ece Add an Azure Storage Blob CDC Source Kamelet - Fix description new 1ad219b5 Add an Azure Storage Blob CDC Source Kamelet - Fix description 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.
[camel-kamelets] 01/02: Add an Azure Storage Blob CDC Source Kamelet - Fix description
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch fix-cdc-azure-storage-blob in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit c1d52ecee40d19f49216c947924aa4f35065c037 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:52:21 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet - Fix description Signed-off-by: Andrea Cosentino --- kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 253af45b..219ed0c0 100644 --- a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -31,7 +31,7 @@ spec: definition: title: Azure Storage Blob CDC Source description: |- - Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account. Connection string is the basic method for authenticating to the Azure Servicebus Queue.
[camel-kamelets] branch regen_bot updated (c47e751d -> bc812c9a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from c47e751d Added repeatCount parameter to timer source Kamelet add 9dfb4c6a Updated CHANGELOG.md add 5511581b Add an Azure Storage Blob CDC Source Kamelet add cd8f45b4 Add an Azure Storage Blob CDC Source Kamelet add 0a41ceb8 Add an Azure Storage Blob CDC Source Kamelet add a4c11b45 Add an Azure Storage Blob CDC Source Kamelet add bb134060 Add an Azure Storage Blob CDC Source Kamelet add bc812c9a Add an Azure Storage Blob CDC Source Kamelet No new revisions were added by this update. Summary of changes: CHANGELOG.md | 1 + docs/modules/ROOT/nav.adoc | 1 + .../azure-storage-blob-cdc-source.kamelet.yaml | 80 +++--- ... => azure-storage-blob-cdc-source.kamelet.yaml} | 80 +++--- script/validator/validator.go | 2 +- 5 files changed, 147 insertions(+), 17 deletions(-) copy library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml => kamelets/azure-storage-blob-cdc-source.kamelet.yaml (60%) copy library/camel-kamelets/src/main/resources/kamelets/{azure-servicebus-source.kamelet.yaml => azure-storage-blob-cdc-source.kamelet.yaml} (60%)
[camel-kamelets] 02/06: Add an Azure Storage Blob CDC Source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit cd8f45b43efed08a987790da9e82c17f3444eb3d Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:41:18 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet Signed-off-by: Andrea Cosentino --- .../azure-storage-blob-cdc-source.kamelet.yaml | 150 + 1 file changed, 150 insertions(+) diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml new file mode 100644 index ..781ac865 --- /dev/null +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -0,0 +1,150 @@ +# --- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --- + +apiVersion: camel.apache.org/v1alpha1 +kind: Kamelet +metadata: + name: azure-storage-blob-cdc-source + annotations: +camel.apache.org/kamelet.support.level: "Stable" +camel.apache.org/catalog.version: "main-SNAPSHOT" +camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgODEgODIiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMS4zMzMgMEMuNTMzIDAgMCAuNTMzIDAgMS4zMzN2MTZjMCAuOC41MzMgMS4zMz [...] +camel.apache.org/provider: "Apache Software Foundation" +camel.apache.org/kamelet.group: "Azure Servicebus" + labels: +camel.apache.org/kamelet.type: "source" +spec: + definition: +title: Azure Storage Blob CDC Source +description: |- + Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + + Connection string is the basic method for authenticating to the Azure Servicebus Queue. + + To use this Kamelet you'll need to set up Events on your Azure Storage Blob account and select as an endpoint an Azure Servicebus Queue. +required: + - topicOrQueueName + - connectionString + - accountName + - containerName + - accessKey +type: object +properties: + topicOrQueueName: +title: Topic Or Queue Name +description: Topic Or Queue Name for the Azure Servicebus instance +type: string + connectionString: +title: Connection String +description: Connection String for Azure Servicebus instance +type: string +format: password +x-descriptors: +- urn:alm:descriptor:com.tectonic.ui:password +- urn:camel:group:credentials + serviceBusReceiveMode: +title: Servicebus Receive Mode +description: Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE +type: string +default: RECEIVE_AND_DELETE + subscriptionName: +title: Subscription Name +description: Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic. +type: string + accountName: +title: Account Name +description: The Azure Storage Blob account name. +type: string +x-descriptors: +- urn:camel:group:credentials + containerName: +title: Container Name +description: The Azure Storage Blob container name. +type: string + accessKey: +title: Access Key +description: The Azure Storage Blob access key. +type: string +format: password +x-descriptors: +- urn:alm:descriptor:com.tectonic.ui:password +- urn:camel:group:credentials + credentialType: +title: Credential Type +description: Determines the credential
[camel-kamelets] 04/06: Add an Azure Storage Blob CDC Source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit a4c11b4594da90a98db956050c8db891fa7a8a95 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:44:35 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet Signed-off-by: Andrea Cosentino --- kamelets/azure-storage-blob-cdc-source.kamelet.yaml | 5 - 1 file changed, 5 deletions(-) diff --git a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 781ac865..253af45b 100644 --- a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -88,11 +88,6 @@ spec: description: Determines the credential strategy to adopt. Possible values are SHARED_ACCOUNT_KEY, SHARED_KEY_CREDENTIAL and AZURE_IDENTITY type: string default: SHARED_ACCOUNT_KEY - delay: -title: Delay -description: The number of milliseconds before the next poll of the selected blob. -type: integer -default: 500 getBlob: title: Get Object in Container description: >-
[camel-kamelets] branch main updated (9dfb4c6a -> bc812c9a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 9dfb4c6a Updated CHANGELOG.md new 5511581b Add an Azure Storage Blob CDC Source Kamelet new cd8f45b4 Add an Azure Storage Blob CDC Source Kamelet new 0a41ceb8 Add an Azure Storage Blob CDC Source Kamelet new a4c11b45 Add an Azure Storage Blob CDC Source Kamelet new bb134060 Add an Azure Storage Blob CDC Source Kamelet new bc812c9a Add an Azure Storage Blob CDC Source Kamelet The 6 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: docs/modules/ROOT/nav.adoc | 1 + .../azure-storage-blob-cdc-source.kamelet.yaml | 80 +++--- ... => azure-storage-blob-cdc-source.kamelet.yaml} | 80 +++--- script/validator/validator.go | 2 +- 4 files changed, 146 insertions(+), 17 deletions(-) copy library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml => kamelets/azure-storage-blob-cdc-source.kamelet.yaml (60%) copy library/camel-kamelets/src/main/resources/kamelets/{azure-servicebus-source.kamelet.yaml => azure-storage-blob-cdc-source.kamelet.yaml} (60%)
[GitHub] [camel-kamelets] oscerd closed issue #1185: Add an Azure Storage Blob CDC Source Kamelet
oscerd closed issue #1185: Add an Azure Storage Blob CDC Source Kamelet URL: https://github.com/apache/camel-kamelets/issues/1185 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 03/06: Add an Azure Storage Blob CDC Source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 0a41ceb85e77d2f0383499a00773c1b5290e4971 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:42:29 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet Signed-off-by: Andrea Cosentino --- docs/modules/ROOT/nav.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index cc2c6e01..6a7ea6ec 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -32,6 +32,7 @@ * xref:azure-functions-sink.adoc[] * xref:azure-servicebus-sink.adoc[] * xref:azure-servicebus-source.adoc[] +* xref:azure-storage-blob-cdc-source.adoc[] * xref:azure-storage-blob-changefeed-source.adoc[] * xref:azure-storage-blob-sink.adoc[] * xref:azure-storage-blob-source.adoc[]
[camel-kamelets] 01/06: Add an Azure Storage Blob CDC Source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 5511581bb67279d3cbb7ad653f7a0ad8c7b2a836 Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:40:40 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet Signed-off-by: Andrea Cosentino --- .../azure-storage-blob-cdc-source.kamelet.yaml | 150 + 1 file changed, 150 insertions(+) diff --git a/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml new file mode 100644 index ..781ac865 --- /dev/null +++ b/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -0,0 +1,150 @@ +# --- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --- + +apiVersion: camel.apache.org/v1alpha1 +kind: Kamelet +metadata: + name: azure-storage-blob-cdc-source + annotations: +camel.apache.org/kamelet.support.level: "Stable" +camel.apache.org/catalog.version: "main-SNAPSHOT" +camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgODEgODIiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMS4zMzMgMEMuNTMzIDAgMCAuNTMzIDAgMS4zMzN2MTZjMCAuOC41MzMgMS4zMz [...] +camel.apache.org/provider: "Apache Software Foundation" +camel.apache.org/kamelet.group: "Azure Servicebus" + labels: +camel.apache.org/kamelet.type: "source" +spec: + definition: +title: Azure Storage Blob CDC Source +description: |- + Receive data from Azure Service Bus SQS subscribed to Azure Event Grid reporting events related to a Azure Storage Blob account. + + Connection string is the basic method for authenticating to the Azure Servicebus Queue. + + To use this Kamelet you'll need to set up Events on your Azure Storage Blob account and select as an endpoint an Azure Servicebus Queue. +required: + - topicOrQueueName + - connectionString + - accountName + - containerName + - accessKey +type: object +properties: + topicOrQueueName: +title: Topic Or Queue Name +description: Topic Or Queue Name for the Azure Servicebus instance +type: string + connectionString: +title: Connection String +description: Connection String for Azure Servicebus instance +type: string +format: password +x-descriptors: +- urn:alm:descriptor:com.tectonic.ui:password +- urn:camel:group:credentials + serviceBusReceiveMode: +title: Servicebus Receive Mode +description: Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE +type: string +default: RECEIVE_AND_DELETE + subscriptionName: +title: Subscription Name +description: Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic. +type: string + accountName: +title: Account Name +description: The Azure Storage Blob account name. +type: string +x-descriptors: +- urn:camel:group:credentials + containerName: +title: Container Name +description: The Azure Storage Blob container name. +type: string + accessKey: +title: Access Key +description: The Azure Storage Blob access key. +type: string +format: password +x-descriptors: +- urn:alm:descriptor:com.tectonic.ui:password +- urn:camel:group:credentials + credentialType: +title: Credential Type +description: Determines the credential strategy to adopt. Possible values are SHARED_ACCOUNT_KEY, SHARED_KEY_CREDENTIAL and AZURE_IDENTITY +type: string +
[camel-kamelets] 06/06: Add an Azure Storage Blob CDC Source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit bc812c9a214714aed9bf87bb3b40be5a5d01f3fd Author: Andrea Cosentino AuthorDate: Tue Nov 29 14:46:39 2022 +0100 Add an Azure Storage Blob CDC Source Kamelet Signed-off-by: Andrea Cosentino --- .../resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml| 5 - 1 file changed, 5 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml index 781ac865..253af45b 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-cdc-source.kamelet.yaml @@ -88,11 +88,6 @@ spec: description: Determines the credential strategy to adopt. Possible values are SHARED_ACCOUNT_KEY, SHARED_KEY_CREDENTIAL and AZURE_IDENTITY type: string default: SHARED_ACCOUNT_KEY - delay: -title: Delay -description: The number of milliseconds before the next poll of the selected blob. -type: integer -default: 500 getBlob: title: Get Object in Container description: >-