[camel] branch master updated: CAMEL-12547 - Removed useless syserr
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 408f810 CAMEL-12547 - Removed useless syserr 408f810 is described below commit 408f810104fdb329168b39ff2bfeadf21a95312b Author: Andrea Cosentino AuthorDate: Fri Jun 8 08:42:28 2018 +0200 CAMEL-12547 - Removed useless syserr --- .../camel/component/google/mail/stream/GoogleMailStreamConsumer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java index ec54be7..d344193 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java @@ -145,7 +145,6 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer { */ protected void processCommit(Exchange exchange, String unreadLabelId) { try { -System.err.println("mark as read!" + getConfiguration().isMarkAsRead()); if (getConfiguration().isMarkAsRead()) { String id = exchange.getIn().getHeader(GoogleMailStreamConstants.MAIL_ID, String.class); -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 01/02: CAMEL-12547 - Minor fixes
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 29444b2b14001e7cc983a96227ef01802bb9bdde Author: Andrea Cosentino AuthorDate: Fri Jun 8 08:03:38 2018 +0200 CAMEL-12547 - Minor fixes --- .../mail/stream/GoogleMailStreamConsumer.java | 1 + .../mail/stream/GoogleMailStreamEndpoint.java | 27 +++--- .../GoogleMailStreamConsumerIntegrationTest.java | 2 +- .../itest/springboot/CamelGoogleMailTest.java | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java index d344193..ec54be7 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java @@ -145,6 +145,7 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer { */ protected void processCommit(Exchange exchange, String unreadLabelId) { try { +System.err.println("mark as read!" + getConfiguration().isMarkAsRead()); if (getConfiguration().isMarkAsRead()) { String id = exchange.getIn().getHeader(GoogleMailStreamConstants.MAIL_ID, String.class); diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java index c695f45..13fcfbf 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java @@ -17,6 +17,7 @@ package org.apache.camel.component.google.mail.stream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -26,6 +27,7 @@ import com.google.api.client.util.Base64; import com.google.api.services.gmail.Gmail; import com.google.api.services.gmail.model.Label; import com.google.api.services.gmail.model.ListLabelsResponse; +import com.google.api.services.gmail.model.MessagePart; import com.google.api.services.gmail.model.MessagePartHeader; import com.google.common.base.Splitter; @@ -63,7 +65,7 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint { @Override public Producer createProducer() throws Exception { -throw new IllegalArgumentException("The camel google mail stream component doesn't support producer"); +throw new UnsupportedOperationException("The camel google mail stream component doesn't support producer"); } @Override @@ -119,13 +121,12 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint { Exchange exchange = super.createExchange(); Message message = exchange.getIn(); exchange.getIn().setHeader(GoogleMailStreamConstants.MAIL_ID, mail.getId()); -if (mail.getPayload().getParts() != null) { -if (mail.getPayload().getParts().get(0).getBody().getData() != null) { -byte[] bodyBytes = Base64.decodeBase64(mail.getPayload().getParts().get(0).getBody().getData().trim().toString()); // get +List parts = mail.getPayload().getParts(); +if (parts != null && parts.get(0).getBody().getData() != null) { +byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim().toString()); // get // body -String body = new String(bodyBytes, "UTF-8"); +String body = new String(bodyBytes, StandardCharsets.UTF_8); message.setBody(body); -} } setHeaders(message, mail.getPayload().getHeaders()); return exchange; @@ -133,26 +134,26 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint { private void setHeaders(Message message, List headers) { for (MessagePartHeader header : headers) { -if (header.getName().equalsIgnoreCase("SUBJECT") || header.getName().equalsIgnoreCase("subject")) { +String headerName = header.getName(); +if (("SUBJECT").equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_SUBJECT, header.getValue()); } -if (header.getName()
[camel] branch master updated (c0f6da6 -> c3e8599)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c0f6da6 Removed useless null-checks new 29444b2 CAMEL-12547 - Minor fixes new c3e8599 CAMEL-12547 - Fixed CS 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: .../mail/stream/GoogleMailStreamConsumer.java | 1 + .../mail/stream/GoogleMailStreamEndpoint.java | 30 +++--- .../GoogleMailStreamConsumerIntegrationTest.java | 2 +- .../itest/springboot/CamelGoogleMailTest.java | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 02/02: CAMEL-12547 - Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c3e8599de36d52aafb0979c5cad3793db8122d06 Author: Andrea Cosentino AuthorDate: Fri Jun 8 08:07:56 2018 +0200 CAMEL-12547 - Fixed CS --- .../google/mail/stream/GoogleMailStreamEndpoint.java| 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java index 13fcfbf..c462e7e 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java @@ -123,10 +123,9 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint { exchange.getIn().setHeader(GoogleMailStreamConstants.MAIL_ID, mail.getId()); List parts = mail.getPayload().getParts(); if (parts != null && parts.get(0).getBody().getData() != null) { -byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim().toString()); // get - // body -String body = new String(bodyBytes, StandardCharsets.UTF_8); -message.setBody(body); +byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim().toString()); // get // body +String body = new String(bodyBytes, StandardCharsets.UTF_8); +message.setBody(body); } setHeaders(message, mail.getPayload().getHeaders()); return exchange; @@ -135,19 +134,19 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint { private void setHeaders(Message message, List headers) { for (MessagePartHeader header : headers) { String headerName = header.getName(); -if (("SUBJECT").equalsIgnoreCase(headerName)) { +if ("SUBJECT".equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_SUBJECT, header.getValue()); } -if (("TO").equalsIgnoreCase(headerName)) { +if ("TO".equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_TO, header.getValue()); } -if (("FROM").equalsIgnoreCase(headerName)) { +if ("FROM".equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_FROM, header.getValue()); } -if (("CC").equalsIgnoreCase(headerName)) { +if ("CC".equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_CC, header.getValue()); } -if (("BCC").equalsIgnoreCase(headerName)) { +if ("BCC".equalsIgnoreCase(headerName)) { message.setHeader(GoogleMailStreamConstants.MAIL_BCC, header.getValue()); } } -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Removed useless null-checks
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new c0f6da6 Removed useless null-checks c0f6da6 is described below commit c0f6da6e02db01fc17455079021c5f6c6959df9e Author: aldettinger AuthorDate: Thu Jun 7 20:05:45 2018 +0200 Removed useless null-checks --- .../src/main/java/org/apache/camel/component/http/HttpProducer.java | 2 +- .../src/main/java/org/apache/camel/component/http4/HttpProducer.java| 2 +- .../java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java index 9fa14ac..8e1dbab 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java @@ -247,7 +247,7 @@ public class HttpProducer extends DefaultProducer { } Object responseBody = extractResponseBody(method, exchange, getEndpoint().isIgnoreResponseBody()); -if (transferException && responseBody != null && responseBody instanceof Exception) { +if (transferException && responseBody instanceof Exception) { // if the response was a serialized exception then use that return (Exception) responseBody; } diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java index 6bef5c0..36f49ff 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java @@ -293,7 +293,7 @@ public class HttpProducer extends DefaultProducer { } Object responseBody = extractResponseBody(httpRequest, httpResponse, exchange, getEndpoint().isIgnoreResponseBody()); -if (transferException && responseBody != null && responseBody instanceof Exception) { +if (transferException && responseBody instanceof Exception) { // if the response was a serialized exception then use that return (Exception) responseBody; } diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java index 435fa82..d71d0c4 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java @@ -158,7 +158,7 @@ public class DefaultJettyHttpBinding implements JettyHttpBinding { Map headers = getSimpleMap(httpExchange.getResponseHeaders()); Object responseBody = extractResponseBody(exchange, httpExchange); -if (transferException && responseBody != null && responseBody instanceof Exception) { +if (transferException && responseBody instanceof Exception) { // if the response was a serialized exception then use that return (Exception) responseBody; } -- To stop receiving notification emails like this one, please contact aldettin...@apache.org.
[camel] branch master updated: maven-javadoc-plugin: update link configuration
This is an automated email from the ASF dual-hosted git repository. pascalschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 61dc966 maven-javadoc-plugin: update link configuration 61dc966 is described below commit 61dc966eb272d8040e3002320509915282477ddd Author: Pascal Schumacher AuthorDate: Thu Jun 7 18:31:02 2018 +0200 maven-javadoc-plugin: update link configuration --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 028b09c..b92bf05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -5447,9 +5447,9 @@ ${maven-javadoc-plugin-version} -http://download.oracle.com/javase/7/docs/api/ -http://download.oracle.com/javaee/7/api/ - http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/ +http://docs.oracle.com/javase/8/docs/api/ +http://docs.oracle.com/javaee/7/api/ + http://docs.spring.io/spring/docs/${spring-version}/javadoc-api/ ${basedir}/../../etc/css/stylesheet.css true -- To stop receiving notification emails like this one, please contact pascalschumac...@apache.org.
[camel] branch master updated (b9c4f01 -> c10bc71)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b9c4f01 CAMEL-12555: fix saga behavior when expression evaluation fails new 1b65380 Downgrade MINA to fix failing camel-ldap tests (will be fixed from Mina 2.19) new c10bc71 Upgrade javadoc plugin and fix a few javadoc errors 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: .../camel/component/box/api/BoxCollaborationsManager.java | 1 - .../org/apache/camel/component/box/api/BoxEventsManager.java | 2 -- .../org/apache/camel/component/box/api/BoxGroupsManager.java | 10 +- parent/pom.xml | 2 +- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- pom.xml| 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact cohei...@apache.org.
[camel] 02/02: Upgrade javadoc plugin and fix a few javadoc errors
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c10bc714a86de5477305e5a3926af7b7ab8119ae Author: Colm O hEigeartaigh AuthorDate: Thu Jun 7 17:10:52 2018 +0100 Upgrade javadoc plugin and fix a few javadoc errors --- .../camel/component/box/api/BoxCollaborationsManager.java | 1 - .../org/apache/camel/component/box/api/BoxEventsManager.java | 2 -- .../org/apache/camel/component/box/api/BoxGroupsManager.java | 10 +- pom.xml| 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java index ec90561..a05317b 100644 --- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java +++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java @@ -198,7 +198,6 @@ public class BoxCollaborationsManager { * * @param collaborationId *- the id of comment to change. - * @return The comment with changed message. */ public void deleteCollaboration(String collaborationId) { try { diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java index 0ca7a9e..ad460ab 100644 --- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java +++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java @@ -63,8 +63,6 @@ public class BoxEventsManager { *- the starting position of the event stream. * @param listener *- the listener to add to event stream. - * - * @return The event stream. */ public void listen(EventListener listener, Long startingPosition) { try { diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java index 82dede3..4a3d83d 100644 --- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java +++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java @@ -295,17 +295,17 @@ public class BoxGroupsManager { *- the updated information. * @return The group information. */ -public BoxGroupMembership updateGroupMembershipInfo(String groupMemebershipId, BoxGroupMembership.Info info) { +public BoxGroupMembership updateGroupMembershipInfo(String groupMembershipId, BoxGroupMembership.Info info) { try { -LOG.debug("Updating info for groupMembership(id=" + groupMemebershipId + ")"); -if (groupMemebershipId == null) { -throw new IllegalArgumentException("Parameter 'groupMemebershipId' can not be null"); +LOG.debug("Updating info for groupMembership(id=" + groupMembershipId + ")"); +if (groupMembershipId == null) { +throw new IllegalArgumentException("Parameter 'groupMembershipId' can not be null"); } if (info == null) { throw new IllegalArgumentException("Parameter 'info' can not be null"); } -BoxGroupMembership groupMembership = new BoxGroupMembership(boxConnection, groupMemebershipId); +BoxGroupMembership groupMembership = new BoxGroupMembership(boxConnection, groupMembershipId); groupMembership.updateInfo(info); return groupMembership; diff --git a/pom.xml b/pom.xml index 55a8f25..b0fb292 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0-M1 + 3.0.1 org.apache.maven.plugins -- To stop receiving notification emails like this one, please contact cohei...@apache.org.
[camel] 01/02: Downgrade MINA to fix failing camel-ldap tests (will be fixed from Mina 2.19)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 1b653801f362eca202e7d10e7d976fc68dd33243 Author: Colm O hEigeartaigh AuthorDate: Thu Jun 7 17:09:54 2018 +0100 Downgrade MINA to fix failing camel-ldap tests (will be fixed from Mina 2.19) --- parent/pom.xml | 2 +- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 24bb841..028b09c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -499,7 +499,7 @@ 0.2.1 1.1.7_6 1.1.7 -2.0.18 +2.0.17 0.9.4 1.9 0.0.17 diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 9816594..9d51c71 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3302,7 +3302,7 @@ org.apache.mina mina-core -2.0.18 +2.0.17 org.apache.openjpa -- To stop receiving notification emails like this one, please contact cohei...@apache.org.
[camel] branch master updated: CAMEL-12555: fix saga behavior when expression evaluation fails
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b9c4f01 CAMEL-12555: fix saga behavior when expression evaluation fails b9c4f01 is described below commit b9c4f014b3588c98c369f752bcfd8835ee7063a9 Author: nferraro AuthorDate: Thu Jun 7 16:46:22 2018 +0200 CAMEL-12555: fix saga behavior when expression evaluation fails --- .../camel/impl/saga/InMemorySagaCoordinator.java | 6 +- .../camel/processor/saga/RequiredSagaProcessor.java | 4 ++-- .../processor/saga/RequiresNewSagaProcessor.java | 4 ++-- .../apache/camel/processor/saga/SagaProcessor.java| 10 +- .../org/apache/camel/processor/SagaOptionsTest.java | 19 --- .../apache/camel/service/lra/LRASagaCoordinator.java | 7 ++- .../org/apache/camel/service/lra/LRASagaStep.java | 7 ++- .../org/apache/camel/service/lra/LRAOptionsIT.java| 11 +++ 8 files changed, 57 insertions(+), 11 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java b/camel-core/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java index 2fc5c2a..1d3f44e 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java +++ b/camel-core/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java @@ -84,7 +84,11 @@ public class InMemorySagaCoordinator implements CamelSagaCoordinator { Map values = optionValues.get(step); for (String option : step.getOptions().keySet()) { Expression expression = step.getOptions().get(option); -values.put(option, expression.evaluate(exchange, Object.class)); +try { +values.put(option, expression.evaluate(exchange, Object.class)); +} catch (Exception ex) { +return CompletableFuture.supplyAsync(() -> {throw new RuntimeCamelException("Cannot evaluate saga option '" + option + "'", ex);}); +} } } diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java index 7b77642..ddf4c3b 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java @@ -49,9 +49,9 @@ public class RequiredSagaProcessor extends SagaProcessor { inheritedCoordinator = false; } -coordinatorFuture.whenComplete((coordinator, ex2) -> ifNotException(ex2, exchange, callback, () -> { +coordinatorFuture.whenComplete((coordinator, ex2) -> ifNotException(ex2, exchange, !inheritedCoordinator, coordinator, existingCoordinator, callback, () -> { setCurrentSagaCoordinator(exchange, coordinator); -coordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, callback, () -> { +coordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, !inheritedCoordinator, coordinator, existingCoordinator, callback, () -> { super.process(exchange, doneSync -> { if (!inheritedCoordinator) { // Saga starts and ends here diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java index a87fb55..e3d3d96 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java @@ -36,10 +36,10 @@ public class RequiresNewSagaProcessor extends SagaProcessor { @Override public boolean process(Exchange exchange, AsyncCallback callback) { getCurrentSagaCoordinator(exchange).whenComplete((existingCoordinator, ex) -> ifNotException(ex, exchange, callback, () -> -sagaService.newSaga().whenComplete((newCoordinator, ex2) -> ifNotException(ex2, exchange, callback, () -> { +sagaService.newSaga().whenComplete((newCoordinator, ex2) -> ifNotException(ex2, exchange, true, newCoordinator, existingCoordinator, callback, () -> { setCurrentSagaCoordinator(exchange, newCoordinator); -newCoordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, callback, () -> { +newCoordinator.beginStep(exchange, step).whenComplete((done, ex3) -> ifNotException(ex3, exchange, true, newCoordinator,
[camel] branch master updated: camel-servicenow: replace Stack with Deque
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new c719b71 camel-servicenow: replace Stack with Deque c719b71 is described below commit c719b71d42980c9a54cfdef1b9222b979364d657 Author: lburgazzoli AuthorDate: Thu Jun 7 16:03:14 2018 +0200 camel-servicenow: replace Stack with Deque --- .../camel/component/servicenow/ServiceNowMetaDataExtension.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java index 50ef892..1160f26 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java +++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java @@ -16,14 +16,15 @@ */ package org.apache.camel.component.servicenow; +import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.Deque; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.Stack; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Consumer; @@ -468,12 +469,12 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { private final String instanceName; private final String objectName; private final String objectType; -private final Stack stack; +private final Deque stack; MetaContext(Map parameters) { this.parameters = parameters; this.configuration = getComponent(ServiceNowComponent.class).getConfiguration().copy(); -this.stack = new Stack<>(); +this.stack = new ArrayDeque<>(); try { IntrospectionSupport.setProperties(configuration, new HashMap<>(parameters)); @@ -522,7 +523,7 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { return objectName; } -public Stack getStack() { +public Deque getStack() { return stack; } } -- To stop receiving notification emails like this one, please contact lburgazz...@apache.org.
[camel] branch master updated: Move ContainerAwareSpringTestSupportIT to package
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9f6ffa2 Move ContainerAwareSpringTestSupportIT to package 9f6ffa2 is described below commit 9f6ffa2add5f367a23d011a0d1feedaac0076ac7 Author: Zoran Regvart AuthorDate: Thu Jun 7 15:20:08 2018 +0200 Move ContainerAwareSpringTestSupportIT to package (fix bad commit) --- .../test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java| 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java index 956b000..c1c1b64 100644 --- a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java +++ b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java @@ -1,3 +1,4 @@ +package org.apache.camel.test.testcontainers.spring; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] branch master updated: Move ContainerAwareSpringTestSupportIT to package
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 2c9b1fa Move ContainerAwareSpringTestSupportIT to package 2c9b1fa is described below commit 2c9b1fa73fe7822dcedb7b6f5a29b800734c8a2a Author: Zoran Regvart AuthorDate: Thu Jun 7 15:17:31 2018 +0200 Move ContainerAwareSpringTestSupportIT to package This moves ContainerAwareSpringTestSupportIT from the default package to the component package: org.apache.camel.test.testcontainers.spring. --- .../test/testcontainers/spring}/ContainerAwareSpringTestSupportIT.java| 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/components/camel-testcontainers-spring/src/test/java/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java similarity index 100% rename from components/camel-testcontainers-spring/src/test/java/ContainerAwareSpringTestSupportIT.java rename to components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] 01/02: Remove unused imports
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8d10593510d47fb88526c5581d7e494f84b5c1be Author: Zoran Regvart AuthorDate: Thu Jun 7 13:47:12 2018 +0200 Remove unused imports --- .../boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java index 8a2ccda..b8642b5 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java @@ -18,9 +18,7 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; -import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] 02/02: Refactor spring-boot CamelAutoConfiguration
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit abc340506ea584b153ab2b9ac21531d01593500a Author: Zoran Regvart AuthorDate: Thu Jun 7 14:30:34 2018 +0200 Refactor spring-boot CamelAutoConfiguration This refactors spring-boot CamelAutoConfiguration to use helper methods in order to reduce the amount of duplicated code. --- .../camel/spring/boot/CamelAutoConfiguration.java | 250 +++-- 1 file changed, 85 insertions(+), 165 deletions(-) diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java index 95cb392..2388cb5 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java @@ -21,6 +21,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Predicate; import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; @@ -361,120 +363,36 @@ public class CamelAutoConfiguration { LOG.info("Using custom Tracer: {}", tracer); camelContext.addInterceptStrategy(tracer); } -BacklogTracer backlogTracer = getSingleBeanOfType(applicationContext, BacklogTracer.class); -if (backlogTracer != null) { -LOG.info("Using custom BacklogTracer: {}", backlogTracer); -camelContext.addInterceptStrategy(backlogTracer); -} -HandleFault handleFault = getSingleBeanOfType(applicationContext, HandleFault.class); -if (handleFault != null) { -LOG.info("Using custom HandleFault: {}", handleFault); -camelContext.addInterceptStrategy(handleFault); -} -InflightRepository inflightRepository = getSingleBeanOfType(applicationContext, InflightRepository.class); -if (inflightRepository != null) { -LOG.info("Using custom InflightRepository: {}", inflightRepository); -camelContext.setInflightRepository(inflightRepository); -} -AsyncProcessorAwaitManager asyncProcessorAwaitManager = getSingleBeanOfType(applicationContext, AsyncProcessorAwaitManager.class); -if (asyncProcessorAwaitManager != null) { -LOG.info("Using custom AsyncProcessorAwaitManager: {}", asyncProcessorAwaitManager); - camelContext.setAsyncProcessorAwaitManager(asyncProcessorAwaitManager); -} -ManagementStrategy managementStrategy = getSingleBeanOfType(applicationContext, ManagementStrategy.class); -if (managementStrategy != null) { -LOG.info("Using custom ManagementStrategy: {}", managementStrategy); -camelContext.setManagementStrategy(managementStrategy); -} -ManagementNamingStrategy managementNamingStrategy = getSingleBeanOfType(applicationContext, ManagementNamingStrategy.class); -if (managementNamingStrategy != null) { -LOG.info("Using custom ManagementNamingStrategy: {}", managementNamingStrategy); - camelContext.getManagementStrategy().setManagementNamingStrategy(managementNamingStrategy); -} -EventFactory eventFactory = getSingleBeanOfType(applicationContext, EventFactory.class); -if (eventFactory != null) { -LOG.info("Using custom EventFactory: {}", eventFactory); -camelContext.getManagementStrategy().setEventFactory(eventFactory); -} -UnitOfWorkFactory unitOfWorkFactory = getSingleBeanOfType(applicationContext, UnitOfWorkFactory.class); -if (unitOfWorkFactory != null) { -LOG.info("Using custom UnitOfWorkFactory: {}", unitOfWorkFactory); -camelContext.setUnitOfWorkFactory(unitOfWorkFactory); -} -RuntimeEndpointRegistry runtimeEndpointRegistry = getSingleBeanOfType(applicationContext, RuntimeEndpointRegistry.class); -if (runtimeEndpointRegistry != null) { -LOG.info("Using custom RuntimeEndpointRegistry: {}", runtimeEndpointRegistry); -camelContext.setRuntimeEndpointRegistry(runtimeEndpointRegistry); -} -// custom type converters defined as s -Map typeConverters = applicationContext.getBeansOfType(TypeConverters.class); -if (typeConverters != null && !typeConverters.isEmpty()) { -for (Map.Entry entry : typeConverters.entrySet()) { -TypeConverters converter = entry.getValue(); -LOG.info("Adding custom TypeConverters with id: {} and implementation: {}", entry.getKey(), converter); - camelContext.getTypeConverterRe
[camel] branch master updated (b513fd3 -> abc3405)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b513fd3 CAMEL-12556: camel-servicenow: add metadata option to list available import set new 8d10593 Remove unused imports new abc3405 Refactor spring-boot CamelAutoConfiguration 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: .../camel/spring/boot/CamelAutoConfiguration.java | 250 +++-- .../CamelRoutesEndpointAutoConfiguration.java | 2 - 2 files changed, 85 insertions(+), 167 deletions(-) -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] branch master updated: CAMEL-12556: camel-servicenow: add metadata option to list available import set
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b513fd3 CAMEL-12556: camel-servicenow: add metadata option to list available import set b513fd3 is described below commit b513fd3901ecd8b1c10226eb5fff8adf9496e4fb Author: lburgazzoli AuthorDate: Thu Jun 7 11:43:01 2018 +0200 CAMEL-12556: camel-servicenow: add metadata option to list available import set --- .../component/extension/MetaDataExtension.java | 1 + .../servicenow/ServiceNowMetaDataExtension.java| 111 + .../ServiceNowMetaDataExtensionTest.java | 21 +++- 3 files changed, 112 insertions(+), 21 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java b/camel-core/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java index 01eb680..74c582b 100644 --- a/camel-core/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java +++ b/camel-core/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java @@ -33,6 +33,7 @@ public interface MetaDataExtension extends ComponentExtension { // Common meta-data attributes String CONTENT_TYPE = Exchange.CONTENT_TYPE; String JAVA_TYPE = "Java-Type"; +String CONTEXT = "Meta-Context"; /** * Returns an attribute associated with this meta data by name. diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java index 9b40df4..50ef892 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java +++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java @@ -64,20 +64,28 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { @Override public Optional meta(Map parameters) { -try { +final String objectType = (String)parameters.get("objectType"); + +if (ObjectHelper.equalIgnoreCase(objectType, ServiceNowConstants.RESOURCE_TABLE)) { final MetaContext context = new MetaContext(parameters); -if (!ObjectHelper.equalIgnoreCase(context.getObjectType(), "table")) { -throw new UnsupportedOperationException("Unsupported object type <" + context.getObjectType() + ">"); -} +// validate meta parameters +ObjectHelper.notNull(context.getObjectType(), "objectType"); +ObjectHelper.notNull(context.getObjectName(), "objectName"); return tableMeta(context); +} -} catch (UnsupportedOperationException e) { -throw e; -} catch (Exception e) { -throw new RuntimeException(e); +if (ObjectHelper.equalIgnoreCase(objectType, ServiceNowConstants.RESOURCE_IMPORT)) { +final MetaContext context = new MetaContext(parameters); + +// validate mate parameters +ObjectHelper.notNull(context.getObjectType(), "objectType"); + +return importSetMeta(context); } + +throw new UnsupportedOperationException("Unsupported object type <" + objectType + ">"); } private Optional tableMeta(MetaContext context) { @@ -86,10 +94,6 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { final ObjectNode root = context.getConfiguration().getOrCreateMapper().createObjectNode(); final String baseUrn = (String)context.getParameters().getOrDefault("baseUrn", "org:apache:camel:component:servicenow"); -if (names.isEmpty()) { -return Optional.empty(); -} - // Schema root.put("$schema", "http://json-schema.org/schema#";); root.put("id", String.format("urn:jsonschema:%s:%s)", baseUrn, context.getObjectName())); @@ -117,6 +121,7 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { MetaDataBuilder.on(getCamelContext()) .withAttribute(MetaData.CONTENT_TYPE, "application/schema+json") .withAttribute(MetaData.JAVA_TYPE, JsonNode.class) +.withAttribute(MetaData.CONTEXT, ServiceNowConstants.RESOURCE_TABLE) .withAttribute("date.format", dateFormat) .withAttribute("time.format", timeFormat) .withAttribute("date-time.format", dateFormat + " " + timeFormat) @@ -128,6 +133
[camel] branch master updated: Upgrade Hazelcast to version 3.10.2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9ef1237 Upgrade Hazelcast to version 3.10.2 9ef1237 is described below commit 9ef1237771068351df5c8ed8ec6c1db4d061246e Author: Andrea Cosentino AuthorDate: Thu Jun 7 11:51:29 2018 +0200 Upgrade Hazelcast to version 3.10.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f275dff..24bb841 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -290,7 +290,7 @@ 1.11 1.6 1.22 -3.10.1 +3.10.2 1.2.6 4.0.51 6.0.10.Final -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Camel-Linkedin should explicitly use only few jetty bundles and not cxf-http-provider
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e8cd3d2 Camel-Linkedin should explicitly use only few jetty bundles and not cxf-http-provider e8cd3d2 is described below commit e8cd3d28e0fe43fb46309a0ab63b1824c88c34b2 Author: Grzegorz Grzybek AuthorDate: Thu Jun 7 11:01:11 2018 +0200 Camel-Linkedin should explicitly use only few jetty bundles and not cxf-http-provider --- platforms/karaf/features/src/main/resources/features.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 22165ec..b83679f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1401,7 +1401,10 @@ camel-core cxf-core cxf-jaxrs -cxf-http-jetty +mvn:org.eclipse.jetty/jetty-util/${jetty-version} +mvn:org.eclipse.jetty/jetty-io/${jetty-version} +mvn:org.eclipse.jetty/jetty-client/${jetty-version} +mvn:org.eclipse.jetty/jetty-http/${jetty-version} mvn:org.eclipse.jetty.websocket/websocket-api/${jetty-version} mvn:org.eclipse.jetty.websocket/websocket-common/${jetty-version} mvn:org.eclipse.jetty.websocket/websocket-client/${jetty-version} -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
svn commit: r1030898 - in /websites/production/camel/content: cache/main.pageCache camel-2220-release.html
Author: buildbot Date: Thu Jun 7 07:21:29 2018 New Revision: 1030898 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2220-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2220-release.html == --- websites/production/camel/content/camel-2220-release.html (original) +++ websites/production/camel/content/camel-2220-release.html Thu Jun 7 07:21:29 2018 @@ -94,7 +94,7 @@ -New and NoteworthyWelcome to the 2.22.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...) This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially su pport Karaf 4.2 in this release.Optimised using toD DSL to reuse endpoints and producers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the https://github.com/apache/camel/blob/master/camel-core/src/main/docs/eips/toD-eip.adoc"; rel="nofollow">toD documentation.The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true).Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode.The Twitter component now uses extended mode by default to support tweets > 140 charactersRest DSL producer now supports being configured in rest configuration via endpointProperties.The Kafka component now supports HeaderFilterStrategy to plugin custom implementations for controlling header mappings between Camel and Kafka messages.Rest DSL now supports client request validation to validate that Content-Type/Accept headers is possible for the rest service. Camel has now a https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/cloud/ServiceRegistry.java"; rel="nofollow">Service Registry SPI which allow to r egister routes to a service registry such as consul, etcd, zookeeper using a Camel implementation or Spring CloudAnd these important fixes:Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client.Fixed camel-cxf consumer doesn't release UoW when using robust oneway operationFixed using AdviceWith and using weave methods on onException etc. not working. Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call.Fixed Kafka consumer to not auto commit if autoCommitEnable=false. Fixed file consumer was using markerFile as read-lock by default, which should have been none. Fixed using manual commit with Kafka to provide the current record offset and not the previous (and -1 for first)Fixed Content Based Router in Java DSL may not resolve property placeholders in when predicatesNew Enterprise Integration PatternsNew Componentscamel-mybatis - Now has a mybatis-bean component that supports using MyBatis annotations on POJO beans to specify the SQL queries and mappings.camel-web3j - The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories.New DSLNew AnnotationsNew Data FormatsNew LanguagesAPI breakingThe RestProducerFactory has an API change where the RestConfiguration is provided as parameter as well.Known IssuesImportant changes to consider when upgradingCamel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to SB2 may require changes, see the Spring Boot v1 to v2 migration documentation for details.Upgraded to Spring Framework v5 as default. Support for Spring Framework v4.3 is deprecated and not recommended to be used.Upgraded to Karaf 4.2. You may run Camel on Kar af 4.1 but we only officially support Karaf 4.2 in this release. The camel-jms Maven pom.xml file now exclude spring-messaging dependency as th