You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2021/05/12 08:20:08 UTC
[camel] branch set-from-endpoint updated (ddf974a -> 1e564c4)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch set-from-endpoint
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit ddf974a avoid overriding a preset endpoint of an exchange
omit 7d6c009 set exchange's fromEndpoint property through the UnitOfWork advice
add 9701170 CAMEL-16570: make it possible to discover kamelets at runtime
add 2f3b1e0 Regen for commit 97011703af164659ca0fcd19e3e0c9b2717eabf6
add 6f7edc5 Upgrade AWS SDK v2 to version 2.16.61
add 08a16dd Sync deps
add 5671ffc CAMEL-16381 - camel-dependencies - Move OSGi dependencies to camel-karaf - java-ewah
add 85c015c Sync deps
add 83c084e CAMEL-16381 - camel-dependencies - Remove aether-version
add 7910557 Sync deps
add 2c0f56d CAMEL-16381 - camel-dependencies - Remove android-annotations-version property placeholder
add b02b052 Sync deps
add 2f27956 CAMEL-16381 - camel-dependencies - Remove arquillian-containers-se property plaeceholder
add 05e7bef Sync deps
add 1657aa2 CAMEL-16381 - camel-dependencies - Remove AWS SDK SWF libs property plaeceholder
add a43229b Sync deps
add c2f550b CAMEL-16381 - camel-dependencies - Remove Cassandra Guava Driver property plaeceholder
add 584097b Sync deps
add 001072b CAMEL-16604 (#5545)
new 1e564c4 set exchange's fromEndpoint property through the UnitOfWork advice
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 (ddf974a)
\
N -- N -- N refs/heads/set-from-endpoint (1e564c4)
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 1 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:
camel-dependencies/pom.xml | 8 +-
.../apache/camel/catalog/components/kamelet.json | 1 +
.../camel/catalog/docs/kamelet-component.adoc | 9 +-
.../apache/camel/catalog/models/routeTemplate.json | 4 +-
.../camel/catalog/models/templateParameter.json | 7 +-
.../kamelet/KameletComponentConfigurer.java | 3 +
.../apache/camel/component/kamelet/kamelet.json | 1 +
.../src/main/docs/kamelet-component.adoc | 9 +-
.../apache/camel/component/kamelet/Kamelet.java | 1 +
.../camel/component/kamelet/KameletComponent.java | 45 ++++-
.../component/kamelet/KameletDiscoveryTest.java | 100 ++++++++++
.../camel/impl/engine/DefaultRoutesLoader.java | 2 +-
.../dsl/KameletComponentBuilderFactory.java | 16 ++
.../java/org/apache/camel/impl/DefaultModel.java | 6 +-
.../org/apache/camel/model/routeTemplate.json | 4 +-
.../org/apache/camel/model/templateParameter.json | 7 +-
.../camel/model/RouteTemplateDefinition.java | 61 ++++--
.../model/RouteTemplateParameterDefinition.java | 27 ++-
.../builder/RouteTemplateOptionalValueTest.java | 64 +++++++
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../modules/ROOT/pages/kamelet-component.adoc | 9 +-
.../yaml/common/YamlDeserializationContext.java | 17 ++
.../dsl/yaml/common/YamlDeserializerSupport.java | 54 ++++++
.../dsl/yaml/deserializers/ModelDeserializers.java | 8 +-
.../org/apache/camel/routes-loader/kamelet.yaml | 2 +
.../src/generated/resources/camel-yaml-dsl.json | 3 +
.../camel/dsl/yaml/KameletRoutesBuilderLoader.java | 73 ++++++++
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java | 137 ++++----------
.../dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 126 +++++++++++++
.../apache/camel/dsl/yaml/KameletLoaderTest.groovy | 208 +++++++++++++++++++++
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 55 ++++++
.../camel/dsl/yaml/support/YamlTestSupport.groovy | 11 +-
.../test/resources/kamelets/mySetBody.kamelet.yaml | 32 ++++
parent/pom.xml | 8 +-
34 files changed, 956 insertions(+), 163 deletions(-)
create mode 100644 components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletDiscoveryTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateOptionalValueTest.java
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/kamelet.yaml
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
[camel] 01/01: set exchange's fromEndpoint property through the
UnitOfWork advice
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch set-from-endpoint
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e564c4103af970c86c90db98d3ba2c7dfe368ab
Author: Babak Vahdat <ba...@zurich.ch>
AuthorDate: Tue May 11 15:30:23 2021 +0200
set exchange's fromEndpoint property through the UnitOfWork advice
---
.../main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 8cf3552..44d1d85 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -732,6 +732,9 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor implements In
}
ExtendedExchange ee = (ExtendedExchange) exchange;
ee.setFromRouteId(routeId);
+ if (ee.getFromEndpoint() == null) {
+ ee.setFromEndpoint(route.getEndpoint());
+ }
}
// only return UnitOfWork if we created a new as then its us that handle the lifecycle to done the created UoW