[camel] branch master updated (a23d109 -> 9de64a3)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from a23d109 CAMEL-13675: camel-main - Optimise main configurer add 302e43e CAMEL-12570: fixed Camel-FTP component does not set CamelFtpReplyCode in some case(ex 530) new 9de64a3 CAMEL-12570: fixed Camel-FTP component does not set CamelFtpRep… (#2997) 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/component/file/GenericFileProducer.java| 4 ++-- .../camel/component/file/remote/FtpOperations.java | 18 +++--- .../camel/component/file/remote/FtpsOperations.java | 17 +++-- .../component/file/remote/RemoteFileConsumer.java| 2 +- .../component/file/remote/RemoteFileOperations.java | 4 +++- .../component/file/remote/RemoteFileProducer.java| 8 .../camel/component/file/remote/SftpOperations.java | 10 +- java => FtpProducerConnectErrorsHeaderTest.java} | 20 .../apache/camel/component/scp/ScpOperations.java| 2 +- 9 files changed, 58 insertions(+), 27 deletions(-) copy components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/{FtpReconnectAttemptUnknownHostTest.java => FtpProducerConnectErrorsHeaderTest.java} (67%)
[camel] 01/01: CAMEL-12570: fixed Camel-FTP component does not set CamelFtpRep… (#2997)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9de64a3baf28bb898b11b99bdbed917eecb32d46 Merge: a23d109 302e43e Author: Andrea Tarocchi AuthorDate: Mon Jun 24 14:44:43 2019 +0200 CAMEL-12570: fixed Camel-FTP component does not set CamelFtpRep… (#2997) CAMEL-12570: fixed Camel-FTP component does not set CamelFtpReplyCode… .../camel/component/file/GenericFileProducer.java | 4 +- .../camel/component/file/remote/FtpOperations.java | 18 ++-- .../component/file/remote/FtpsOperations.java | 17 +++- .../component/file/remote/RemoteFileConsumer.java | 2 +- .../file/remote/RemoteFileOperations.java | 4 +- .../component/file/remote/RemoteFileProducer.java | 8 ++-- .../component/file/remote/SftpOperations.java | 10 ++--- .../remote/FtpProducerConnectErrorsHeaderTest.java | 51 ++ .../apache/camel/component/scp/ScpOperations.java | 2 +- 9 files changed, 97 insertions(+), 19 deletions(-)
[camel] branch master updated: adding an example about using camel headers
This is an automated email from the ASF dual-hosted git repository. valdar 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 1e81303 adding an example about using camel headers new 166e33e Merge pull request #2979 from Bican007/patch-1 1e81303 is described below commit 1e81303bb19b8d6d4de537a200c25136e76f8392 Author: Bican007 AuthorDate: Mon Jun 17 07:52:02 2019 +0200 adding an example about using camel headers --- components/camel-saxon/src/main/docs/xquery-component.adoc | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc index fb4e5d7..fc267f0 100644 --- a/components/camel-saxon/src/main/docs/xquery-component.adoc +++ b/components/camel-saxon/src/main/docs/xquery-component.adoc @@ -235,7 +235,17 @@ from("direct:start"). transform().xquery("/people/person/text()", String.class); - - +If you want to use camel variables like headers, you have to explicitly declare them in the xquery expression. +[source,xml] +- + + +declare variable $in.headers.foo external; +element item {$in.headers.foo} + + +- + ### Using XQuery as an endpoint
[camel-k-runtime] branch master updated: Refactor customizer activation #46
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 1e471b4 Refactor customizer activation #46 1e471b4 is described below commit 1e471b4c12c33e9a3a66e57e2abba91282459028 Author: lburgazzoli AuthorDate: Tue May 21 00:56:01 2019 +0200 Refactor customizer activation #46 --- .../main/java/org/apache/camel/k/Constants.java| 1 + .../java/org/apache/camel/k/ContextCustomizer.java | 13 +- .../org/apache/camel/k/support/RuntimeSupport.java | 166 ++--- .../org/apache/camel/k/support/NameCustomizer.java | 6 + .../apache/camel/k/support/RuntimeSupportTest.java | 94 +++- .../org/apache/camel/k/jvm/PropertiesTest.java | 13 +- 6 files changed, 222 insertions(+), 71 deletions(-) diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java index d9d2d9d..083e1c4 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java @@ -28,6 +28,7 @@ public final class Constants { public static final String ROUTES_LOADER_RESOURCE_PATH = "META-INF/services/org/apache/camel/k/loader/"; public static final String CONTEXT_CUSTOMIZER_RESOURCE_PATH = "META-INF/services/org/apache/camel/k/customizer/"; public static final String PROPERTY_CAMEL_K_CUSTOMIZER = "camel.k.customizer"; +public static final String ENABLE_CUSTOMIZER_PATTERN = "customizer.([\\w][\\w-]*).enabled"; private Constants() { } diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java index c6d6b1d..d3fc841 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/ContextCustomizer.java @@ -17,9 +17,10 @@ package org.apache.camel.k; import org.apache.camel.CamelContext; +import org.apache.camel.Ordered; @FunctionalInterface -public interface ContextCustomizer { +public interface ContextCustomizer extends Ordered, Comparable{ /** * Perform CamelContext customization. * @@ -27,4 +28,14 @@ public interface ContextCustomizer { * @param registry the runtime registry. */ void apply(CamelContext camelContext, Runtime.Registry registry); + +@Override +default int getOrder() { +return 0; +} + +@Override +default int compareTo(ContextCustomizer o) { +return Integer.compare(getOrder(), o.getOrder()); +} } diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java index 597b9cc..a5cfff7 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/RuntimeSupport.java @@ -32,7 +32,10 @@ import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.camel.CamelContext; import org.apache.camel.NoFactoryAvailableException; @@ -46,7 +49,6 @@ import org.apache.camel.k.adapter.Introspection; import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,44 +62,92 @@ public final class RuntimeSupport { public static List configureContext(CamelContext context, Runtime.Registry registry) { List appliedCustomizers = new ArrayList<>(); -Set customizers = lookupCustomizerIDs(context); +Map customizers = lookupCustomizers(context); -// this is to initialize all customizers that might be already present in -// the context injected by other means. -for (Map.Entry entry: context.getRegistry().findByTypeWithName(ContextCustomizer.class).entrySet()) { -if (!customizers.remove(entry.getKey())) { -continue; -} +customizers.entrySet().stream() +.sorted(Map.Entry.comparingByValue()) +.forEach(e -> { +LOGGER.info("Apply ContextCustomizer with id={} and type={}", e.getKey(), e.getValue().getClass().getName()); + +bind
[camel] branch camel-2.24.x updated: CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.24.x by this push: new d7edce1 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used d7edce1 is described below commit d7edce1f9504d9d3a8dd147801addfef3a66aa97 Author: Andrea Tarocchi AuthorDate: Fri May 17 22:32:09 2019 +0200 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used --- .../component/hystrix/processor/HystrixProcessorCommand.java | 10 +- .../camel/component/hystrix/processor/HystrixTimeoutTest.java | 4 ++-- .../hystrix/processor/HystrixTimeoutWithFallbackTest.java | 9 ++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index 9275285..e2e58c8 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -117,6 +117,15 @@ public class HystrixProcessorCommand extends HystrixCommand { copy.setException(e); } +// if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs +// then a hystrix timer thread executes the fallback so we can stop run() execution +if(getProperties().executionTimeoutEnabled().get() +&& getProperties().fallbackEnabled().get() +&& isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { +LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange); +return null; +} + // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { @@ -129,7 +138,6 @@ public class HystrixProcessorCommand extends HystrixCommand { Exception camelExchangeException = copy.getException(); synchronized (lock) { - // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java index b36203c..00568b8 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java @@ -40,7 +40,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { // this calls the slow route and therefore causes a timeout which triggers an exception try { template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); @@ -54,7 +54,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { try { log.info(">>> test run " + i + " <<<"); template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java index 27790bb..a66b2ae 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java @@ -30,14 +30,14 @@ public class HystrixTimeoutWithFa
[camel] branch camel-2.x updated: CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new faf5ad3 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used faf5ad3 is described below commit faf5ad3ad244e64710c9df56729e9d3d62292f6c Author: Andrea Tarocchi AuthorDate: Fri May 17 22:32:09 2019 +0200 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used --- .../component/hystrix/processor/HystrixProcessorCommand.java | 10 +- .../camel/component/hystrix/processor/HystrixTimeoutTest.java | 4 ++-- .../hystrix/processor/HystrixTimeoutWithFallbackTest.java | 9 ++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index 9275285..e2e58c8 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -117,6 +117,15 @@ public class HystrixProcessorCommand extends HystrixCommand { copy.setException(e); } +// if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs +// then a hystrix timer thread executes the fallback so we can stop run() execution +if(getProperties().executionTimeoutEnabled().get() +&& getProperties().fallbackEnabled().get() +&& isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { +LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange); +return null; +} + // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { @@ -129,7 +138,6 @@ public class HystrixProcessorCommand extends HystrixCommand { Exception camelExchangeException = copy.getException(); synchronized (lock) { - // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java index b36203c..00568b8 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java @@ -40,7 +40,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { // this calls the slow route and therefore causes a timeout which triggers an exception try { template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); @@ -54,7 +54,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { try { log.info(">>> test run " + i + " <<<"); template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java index 27790bb..a66b2ae 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java @@ -30,14 +30,14 @@ public class HystrixTimeoutWithFallbackTest
[camel] branch camel-2.23.x updated: CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new d043425 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used d043425 is described below commit d04342509c5a112b6c3dd21fc5e8080fc6343810 Author: Andrea Tarocchi AuthorDate: Fri May 17 22:32:09 2019 +0200 CAMEL-13541: fixed Race condition in camel-hystrix when xecutionTimeoutInMilliseconds() and onFallback() are used --- .../component/hystrix/processor/HystrixProcessorCommand.java | 10 +- .../camel/component/hystrix/processor/HystrixTimeoutTest.java | 4 ++-- .../hystrix/processor/HystrixTimeoutWithFallbackTest.java | 9 ++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index 9275285..e2e58c8 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -117,6 +117,15 @@ public class HystrixProcessorCommand extends HystrixCommand { copy.setException(e); } +// if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs +// then a hystrix timer thread executes the fallback so we can stop run() execution +if(getProperties().executionTimeoutEnabled().get() +&& getProperties().fallbackEnabled().get() +&& isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { +LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange); +return null; +} + // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { @@ -129,7 +138,6 @@ public class HystrixProcessorCommand extends HystrixCommand { Exception camelExchangeException = copy.getException(); synchronized (lock) { - // when a hystrix timeout occurs then a hystrix timer thread executes the fallback // and therefore we need this thread to not do anymore if fallback is already in process if (fallbackInUse.get()) { diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java index b36203c..00568b8 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java @@ -40,7 +40,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { // this calls the slow route and therefore causes a timeout which triggers an exception try { template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); @@ -54,7 +54,7 @@ public class HystrixTimeoutTest extends CamelTestSupport { try { log.info(">>> test run " + i + " <<<"); template.requestBody("direct:start", "slow"); -fail("Should fail due timeout"); +fail("Should fail due to timeout"); } catch (Exception e) { // expected a timeout assertIsInstanceOf(TimeoutException.class, e.getCause().getCause()); diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java index 27790bb..a66b2ae 100644 --- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java +++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java @@ -30,14 +30,14 @@ public class HystrixTimeoutWithFa
[camel-k-runtime] branch master updated: chore(cleanup): remove platform stream handler
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 6de97a3 chore(cleanup): remove platform stream handler 6de97a3 is described below commit 6de97a358b1836c67dde75daa9cdc04f1f7c4465 Author: lburgazzoli AuthorDate: Sat May 18 13:04:14 2019 +0200 chore(cleanup): remove platform stream handler --- .../camel/k/support/PlatformStreamHandler.java | 175 - .../camel/k/support/PlatformStreamHandlerTest.java | 82 -- .../java/org/apache/camel/k/jvm/Application.java | 11 -- .../java/org/apache/camel/k/jvm/RuntimeTest.java | 21 --- 4 files changed, 289 deletions(-) diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PlatformStreamHandler.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PlatformStreamHandler.java deleted file mode 100644 index 838877f..000 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PlatformStreamHandler.java +++ /dev/null @@ -1,175 +0,0 @@ -/** - * 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.k.support; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Base64; -import java.util.Map; -import java.util.zip.GZIPInputStream; - -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; -import org.apache.camel.util.URISupport; - -public class PlatformStreamHandler extends URLStreamHandler { -public static void configure() { -URL.setURLStreamHandlerFactory(protocol -> "platform".equals(protocol) ? new PlatformStreamHandler() : null); -} - -@Override -protected URLConnection openConnection(URL url) throws IOException { -return new URLConnection(url) { -@Override -public void connect() throws IOException { -} - -@Override -public InputStream getInputStream() throws IOException { -String path = url.getPath(); -String type = StringHelper.before(path, ":"); -String query = StringHelper.after(path, "?"); - -if (ObjectHelper.isNotEmpty(type)) { -path = StringHelper.after(path, ":"); -} -if (ObjectHelper.isNotEmpty(query)) { -path = StringHelper.before(path, "?"); -} - -boolean compression = hasCompression(query); - -InputStream is; - -if (type != null) { -switch (type) { -case "env": -is = resolveEnv(path); -break; -case "file": -is = resolveFile(path); -break; -case "classpath": -is = resolveClasspath(path); -break; -default: -throw new IllegalArgumentException("Unsupported delegated resolver: " + type); -} -} else { -is = resolveEnv(path); - -if (is == null) { -is = resolveFile(path); -} -if (is == null) { -is = resolveClasspath(path); -} -} - -if (is != null && compression) { -is = new GZIPInputStream(Base64.getDecoder().wrap(is)); -} - -return is; -} -}; -} - -private static InputStream resolveEnv(String path) { -String name = path.to
[camel-k-runtime] branch master updated: rest: support configuring rest's configuration component/endpoint properties
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 96e4997 rest: support configuring rest's configuration component/endpoint properties 96e4997 is described below commit 96e49972c5d45803c57c9f45243dc14dc8f06095 Author: lburgazzoli AuthorDate: Mon May 20 13:15:34 2019 +0200 rest: support configuring rest's configuration component/endpoint properties --- .../main/java/org/apache/camel/k/Constants.java| 2 + .../apache/camel/k/listener/ContextConfigurer.java | 3 +- .../k/listener/ContextLifecycleConfigurer.java | 4 +- .../apache/camel/k/support/PropertiesSupport.java | 153 + .../org/apache/camel/k/support/RuntimeSupport.java | 136 +++--- .../apache/camel/k/support/RuntimeSupportTest.java | 28 .../java/org/apache/camel/k/jvm/Application.java | 4 +- .../org/apache/camel/k/jvm/ApplicationRuntime.java | 4 +- .../org/apache/camel/k/jvm/ApplicationSupport.java | 4 +- .../org/apache/camel/k/jvm/PropertiesTest.java | 4 +- 10 files changed, 213 insertions(+), 129 deletions(-) diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java index 083e1c4..7091e4b 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java @@ -29,6 +29,8 @@ public final class Constants { public static final String CONTEXT_CUSTOMIZER_RESOURCE_PATH = "META-INF/services/org/apache/camel/k/customizer/"; public static final String PROPERTY_CAMEL_K_CUSTOMIZER = "camel.k.customizer"; public static final String ENABLE_CUSTOMIZER_PATTERN = "customizer.([\\w][\\w-]*).enabled"; +public static final String PROPERTY_PREFIX_REST_COMPONENT_PROPERTY = "camel.rest.componentProperty."; +public static final String PROPERTY_PREFIX_REST_ENDPOINT_PROPERTY = "camel.rest.endpointProperty."; private Constants() { } diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java index ef02736..af806c7 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java @@ -17,6 +17,7 @@ package org.apache.camel.k.listener; import org.apache.camel.k.Runtime; +import org.apache.camel.k.support.PropertiesSupport; import org.apache.camel.k.support.RuntimeSupport; public class ContextConfigurer extends AbstractPhaseListener { @@ -31,7 +32,7 @@ public class ContextConfigurer extends AbstractPhaseListener { // // camel.context.${name} = ${value} // -RuntimeSupport.bindProperties(runtime.getContext(), runtime.getContext(), "camel.context."); +PropertiesSupport.bindProperties(runtime.getContext(), runtime.getContext(), "camel.context."); // // Configure the camel rest definition using properties in the form: diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextLifecycleConfigurer.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextLifecycleConfigurer.java index 85383c7..a01b886 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextLifecycleConfigurer.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/ContextLifecycleConfigurer.java @@ -18,7 +18,7 @@ package org.apache.camel.k.listener; import org.apache.camel.Component; import org.apache.camel.k.Runtime; -import org.apache.camel.k.support.RuntimeSupport; +import org.apache.camel.k.support.PropertiesSupport; import org.apache.camel.support.LifecycleStrategySupport; public class ContextLifecycleConfigurer extends AbstractPhaseListener { @@ -41,7 +41,7 @@ public class ContextLifecycleConfigurer extends AbstractPhaseListener { // // camel.component.${scheme}.${name} = ${value} // -RuntimeSupport.bindProperties(runtime.getContext(), component, "camel.component." + name + "."); +PropertiesSupport.bindProperties(runtime.getContext(), component, "camel.component." + name + "."); } }); } diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PropertiesSupport.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/support/PropertiesSupport.java new file mode 100644 index 000..6ce2360 --- /dev/null +++ b/camel-k-ru
[camel-k-runtime] branch master updated: add servlet support
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 72c9d2a add servlet support 72c9d2a is described below commit 72c9d2ae8be188de462ece77493151158da1fd36 Author: lburgazzoli AuthorDate: Sat May 18 15:00:39 2019 +0200 add servlet support --- .../main/java/org/apache/camel/k/Constants.java| 10 +- .../src/main/java/org/apache/camel/k/Runtime.java | 31 - .../camel/k/listener/AbstractPhaseListener.java| 7 +- .../apache/camel/k/listener/RoutesConfigurer.java | 7 +- .../apache/camel/k/support/PropertiesSupport.java | 8 +- .../camel-k-runtime-example-health}/pom.xml| 89 --- .../services/org/apache/camel/k/customizer/webhook | 3 +- .../src/main/resources/application.properties | 10 ++ .../src/main/resources/routes.groovy | 5 + .../camel-k-runtime-example-servlet}/pom.xml | 89 --- .../apache/camel/k/example/WebhookCustomizer.java | 28 ++--- .../services/org/apache/camel/k/customizer/webhook | 3 +- .../src/main/resources/application.properties | 10 ++ .../src/main/resources/routes.groovy | 5 + camel-k-runtime-examples/pom.xml | 37 ++ camel-k-runtime-health/pom.xml | 16 ++- .../camel/k/health/HealthContextCustomizer.java} | 43 --- .../org/apache/camel/k/health/HealthEndpoint.java | 125 + .../apache/camel/k/customizer/health} | 3 +- .../camel/k/health/HealthCustomizerTest.java | 53 + .../org/apache/camel/k/jvm/ApplicationRuntime.java | 26 - .../pom.xml| 32 +- .../camel/k/servlet/ServletContextCustomizer.java | 35 +++--- .../apache/camel/k/servlet/ServletEndpoint.java| 85 ++ .../camel/k/servlet/ServletRegistration.java | 81 + .../services/org/apache/camel/k/customizer/servlet | 3 +- .../camel/k/servlet/ServletCustomizerTest.java | 55 + .../src/test/resources/log4j2-test.xml | 18 +++ pom.xml| 9 ++ 29 files changed, 658 insertions(+), 268 deletions(-) diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java index 7091e4b..b528317 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java @@ -18,16 +18,24 @@ package org.apache.camel.k; public final class Constants { public static final String ENV_CAMEL_K_ROUTES = "CAMEL_K_ROUTES"; +public static final String PROPERTY_CAMEL_K_ROUTES = "camel.k.routes"; + public static final String ENV_CAMEL_K_CONF = "CAMEL_K_CONF"; +public static final String PROPERTY_CAMEL_K_CONF = "camel.k.conf"; + public static final String ENV_CAMEL_K_CONF_D = "CAMEL_K_CONF_D"; +public static final String PROPERTY_CAMEL_K_CONF_D = "camel.k.conf.d"; + public static final String ENV_CAMEL_K_CUSTOMIZERS = "CAMEL_K_CUSTOMIZERS"; +public static final String PROPERTY_CAMEL_K_CUSTOMIZER = "camel.k.customizer"; + public static final String SCHEME_CLASSPATH = "classpath:"; public static final String SCHEME_FILE = "file:"; public static final String SCHEME_ENV = "env:"; public static final String LOGGING_LEVEL_PREFIX = "logging.level."; public static final String ROUTES_LOADER_RESOURCE_PATH = "META-INF/services/org/apache/camel/k/loader/"; public static final String CONTEXT_CUSTOMIZER_RESOURCE_PATH = "META-INF/services/org/apache/camel/k/customizer/"; -public static final String PROPERTY_CAMEL_K_CUSTOMIZER = "camel.k.customizer"; + public static final String ENABLE_CUSTOMIZER_PATTERN = "customizer.([\\w][\\w-]*).enabled"; public static final String PROPERTY_PREFIX_REST_COMPONENT_PROPERTY = "camel.rest.componentProperty."; public static final String PROPERTY_PREFIX_REST_ENDPOINT_PROPERTY = "camel.rest.endpointProperty."; diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java index f2f1f01..4b1e6f7 100644 --- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java +++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java @@ -19,6 +19,7 @@ package org.apache.camel.k; import java.util.Properties; import org.apache.camel.CamelContext; +import org.apache.camel.Ordered; import org.apache.camel.component.properties
[camel] branch camel-2.x updated: CAMEL-13541 - Fixed CS
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new d458cc9 CAMEL-13541 - Fixed CS d458cc9 is described below commit d458cc9e97019fa266cbacae59edb9c8a8baa437 Author: Andrea Cosentino AuthorDate: Mon May 20 08:58:39 2019 +0200 CAMEL-13541 - Fixed CS --- .../camel/component/hystrix/processor/HystrixProcessorCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index e2e58c8..9083eaa 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -119,7 +119,7 @@ public class HystrixProcessorCommand extends HystrixCommand { // if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs // then a hystrix timer thread executes the fallback so we can stop run() execution -if(getProperties().executionTimeoutEnabled().get() +if (getProperties().executionTimeoutEnabled().get() && getProperties().fallbackEnabled().get() && isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange);
[camel] branch camel-2.24.x updated: CAMEL-13541 - Fixed CS
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.24.x by this push: new 9e29416 CAMEL-13541 - Fixed CS 9e29416 is described below commit 9e29416a4660af38683ddc218fc43ac8f8019e24 Author: Andrea Cosentino AuthorDate: Mon May 20 08:58:39 2019 +0200 CAMEL-13541 - Fixed CS --- .../camel/component/hystrix/processor/HystrixProcessorCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index e2e58c8..9083eaa 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -119,7 +119,7 @@ public class HystrixProcessorCommand extends HystrixCommand { // if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs // then a hystrix timer thread executes the fallback so we can stop run() execution -if(getProperties().executionTimeoutEnabled().get() +if (getProperties().executionTimeoutEnabled().get() && getProperties().fallbackEnabled().get() && isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange);
[camel] branch camel-2.23.x updated: CAMEL-13541 - Fixed CS
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new 1d8bc40 CAMEL-13541 - Fixed CS 1d8bc40 is described below commit 1d8bc403599363af0c3d55cb36f7562c9775964e Author: Andrea Cosentino AuthorDate: Mon May 20 08:58:39 2019 +0200 CAMEL-13541 - Fixed CS --- .../camel/component/hystrix/processor/HystrixProcessorCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java index e2e58c8..9083eaa 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java @@ -119,7 +119,7 @@ public class HystrixProcessorCommand extends HystrixCommand { // if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs // then a hystrix timer thread executes the fallback so we can stop run() execution -if(getProperties().executionTimeoutEnabled().get() +if (getProperties().executionTimeoutEnabled().get() && getProperties().fallbackEnabled().get() && isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange);
[camel-k] branch master updated: chore: support for health based on servlet available from 0.3.3-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new b26d24b chore: support for health based on servlet available from 0.3.3-SNAPSHOT b26d24b is described below commit b26d24b764ef74f35a0ad281c78322cfcc92a90c Author: lburgazzoli AuthorDate: Tue May 21 15:01:16 2019 +0200 chore: support for health based on servlet available from 0.3.3-SNAPSHOT --- pkg/apis/camel/v1alpha1/integration_types.go | 19 ++- pkg/apis/camel/v1alpha1/integration_types_support.go | 15 ++- pkg/trait/probes.go | 14 ++ 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/pkg/apis/camel/v1alpha1/integration_types.go b/pkg/apis/camel/v1alpha1/integration_types.go index 7b6b548..2e3e197 100644 --- a/pkg/apis/camel/v1alpha1/integration_types.go +++ b/pkg/apis/camel/v1alpha1/integration_types.go @@ -22,15 +22,16 @@ type IntegrationSpec struct { // IntegrationStatus defines the observed state of Integration type IntegrationStatus struct { - PhaseIntegrationPhase `json:"phase,omitempty"` - Digest string `json:"digest,omitempty"` - Imagestring `json:"image,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Context string `json:"context,omitempty"` - GeneratedSources []SourceSpec `json:"generatedSources,omitempty"` - Failure *Failure `json:"failure,omitempty"` - CamelVersion string `json:"camelVersion,omitempty"` - RuntimeVersion string `json:"runtimeVersion,omitempty"` + PhaseIntegrationPhase`json:"phase,omitempty"` + Digest string `json:"digest,omitempty"` + Imagestring `json:"image,omitempty"` + Dependencies []string`json:"dependencies,omitempty"` + Context string `json:"context,omitempty"` + GeneratedSources []SourceSpec`json:"generatedSources,omitempty"` + Failure *Failure`json:"failure,omitempty"` + CamelVersion string `json:"camelVersion,omitempty"` + RuntimeVersion string `json:"runtimeVersion,omitempty"` + Configuration[]ConfigurationSpec `json:"configuration,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/pkg/apis/camel/v1alpha1/integration_types_support.go b/pkg/apis/camel/v1alpha1/integration_types_support.go index e801d74..3ed42f5 100644 --- a/pkg/apis/camel/v1alpha1/integration_types_support.go +++ b/pkg/apis/camel/v1alpha1/integration_types_support.go @@ -100,12 +100,25 @@ func (is *IntegrationSpec) Configurations() []ConfigurationSpec { } // Configurations -- +func (is *IntegrationStatus) Configurations() []ConfigurationSpec { + if is == nil { + return []ConfigurationSpec{} + } + + return is.Configuration +} + +// Configurations -- func (in *Integration) Configurations() []ConfigurationSpec { if in == nil { return []ConfigurationSpec{} } - return in.Spec.Configurations() + answer := make([]ConfigurationSpec, 0) + answer = append(answer, in.Status.Configuration...) + answer = append(answer, in.Spec.Configuration...) + + return answer } // NewSourceSpec -- diff --git a/pkg/trait/probes.go b/pkg/trait/probes.go index 4fb582d..7d76132 100644 --- a/pkg/trait/probes.go +++ b/pkg/trait/probes.go @@ -19,6 +19,7 @@ package trait import ( "sort" + "strconv" "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" "github.com/apache/camel-k/pkg/util" @@ -69,6 +70,19 @@ func (t *probesTrait) Apply(e *Environment) error { // sort the dependencies to get always the same list if they don't change sort.Strings(e.Integration.Status.Dependencies) + + e.Integration.Status.Configuration = append(e.Integration.Status.Configuration, + // + // TODO: At the moment the servlet engine is used only for health but we need to + // have a dedicated servlet trait and maybe an option to create a dedicated + // server for management stuffs like health + // + v1alpha1.ConfigurationSpec{Type: "property", V
[camel] branch camel-2.x updated (f9b92c4 -> 402b958)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from f9b92c4 Regen new adb233d CAMEL-14137 Thread leak in camel-jetty component if maxThreads or minThreads property is set new d82470f CAMEL-14137 Added licence header to unit test new 402b958 Merge pull request #3318 from luigidemasi/CAMEL-14137 The 34757 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/jetty/JettyHttpComponent.java | 29 +--- .../component/jetty/JettyThreadPoolSizeTest.java | 84 ++ 2 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyThreadPoolSizeTest.java
[camel-kafka-connector] branch master updated (d2762b7 -> 8a69950)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from d2762b7 Merge pull request #28 from apache/transform add 869a66c Decouple kafka test service from the local container add 8a69950 Support using an external Kafka for the tests (#29) No new revisions were added by this update. Summary of changes: README.adoc| 6 +++ .../camel/kafkaconnector/AbstractKafkaTest.java| 29 --- .../apache/camel/kafkaconnector/ContainerUtil.java | 8 +-- .../apache/camel/kafkaconnector/TestCommon.java| 9 ++-- .../services/kafka/ContainerLocalKafkaService.java | 33 ++--- .../services/kafka/KafkaService.java | 57 ++ .../services/kafka/KafkaServiceFactory.java| 43 .../services/kafka/RemoteKafkaService.java | 22 + .../sink/aws/sns/CamelSinkAWSSNSITCase.java| 19 +++- .../sink/aws/sqs/CamelSinkAWSSQSITCase.java| 23 +++-- .../sink/file/CamelSinkFileITCase.java | 22 +++-- .../sink/http/CamelSinkHTTPITCase.java | 24 +++-- .../sink/jms/CamelSinkJMSITCase.java | 20 +++- .../aws/kinesis/CamelSourceAWSKinesisITCase.java | 18 +++ .../source/aws/s3/CamelSourceAWSS3ITCase.java | 18 +++ .../source/aws/sqs/CamelSourceAWSSQSITCase.java| 22 +++-- .../source/jms/CamelSourceJMSITCase.java | 19 +++- .../source/timer/CamelSourceTimerITCase.java | 24 +++-- 18 files changed, 229 insertions(+), 187 deletions(-) copy core/src/main/java/org/apache/camel/kafkaconnector/VersionUtil.java => tests/src/test/java/org/apache/camel/kafkaconnector/AbstractKafkaTest.java (57%) copy core/src/test/java/org/apache/camel/kafkaconnector/test/TestBlockingQueueFactory.java => tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ContainerLocalKafkaService.java (52%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/KafkaService.java create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/KafkaServiceFactory.java copy core/src/main/java/org/apache/camel/kafkaconnector/VersionUtil.java => tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/RemoteKafkaService.java (61%)
[camel-kafka-connector] branch master updated (37caf10 -> 9f43dc4)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 37caf10 Merge pull request #39 from apache/source-record-key add b77dc09 Replaces artemis with qpid-dispatch router new 9f43dc4 Replaces artemis with qpid-dispatch router (#38) 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: examples/CamelJmsSourceConnector.properties| 4 ++ parent/pom.xml | 9 tests/pom.xml | 5 ++ .../kafkaconnector/clients/jms/JMSClient.java | 46 + .../jms/ArtemisService.java} | 15 +++--- .../jms/JMSService.java} | 22 .../JMSServiceFactory.java}| 27 +- .../services/jms/QpidDispatchRouterService.java| 59 ++ .../sink/jms/CamelJMSPropertyFactory.java | 14 +++-- .../sink/jms/CamelSinkJMSITCase.java | 23 + .../source/jms/CamelJMSPropertyFactory.java| 15 -- .../source/jms/CamelSourceJMSITCase.java | 21 .../{ => services/jms/artemis}/Dockerfile | 0 .../services/jms/qpid-dispatch-router/Dockerfile | 19 +++ 14 files changed, 216 insertions(+), 63 deletions(-) rename tests/src/test/java/org/apache/camel/kafkaconnector/{ArtemisContainer.java => services/jms/ArtemisService.java} (89%) copy tests/src/test/java/org/apache/camel/kafkaconnector/{KafkaConnectPropertyFactory.java => services/jms/JMSService.java} (61%) copy tests/src/test/java/org/apache/camel/kafkaconnector/services/{kafka/KafkaServiceFactory.java => jms/JMSServiceFactory.java} (51%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/jms/QpidDispatchRouterService.java rename tests/src/test/resources/org/apache/camel/kafkaconnector/{ => services/jms/artemis}/Dockerfile (100%) create mode 100644 tests/src/test/resources/org/apache/camel/kafkaconnector/services/jms/qpid-dispatch-router/Dockerfile
[camel-kafka-connector] 01/01: Replaces artemis with qpid-dispatch router (#38)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 9f43dc4c85bf79a38264ad0a46984b13e4b48e11 Merge: 37caf10 b77dc09 Author: Andrea Tarocchi AuthorDate: Wed Dec 11 23:36:32 2019 +0100 Replaces artemis with qpid-dispatch router (#38) Replaces artemis with qpid-dispatch router examples/CamelJmsSourceConnector.properties| 4 ++ parent/pom.xml | 9 tests/pom.xml | 5 ++ .../kafkaconnector/clients/jms/JMSClient.java | 46 + .../jms/ArtemisService.java} | 15 +++--- .../kafkaconnector/services/jms/JMSService.java| 35 + .../services/jms/JMSServiceFactory.java| 44 .../services/jms/QpidDispatchRouterService.java| 59 ++ .../sink/jms/CamelJMSPropertyFactory.java | 14 +++-- .../sink/jms/CamelSinkJMSITCase.java | 23 + .../source/jms/CamelJMSPropertyFactory.java| 15 -- .../source/jms/CamelSourceJMSITCase.java | 21 .../{ => services/jms/artemis}/Dockerfile | 0 .../services/jms/qpid-dispatch-router/Dockerfile | 19 +++ 14 files changed, 270 insertions(+), 39 deletions(-)
[camel-kafka-connector] branch master updated: Updated .gitignore
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new e6f4d0a Updated .gitignore e6f4d0a is described below commit e6f4d0a0eea9be91c900c1200484e6f7aa20c7a8 Author: Andrea Tarocchi AuthorDate: Thu Dec 12 22:07:43 2019 +0100 Updated .gitignore --- .gitignore | 289 +++-- 1 file changed, 283 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7e0967d..5e278ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Compiled class file -*.class - # Log file *.log @@ -22,11 +19,291 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -*.iml +# kafka distros +kafka_* + +# IDEs .idea -target +*.iml .project +.metadata +.gopath + +# envrc +.envrc + +# eclipse / vscode .settings .classpath +.factorypath -kafka_* +# maven builds +target/ + +# Created by https://www.gitignore.io/api/java,vim,emacs,visualstudiocode,eclipse,intellij +# Edit at https://www.gitignore.io/?templates=java,vim,emacs,visualstudiocode,eclipse,intellij + +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +### Eclipse Patch ### +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Annotation Processing +.apt_generated + +.sts4-cache/ + +### Emacs ### +# -*- mode: gitignore; -*- +*~ +\#*\# +/.emacs.desktop +/.emacs.desktop.lock +*.elc +auto-save-list +tramp +.\#* + +# Org-mode +.org-id-locations +*_archive + +# flymake-mode +*_flymake.* + +# eshell files +/eshell/history +/eshell/lastdir + +# elpa packages +/elpa/ + +# reftex files +*.rel + +# AUCTeX auto folder +/auto/ + +# cask packages +.cask/ +dist/ + +# Flycheck +flycheck_*.el + +# server auth directory +/server/ + +# projectiles files +.projectile + +# directory configuration +.dir-locals.el + +# network security +/network-security.data + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +.idea/**/sonarlint/ + +# SonarQube Plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator/ + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual
[camel] branch camel-2.x updated: Backport of CAMEL-13679: fixed Camel-FTP component does not set CamelFtpReplyCode in some case(ex 530).
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 4f46955 Backport of CAMEL-13679: fixed Camel-FTP component does not set CamelFtpReplyCode in some case(ex 530). new a03a7be Merge pull request #3364 from valdar/CAMEL-13679 4f46955 is described below commit 4f469551007760b4a22ef4744f8e65abb4eb9b07 Author: Andrea Tarocchi AuthorDate: Wed Nov 27 12:39:50 2019 +0100 Backport of CAMEL-13679: fixed Camel-FTP component does not set CamelFtpReplyCode in some case(ex 530). --- .../camel/component/file/GenericFileProducer.java | 4 +- .../camel/component/file/remote/FtpOperations.java | 18 ++-- .../component/file/remote/FtpsOperations.java | 11 - .../component/file/remote/RemoteFileConsumer.java | 2 +- .../file/remote/RemoteFileOperations.java | 4 +- .../component/file/remote/RemoteFileProducer.java | 8 ++-- .../component/file/remote/SftpOperations.java | 14 +++ ...ava => FtpProducerConnectErrorsHeaderTest.java} | 48 -- .../file/remote/sftp/SftpECKeyFileConsumeTest.java | 2 +- .../apache/camel/component/scp/ScpOperations.java | 2 +- 10 files changed, 59 insertions(+), 54 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java index df52f68..bb11bce 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java @@ -111,7 +111,7 @@ public class GenericFileProducer extends DefaultProducer { log.trace("Processing file: {} for exchange: {}", target, exchange); try { -preWriteCheck(); +preWriteCheck(exchange); // should we write to a temporary name and then afterwards rename to real target boolean writeAsTempAndRename = ObjectHelper.isNotEmpty(endpoint.getTempFileName()); @@ -269,7 +269,7 @@ public class GenericFileProducer extends DefaultProducer { /** * Perform any actions that need to occur before we write such as connecting to an FTP server etc. */ -public void preWriteCheck() throws Exception { +public void preWriteCheck(Exchange exchange) throws Exception { // nothing needed to check } diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java index 10f507c..e48d07c 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java @@ -78,18 +78,18 @@ public class FtpOperations implements RemoteFileOperations { this.clientActivityListener = clientActivityListener; } -public boolean connect(RemoteFileConfiguration configuration) throws GenericFileOperationFailedException { +public boolean connect(RemoteFileConfiguration configuration, Exchange exchange) throws GenericFileOperationFailedException { client.setCopyStreamListener(clientActivityListener); try { -return doConnect(configuration); +return doConnect(configuration, exchange); } catch (GenericFileOperationFailedException e) { clientActivityListener.onGeneralError(endpoint.getConfiguration().remoteServerInformation(), e.getMessage()); throw e; } } -protected boolean doConnect(RemoteFileConfiguration configuration) throws GenericFileOperationFailedException { +protected boolean doConnect(RemoteFileConfiguration configuration, Exchange exchange) throws GenericFileOperationFailedException { log.trace("Connecting using FTPClient: {}", client); String host = configuration.getHost(); @@ -162,6 +162,12 @@ public class FtpOperations implements RemoteFileOperations { throw new GenericFileOperationFailedException("Interrupted during sleeping", ie); } } +} finally { +if (exchange != null) { +// store client reply information after the operation +exchange.getIn().setHeader(FtpConstants.FTP_REPLY_CODE, client.getReplyCode()); +exchange.getIn().setHeader(FtpConstants.FTP_REPLY_STRING, client.getReplyString()); +} } } @@ -222,6 +228,12 @@ public class FtpOperations implements RemoteFileOperations { client.setFileType(configuration.
[camel-kafka-connector] branch master updated (e989f4b -> 0d511e8)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from e989f4b Clean up add 2658307 Disable integration tests run by default. add 4b431d1 Polished documentation and ordered example's documentation. new 0d511e8 Fixes (#52) 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: .github/workflows/pr-build.yml | 2 +- README.adoc| 11 ++-- docs/try-it-out-locally.adoc | 113 - tests/pom.xml | 30 ++- 4 files changed, 91 insertions(+), 65 deletions(-)
[camel-kafka-connector] 01/01: Fixes (#52)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 0d511e804e5988ae26289722f5d718c89d27f3f0 Merge: e989f4b 4b431d1 Author: Andrea Tarocchi AuthorDate: Thu Dec 19 14:38:50 2019 +0100 Fixes (#52) Fixes .github/workflows/pr-build.yml | 2 +- README.adoc| 11 ++-- docs/try-it-out-locally.adoc | 113 - tests/pom.xml | 30 ++- 4 files changed, 91 insertions(+), 65 deletions(-)
[camel-kafka-connector] branch master updated: Upgrade test containers to the latest version
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 94db5ac Upgrade test containers to the latest version new 040d666 Merge pull request #54 from orpiske/upgrade-test-containers 94db5ac is described below commit 94db5acf6c04255b33c25d7ab55fa9b7d600536e Author: Otavio Rodolfo Piske AuthorDate: Thu Dec 19 19:57:20 2019 +0100 Upgrade test containers to the latest version --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3ea81de..6063975 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -58,7 +58,7 @@ 3.1.0 2.22.1 2.12.4 -1.12.0 +1.12.4 0.40.0 8.26
[camel-kafka-connector] branch master updated: Small adjustment to sourcechecks.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 6106196 Small adjustment to sourcechecks. 6106196 is described below commit 6106196e3cd69305f54231a18a066e68d47313b2 Author: Andrea Tarocchi AuthorDate: Wed Feb 12 15:27:53 2020 +0100 Small adjustment to sourcechecks. --- .github/workflows/master-pr-build.yml| 2 +- .github/workflows/master-push-build.yml | 2 +- buildingtools/src/main/resources/camel-checkstyle.xml| 1 - .../camel/springboot/maven/StarterGeneratorMojo.java | 16 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml index 653b477..3ff3159 100644 --- a/.github/workflows/master-pr-build.yml +++ b/.github/workflows/master-pr-build.yml @@ -34,6 +34,6 @@ jobs: with: java-version: ${{ matrix.java }} - name: mvn sourcecheck - run: ./mvnw -V --no-transfer-progress clean install -DskipTests && ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify + run: ./mvnw -V --no-transfer-progress -DskipTests --projects org.apache.camel.kafkaconnector:camel-buildtools clean install && ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify - name: mvn build and itests run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install diff --git a/.github/workflows/master-push-build.yml b/.github/workflows/master-push-build.yml index 25a7195..4cf1389 100644 --- a/.github/workflows/master-push-build.yml +++ b/.github/workflows/master-push-build.yml @@ -34,6 +34,6 @@ jobs: with: java-version: ${{ matrix.java }} - name: mvn sourcecheck -run: ./mvnw -V --no-transfer-progress clean install -DskipTests && ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify +run: ./mvnw -V --no-transfer-progress -DskipTests --projects org.apache.camel.kafkaconnector:camel-buildtools clean install && ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify - name: mvn build and itests run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml index c21a0aa..f699143 100644 --- a/buildingtools/src/main/resources/camel-checkstyle.xml +++ b/buildingtools/src/main/resources/camel-checkstyle.xml @@ -374,7 +374,6 @@ lengths, if/try depths, etc... - diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java index 2778c3f..bb8119b 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java @@ -91,14 +91,14 @@ public class StarterGeneratorMojo extends AbstractMojo { protected void doExecute() throws Exception { switch (action) { -case "create": -createStarter(); -break; -case "delete": -deleteStarter(); -break; -default: -throw new MojoFailureException("Unknown action: " + action); +case "create": +createStarter(); +break; +case "delete": +deleteStarter(); +break; +default: +throw new MojoFailureException("Unknown action: " + action); } }
[camel] branch master updated (97b58b3 -> b2ec73d)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 97b58b3 Remove unnecessary null check in QuartzEndpoint (as reported by lgtm.com). new 5b9041c chore: SC fix of camel-pulsar new b2ec73d chore: regen 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: .../org/apache/camel/component/kafka/kafka.json| 2 +- .../camel-kafka/src/main/docs/kafka-component.adoc | 2 +- .../consumers/CommonCreationStrategyImpl.java | 2 +- .../utils/consumers/FailoverConsumerStrategy.java | 2 +- .../utils/consumers/SharedConsumerStrategy.java| 2 +- .../dsl/KafkaComponentBuilderFactory.java | 26 +++--- .../modules/ROOT/pages/kafka-component.adoc| 2 +- 7 files changed, 19 insertions(+), 19 deletions(-)
[camel] 01/02: chore: SC fix of camel-pulsar
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 5b9041cede435f0de46fb71424605432d0a3298b Author: Andrea Tarocchi AuthorDate: Sat Feb 29 16:07:18 2020 +0100 chore: SC fix of camel-pulsar --- .../component/pulsar/utils/consumers/CommonCreationStrategyImpl.java| 2 +- .../component/pulsar/utils/consumers/FailoverConsumerStrategy.java | 2 +- .../camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/CommonCreationStrategyImpl.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/CommonCreationStrategyImpl.java index 308cae5..a411347 100644 --- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/CommonCreationStrategyImpl.java +++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/CommonCreationStrategyImpl.java @@ -18,10 +18,10 @@ package org.apache.camel.component.pulsar.utils.consumers; import java.util.concurrent.TimeUnit; +import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.camel.component.pulsar.PulsarConsumer; import org.apache.camel.component.pulsar.PulsarEndpoint; import org.apache.camel.component.pulsar.PulsarMessageListener; -import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.DeadLetterPolicy; import org.apache.pulsar.client.api.DeadLetterPolicy.DeadLetterPolicyBuilder; diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java index 71ff23c..d3ef9ff 100644 --- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java +++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/FailoverConsumerStrategy.java @@ -19,9 +19,9 @@ package org.apache.camel.component.pulsar.utils.consumers; import java.util.Collection; import java.util.LinkedList; +import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.camel.component.pulsar.PulsarConsumer; import org.apache.camel.component.pulsar.PulsarEndpoint; -import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.PulsarClientException; diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java index eedda5e..9471fec 100644 --- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java +++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/SharedConsumerStrategy.java @@ -19,9 +19,9 @@ package org.apache.camel.component.pulsar.utils.consumers; import java.util.Collection; import java.util.LinkedList; +import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.camel.component.pulsar.PulsarConsumer; import org.apache.camel.component.pulsar.PulsarEndpoint; -import org.apache.camel.component.pulsar.PulsarConfiguration; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.PulsarClientException;
[camel] 02/02: chore: regen
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit b2ec73df68310e4a3ec7b88ada186ea5bbad9548 Author: Andrea Tarocchi AuthorDate: Sat Feb 29 16:08:09 2020 +0100 chore: regen --- .../org/apache/camel/component/kafka/kafka.json| 2 +- .../camel-kafka/src/main/docs/kafka-component.adoc | 2 +- .../dsl/KafkaComponentBuilderFactory.java | 26 +++--- .../modules/ROOT/pages/kafka-component.adoc| 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json b/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json index a2a49c9..9b0590e 100644 --- a/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json +++ b/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json @@ -110,9 +110,9 @@ "sslProtocol": { "kind": "property", "displayName": "Ssl Protocol", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "TLS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The SSL protocol used to generate the SSLContext. Default setting is TLS, which is fine for most cases. Allow [...] "sslProvider": { "kind": "property", "displayName": "Ssl Provider", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The name of the security provider used for SSL connections. Default value is the default security provider of the JVM." }, "sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl Trustmanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PKIX", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by trust manager factory for SSL connections. Default value is [...] +"sslTruststoreLocation": { "kind": "property", "displayName": "Ssl Truststore Location", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The location of the trust store file." }, "sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." }, "schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false
[camel-kafka-connector] branch master updated (7b072a8 -> e60179f)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 7b072a8 Merge pull request #84 from apache/qpid-jms new 8dbd34a Fixed log message in S3ObjectSerializer.java new e2e8ef8 Initial import from camel-springboot project of the maven plugins to autogenerate connectors. See issue #15. First manual implementation of a generated connector and stub of generator plugin new ce67422 Fixed some config property documentation typo. Changed some properties defualt values. Arranged them in different order. new f5c85c6 Fixed source checks in camel-kafka-connector-generator-maven-plugin. new 12b4e8d Used the buildtool in this project instead of the camel one, tweeked chekstyles config to use check exclusion comments. new dc5b265 Changes to prepare for issue #15 in order to better produce one connector per camel component. new 01c133e Example of the first connector produced with jsut his dependencies. See issue #15. new c5fd6c4 Integration Tests adapted for sjms2 component after have produeced it as a separate connector with just his own dependencies. See issue #15 new 89e9f1a Tweeked github actions to reflects changes in the use of buildtools/ new e60179f Merge pull request #85 from valdar/autoGen The 219 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/master-pr-build.yml |2 +- .github/workflows/master-push-build.yml|2 +- buildingtools/pom.xml | 41 + .../src/main/resources/camel-checkstyle.xml| 10 + .../assembly/package.xml |0 connectors/camel-sjms2-kafka-connector/pom.xml | 97 + .../src/main/assembly/package.xml |4 +- .../sjms2/CamelSjms2SinkConnector.java | 20 +- .../sjms2/CamelSjms2SinkConnectorConfig.java | 203 + .../kafkaconnector/sjms2/CamelSjms2SinkTask.java | 30 +- .../sjms2/CamelSjms2SourceConnector.java | 20 +- .../sjms2/CamelSjms2SourceConnectorConfig.java | 237 ++ .../kafkaconnector/sjms2/CamelSjms2SourceTask.java | 42 + connectors/pom.xml | 68 + core/pom.xml | 20 +- .../camel/kafkaconnector/CamelSinkConnector.java |2 +- .../kafkaconnector/CamelSinkConnectorConfig.java | 18 +- .../apache/camel/kafkaconnector/CamelSinkTask.java | 34 +- .../camel/kafkaconnector/CamelSourceConnector.java |2 +- .../kafkaconnector/CamelSourceConnectorConfig.java | 33 +- .../camel/kafkaconnector/CamelSourceTask.java | 32 +- .../converters/S3ObjectSerializer.java |2 +- .../kafkaconnector/utils/CamelMainSupport.java |5 +- .../camel/kafkaconnector/utils/TaskHelper.java | 85 + .../camel/kafkaconnector/CamelSinkTaskTest.java| 165 +- .../camel/kafkaconnector/CamelSourceTaskTest.java | 98 + .../camel/kafkaconnector/DataFormatTest.java | 22 +- .../camel/kafkaconnector/PropertiesOrderTest.java | 12 +- .../camel/kafkaconnector/utils/TaskHelperTest.java | 179 + parent/pom.xml |7 +- pom.xml|2 + tests/pom.xml |9 +- .../sink/jms/CamelJMSPropertyFactory.java |5 +- .../source/jms/CamelJMSPropertyFactory.java|6 +- .../pom.xml| 234 ++ .../maven/AbstractSpringBootGenerator.java | 228 ++ .../camel/springboot/maven/BomGeneratorMojo.java | 471 +++ .../camel/springboot/maven/DynamicClassLoader.java | 63 + .../maven/PrepareCatalogSpringBootMojo.java| 187 + .../maven/SpringBootAutoConfigurationMojo.java | 2198 ++ .../springboot/maven/SpringBootStarterMojo.java| 474 +++ .../springboot/maven/StarterGeneratorMojo.java | 174 + .../spring-boot-auto-configure-options.mvel| 27 + .../spring-boot-fix-dependencies.properties| 52 + .../main/resources/spring-boot-starter-LICENSE.txt |0 .../main/resources/spring-boot-starter-NOTICE.txt |0 .../spring-boot-starter-template-pom.template | 51 + .../spring-boot-starter-template-spring.provides |1 + .../pom.xml| 221 + .../target-template-pom.xml| 54 + tooling/camel-spring-boot-dependencies/pom.xml | 4301 .../camel-spring-boot-starter-generator/pom.xml| 61 + .../template-starter-pom.xml | 53 + tooling/camel-st
[camel] branch master updated: Fixed CAMEL-14526: is it not possible to use //CHECSTYLE:OFF for checks like LineLength.
This is an automated email from the ASF dual-hosted git repository. valdar 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 da11d89 Fixed CAMEL-14526: is it not possible to use //CHECSTYLE:OFF for checks like LineLength. new 78f7ddd Merge pull request #3553 from valdar/CAMEL-14526 da11d89 is described below commit da11d89ace49a6f8faa222e02b140a9b183e56aa Author: Andrea Tarocchi AuthorDate: Fri Feb 7 22:17:57 2020 +0100 Fixed CAMEL-14526: is it not possible to use //CHECSTYLE:OFF for checks like LineLength. --- buildingtools/src/main/resources/camel-checkstyle.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml index ad8be30..eb1622f 100644 --- a/buildingtools/src/main/resources/camel-checkstyle.xml +++ b/buildingtools/src/main/resources/camel-checkstyle.xml @@ -96,6 +96,16 @@ lengths, if/try depths, etc... + + + + + + + + + +
[camel-spring-boot] branch master updated: Bumped version of checkout action and removed unecessary step.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new de2d120 Bumped version of checkout action and removed unecessary step. de2d120 is described below commit de2d120f9258f5400389ecd86d1e2c4cec8de336 Author: Andrea Tarocchi AuthorDate: Mon Feb 17 23:41:30 2020 +0100 Bumped version of checkout action and removed unecessary step. --- .github/workflows/automatic-sync-master.yml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 28fe03e..a6accd8 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout -uses: actions/checkout@v1 +uses: actions/checkout@v2 with: repository: apache/camel ref: master @@ -40,14 +40,10 @@ jobs: run: ./mvnw -V --no-transfer-progress clean install -DskipTests working-directory: /home/runner/work/camel-spring-boot/camel - name: Checkout -uses: actions/checkout@v1 +uses: actions/checkout@v2 with: path: camel-spring-boot fetch-depth: 0 - - name: Set Up Java -uses: actions/setup-java@v1 -with: - java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: Create Pull Request
[camel-spring-boot] branch master updated: attempt to fix github action to sync with main Camel repo
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new d18a254 attempt to fix github action to sync with main Camel repo d18a254 is described below commit d18a254d2334194f7e03d9149a534892c887d090 Author: Andrea Tarocchi AuthorDate: Mon Feb 17 21:02:58 2020 +0100 attempt to fix github action to sync with main Camel repo --- .github/workflows/automatic-sync-master.yml | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 406937b..0453389 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -23,7 +23,7 @@ on: - cron: '10 * * * *' jobs: build: -name: Build +name: Sync Camel Spring Boot Master Branch runs-on: ubuntu-latest steps: - name: Checkout @@ -43,16 +43,19 @@ jobs: uses: actions/checkout@v1 with: path: camel-spring-boot + ref: master - name: Set Up Java uses: actions/setup-java@v1 with: java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - - name: GitHub Pull Request Action -uses: repo-sync/pull-request@v2.0.1 + - name: Create Pull Request +uses: peter-evans/create-pull-request@v2.4.1 with: - source_branch: master - destination_branch: master - pr_title: Automatic sync branch master to camel-master - github_token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} + branch: + title: '[Github Actions] Periodic Sync Camel Spring Boot Master Branch' + body: | +Periodic Sync of Camel Spring Boot Master Branch with main Camel Master. +see https://github.com/apache/camel-spring-boot/blob/master/.github/workflows/automatic-sync-master.yml
[camel-spring-boot] branch master updated: More tweeking of github actions.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 3fa49ba More tweeking of github actions. 3fa49ba is described below commit 3fa49ba7416ab5704f6f3550647f7380ac481b8d Author: Andrea Tarocchi AuthorDate: Tue Feb 18 00:38:43 2020 +0100 More tweeking of github actions. --- .github/workflows/automatic-sync-master.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 7575bfe..7eadc9b 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -38,7 +38,6 @@ jobs: java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests -working-directory: $GITHUB_WORKSPACE/camel - name: Checkout uses: actions/checkout@v2 with: @@ -47,12 +46,11 @@ jobs: fetch-depth: 0 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests -working-directory: $GITHUB_WORKSPACE/camel-spring-boot - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with: token: ${{ secrets.GITHUB_TOKEN }} - branch: + branch: periodic-sync title: '[Github Actions] Periodic Sync Camel Spring Boot Master Branch' body: | Periodic Sync of Camel Spring Boot Master Branch with main Camel Master.
[camel-spring-boot] branch master updated: Updated github action configuration to checkout version 2.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 6e4565b Updated github action configuration to checkout version 2. 6e4565b is described below commit 6e4565b947f0b19f7485085174bbad085a6dcc73 Author: Andrea Tarocchi AuthorDate: Tue Feb 18 00:28:37 2020 +0100 Updated github action configuration to checkout version 2. --- .github/workflows/automatic-sync-master.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index a6accd8..7575bfe 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -38,14 +38,16 @@ jobs: java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests -working-directory: /home/runner/work/camel-spring-boot/camel +working-directory: $GITHUB_WORKSPACE/camel - name: Checkout uses: actions/checkout@v2 with: path: camel-spring-boot + ref: master fetch-depth: 0 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests +working-directory: $GITHUB_WORKSPACE/camel-spring-boot - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with:
[camel-spring-boot] branch master updated: tweeked github action checkout config.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 34bad87 tweeked github action checkout config. 34bad87 is described below commit 34bad876cf0aa12c0c106edbf2f96397e0f5abba Author: Andrea Tarocchi AuthorDate: Mon Feb 17 22:06:00 2020 +0100 tweeked github action checkout config. --- .github/workflows/automatic-sync-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 0453389..28fe03e 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v1 with: path: camel-spring-boot - ref: master + fetch-depth: 0 - name: Set Up Java uses: actions/setup-java@v1 with:
[camel-spring-boot] branch master updated: Fixed github action path and schedule time: once per day at midnight
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new a7bc2f0 Fixed github action path and schedule time: once per day at midnight a7bc2f0 is described below commit a7bc2f0b5d8f9427f9d72b024ff32f1e264f6a0e Author: Andrea Tarocchi AuthorDate: Tue Feb 18 01:45:12 2020 +0100 Fixed github action path and schedule time: once per day at midnight --- .github/workflows/automatic-sync-master.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index d49bd96..c48d026 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -20,7 +20,7 @@ name: Sync Camel Spring Boot Master Branch on: schedule: # Run every 10 minutes -- cron: '10 * * * *' +- cron: '0 0 * * *' jobs: build: name: Sync Camel Spring Boot Master Branch @@ -42,12 +42,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - path: camel-spring-boot ref: master fetch-depth: 0 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests -working-directory: ${{ github.workspace }}/camel-spring-boot - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with:
[camel-spring-boot] branch master updated: Naming and comments changes on github action.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 59a7d2c Naming and comments changes on github action. 59a7d2c is described below commit 59a7d2cf613e15d1e403d6f94b5051377a4aa0c8 Author: Andrea Tarocchi AuthorDate: Tue Feb 18 07:52:13 2020 +0100 Naming and comments changes on github action. --- .github/workflows/automatic-sync-master.yml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index c48d026..a01c8b0 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -19,14 +19,14 @@ name: Sync Camel Spring Boot Master Branch on: schedule: -# Run every 10 minutes +# Run at midnight every day - cron: '0 0 * * *' jobs: build: name: Sync Camel Spring Boot Master Branch runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout Camel project uses: actions/checkout@v2 with: repository: apache/camel @@ -36,21 +36,21 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Build Project + - name: Build Camel Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests working-directory: ${{ github.workspace }}/camel - - name: Checkout + - name: Checkout Camel-spring-boot project uses: actions/checkout@v2 with: ref: master fetch-depth: 0 - - name: Build Project + - name: Build Camel-spring-boot Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with: token: ${{ secrets.GITHUB_TOKEN }} - branch: periodic-sync + branch: automatic-periodic-sync title: '[Github Actions] Periodic Sync Camel Spring Boot Master Branch' body: | Periodic Sync of Camel Spring Boot Master Branch with main Camel Master.
[camel-spring-boot] branch master updated: Fixed reference to env var syntax for github actions.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 0854e66 Fixed reference to env var syntax for github actions. 0854e66 is described below commit 0854e66389c604c832c0955b01cd1812a26980d3 Author: Andrea Tarocchi AuthorDate: Tue Feb 18 00:47:45 2020 +0100 Fixed reference to env var syntax for github actions. --- .github/workflows/automatic-sync-master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 7eadc9b..d49bd96 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -38,6 +38,7 @@ jobs: java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests +working-directory: ${{ github.workspace }}/camel - name: Checkout uses: actions/checkout@v2 with: @@ -46,6 +47,7 @@ jobs: fetch-depth: 0 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests +working-directory: ${{ github.workspace }}/camel-spring-boot - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with:
[camel] branch master updated: Fix CAMEL-14534: Wrong message in some cases in org.apache.camel.PropertyBindingException.
This is an automated email from the ASF dual-hosted git repository. valdar 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 6eb34d4 Fix CAMEL-14534: Wrong message in some cases in org.apache.camel.PropertyBindingException. new 1411128 Merge pull request #3569 from valdar/CAMEL-14534 6eb34d4 is described below commit 6eb34d4a70fd5a759d5fc7953bef994f2e60de02 Author: Andrea Tarocchi AuthorDate: Tue Feb 11 16:13:55 2020 +0100 Fix CAMEL-14534: Wrong message in some cases in org.apache.camel.PropertyBindingException. --- .../org/apache/camel/PropertyBindingException.java | 2 +- .../apache/camel/PropertyBindingExceptionTest.java | 20 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/PropertyBindingException.java b/core/camel-api/src/main/java/org/apache/camel/PropertyBindingException.java index 315c53e..426193a 100644 --- a/core/camel-api/src/main/java/org/apache/camel/PropertyBindingException.java +++ b/core/camel-api/src/main/java/org/apache/camel/PropertyBindingException.java @@ -67,7 +67,7 @@ public class PropertyBindingException extends RuntimeCamelException { String stringValue = value != null ? value.toString() : ""; String key = propertyName; if (optionPrefix != null && optionKey != null) { -key = optionPrefix + "." + optionKey; +key = optionPrefix.endsWith(".") ? optionPrefix + optionKey : optionPrefix + "." + optionKey; } if (key != null) { return "Error binding property (" + key + "=" + stringValue + ") with name: " + propertyName diff --git a/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java new file mode 100644 index 000..8d37303 --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/PropertyBindingExceptionTest.java @@ -0,0 +1,20 @@ +package org.apache.camel; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + +public class PropertyBindingExceptionTest { +public static final String EXPECTED_EXCEPTION_MESSAGE = "Error binding property (prefix.property=value) with name: property"; + +@Test +public void exceptionMessageTest(){ +PropertyBindingException pbe = new PropertyBindingException(new Object(), "property", "value", "prefix", "property", new Throwable("The casue!")); +assertTrue("PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.", +pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE)); + +pbe = new PropertyBindingException(new Object(), "property", "value", "prefix.", "property", new Throwable("The casue!")); +assertTrue("PropertyBindingException message should start with [" + EXPECTED_EXCEPTION_MESSAGE + "] while is [" + pbe.getMessage() + "] instead.", +pbe.getMessage().startsWith(EXPECTED_EXCEPTION_MESSAGE)); +} +}
[camel-kafka-connector] branch master updated: Fixed README.adoc links after Antora init.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 7112a31 Fixed README.adoc links after Antora init. new 0f1a5bb Merge pull request #90 from valdar/fixReadmeLinks 7112a31 is described below commit 7112a3141769def5a607367af33ac83b117b3a07 Author: Andrea Tarocchi AuthorDate: Tue Feb 11 16:54:26 2020 +0100 Fixed README.adoc links after Antora init. --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 0f8d3f8..d9298ca 100644 --- a/README.adoc +++ b/README.adoc @@ -43,12 +43,12 @@ mvn -Dkafka.bootstrap.servers=host1:port -Dkafka.instance.type=remote -DskipInte === Try it out locally You can use Camel Kafka connectors with local Apache Kafka installation. -For more details see the link:./docs/try-it-out-locally.adoc[local guide]. +For more details see the link:./docs/modules/ROOT/pages/try-it-out-locally.adoc[local guide]. === Try it out on OpenShift with Strimzi You can also use Camel Kafka connectors on OpenShift. -For more details see the link:./docs/try-it-out-on-openshift-with-strimzi.adoc[OpenShift guide]. +For more details see the link:./docs/modules/ROOT/pages/try-it-out-on-openshift-with-strimzi.adoc[OpenShift guide]. === Known limitations In order to use other Camel components you need to add them as dependencies in the project `pom.xml`.
[camel] branch master updated (9d5b774 -> abe8046)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 9d5b774 Add a sync point for all component dependencies to ensure proper build ordering new d489464 fix CAMEL-14540: Change the switch/case indentation sourcecheck policy to 4 spaces instead of 0. new d86f179 camel-util-json: fixed switch/cases indentation see CAMEL-14540 new 5bc871e camel-package-maven-plugin: fixed switch/cases indentation see CAMEL-14540 new 4677f12 camel-util: fixed switch/cases indentation see CAMEL-14540 new 2503394 camel-api: fixed switch/cases indentation see CAMEL-14540 new be1bd99 camel-support: fixed switch/cases indentation see CAMEL-14540 new 87b03ec camel-base: fixed switch/cases indentation see CAMEL-14540 new 7b8b66a camel-core-engine: fixed switch/cases indentation see CAMEL-14540 new 354fa20 camel-bean: fixed switch/cases indentation see CAMEL-14540 new 6457750 camel-dataset: fixed switch/cases indentation see CAMEL-14540 new d029060 camel-xml-jaxp: fixed switch/cases indentation see CAMEL-14540 new 819c0c4 camel-xpath: fixed switch/cases indentation see CAMEL-14540 new d90a024 camel-core: fixed switch/cases indentation see CAMEL-14540 new 217df25 camel-swagger-rest-dsl-generator: fixed switch/cases indentation see CAMEL-14540 new de8fc44 camel-openapi-rest-dsl-generator: fixed switch/cases indentation see CAMEL-14540 new 01d9e4c camel-management: fixed switch/cases indentation see CAMEL-14540 new 4dbe60d camel-main: fixed switch/cases indentation see CAMEL-14540 new 592d7f2 camel-spring: fixed switch/cases indentation see CAMEL-14540 new 7e25646 camel-blueprint: fixed switch/cases indentation see CAMEL-14540 new e1e5c2b camel-cdi: fixed switch/cases indentation see CAMEL-14540 new c3c4b2e camel-api-component-maven-plugin: fixed switch/cases indentation see CAMEL-14540 new 96e030f camel-http: fixed switch/cases indentation see CAMEL-14540 new bb3c923 camel-jms: fixed switch/cases indentation see CAMEL-14540 new 340affd camel-apns: fixed switch/cases indentation see CAMEL-14540 new 5e2895d camel-as2-api: fixed switch/cases indentation see CAMEL-14540 new 3d0b0c6 camel-as2: fixed switch/cases indentation see CAMEL-14540 new 250a34d camel-aws2-ddb: fixed switch/cases indentation see CAMEL-14540 new d9ff839 camel-aws-ddb: fixed switch/cases indentation see CAMEL-14540 new b8705b4 camel-aws-ec2: fixed switch/cases indentation see CAMEL-14540 new d5d2112 camel-aws-ecs: fixed switch/cases indentation see CAMEL-14540 new c0a0b50 camel-aws-eks: fixed switch/cases indentation see CAMEL-14540 new d9862fe camel-aws-iam: fixed switch/cases indentation see CAMEL-14540 new c18ac8c camel-aws-kinesis: fixed switch/cases indentation see CAMEL-14540 new 2fd612e camel-aws-kms: fixed switch/cases indentation see CAMEL-14540 new f2503ff camel-aws-lambda: fixed switch/cases indentation see CAMEL-14540 new d243e4a camel-aws-mq: fixed switch/cases indentation see CAMEL-14540 new 00ed8ef camel-aws-msk: fixed switch/cases indentation see CAMEL-14540 new 196a11f camel-aws-s3: fixed switch/cases indentation see CAMEL-14540 new c90f27b camel-aws-sdb: fixed switch/cases indentation see CAMEL-14540 new 5dfc108 camel-aws-sqs: fixed switch/cases indentation see CAMEL-14540 new fac5267 camel-aws-swf: fixed switch/cases indentation see CAMEL-14540 new 593883c camel-aws-translate: fixed switch/cases indentation see CAMEL-14540 new 5ad02d7 camel-aws-xray: fixed switch/cases indentation see CAMEL-14540 new 67dbf27 camel-aws2-ec2 fixed switch/cases indentation see CAMEL-14540 new 1b921d0 camel-aws2-ecs fixed switch/cases indentation see CAMEL-14540 new 0743e4c camel-aws2-eks fixed switch/cases indentation see CAMEL-14540 new 144ad9a camel-aws2-iam fixed switch/cases indentation see CAMEL-14540 new c878803 camel-aws2-kms fixed switch/cases indentation see CAMEL-14540 new 7a8e696 camel-aws2-mq fixed switch/cases indentation see CAMEL-14540 new c22ed5c camel-aws2-msk fixed switch/cases indentation see CAMEL-14540 new a98a49d camel-aws2-translate fixed switch/cases indentation see CAMEL-14540 new 37220f9 camel-azure fixed switch/cases indentation see CAMEL-14540 new 26bfb97 camel-box fixed switch/cases indentation see CAMEL-14540 new 36f6dbe camel-braintree fixed switch/cases indentation see CAMEL-14540 new 4192534 camel-cassandraql fixed switch/cases indentation see CAMEL-14540 new 146f1dd camel-coap fixed switch/cases indentation see CAMEL-14540 new 7507d73 camel-undertow fixed switch/cases indentation see CAMEL-14540 new 357b07b camel-consul fixed switch/cases indentation see
[camel-spring-boot] branch master updated: Fixed build action schema generation error.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 2b7ba8b Fixed build action schema generation error. new 6897453 Merge pull request #6 from valdar/fixBuildActionProblems 2b7ba8b is described below commit 2b7ba8b70afe82f2735db338ba4d9ce42dc9c756 Author: Andrea Tarocchi AuthorDate: Wed Feb 12 00:05:22 2020 +0100 Fixed build action schema generation error. --- .github/workflows/automatic-sync-master.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index a458091..c1f124f 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -37,7 +37,8 @@ jobs: with: java-version: 1.8 - name: Build Project -run: mvn -f /home/runner/work/camel-spring-boot/camel/pom.xml clean install -DskipTests +run: ./mvnw -V --no-transfer-progress clean install -DskipTests +working-directory: /home/runner/work/camel-spring-boot/camel - name: Checkout uses: actions/checkout@v1 with: @@ -47,7 +48,7 @@ jobs: with: java-version: 1.8 - name: Build Project -run: ./mvnw clean install -DskipTests +run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: GitHub Pull Request Action uses: repo-sync/pull-request@v2.0.1 with:
[camel] branch master updated (02f85b9 -> a989d6b)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 02f85b9 Update groovy to v3.0.0 new bc4a428 chore: fixed sourcechk violations. new f1d9296 Added CAMEL-14535: Sourcecheck on each PR new 060eed5 Added Build badge in README.md new a989d6b Merge pull request #3571 from valdar/CAMEL-14535 The 42404 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: .../workflows/master-pr-build.yml | 22 ++-- .../workflows/master-push-build.yml| 29 +++ README.md | 2 +- .../resources/camel-checkstyle-suppressions.xml| 3 ++ .../camel/catalog/karaf/KarafRuntimeProvider.java | 2 +- .../apache/camel/catalog/DefaultCamelCatalog.java | 9 ++-- .../org/apache/camel/catalog/CamelCatalogTest.java | 7 ++- .../component/activemq/ActiveMQComponent.java | 2 +- .../aws2/cw/CwComponentConfigurationTest.java | 2 - .../aws2/cw/CwComponentRegistryClientTest.java | 2 - .../camel/component/aws2/cw/CwComponentTest.java | 1 - .../EmbeddedDebeziumConfiguration.java | 58 +++--- .../apache/camel/component/http/HttpEndpoint.java | 4 +- .../apache/camel/openapi/RestOpenApiSupport.java | 2 +- .../apache/camel/component/sjms/SjmsEndpoint.java | 4 +- .../apache/camel/swagger/RestSwaggerSupport.java | 2 +- .../apache/camel/PropertyBindingExceptionTest.java | 18 ++- .../generator/openapi/RestDslXmlGenerator.java | 3 +- .../generator/swagger/RestDslXmlGenerator.java | 2 +- 19 files changed, 109 insertions(+), 65 deletions(-) copy components/camel-exec/src/test/resources/exec-test-script.sh => .github/workflows/master-pr-build.yml (55%) mode change 100755 => 100644 copy tests/camel-itest-karaf/kill-karaf.sh => .github/workflows/master-push-build.yml (55%) mode change 100755 => 100644
[camel-kafka-connector] 01/01: Added support for testing the Kafka service using Strimzi (#66)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 7063630d23820eefa97e28e37c104ba40fae3fa6 Merge: d9bade3 699c3b3 Author: Andrea Tarocchi AuthorDate: Sun Jan 12 15:29:46 2020 +0100 Added support for testing the Kafka service using Strimzi (#66) Added support for testing the Kafka service using Strimzi parent/pom.xml | 3 + tests/pom.xml | 2 +- .../services/kafka/KafkaServiceFactory.java| 10 ++- .../services/kafka/StrimziContainer.java | 71 ++ .../services/kafka/StrimziService.java | 57 + .../services/kafka/ZookeeperContainer.java | 57 + 6 files changed, 196 insertions(+), 4 deletions(-)
[camel-kafka-connector] branch master updated (d9bade3 -> 7063630)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from d9bade3 Merge pull request #71 from orpiske/issue-67-cassandra-it-case add 75e8953 Added support for testing the Kafka service using Strimzi add bbd3162 Fixed rebase issues. add feea539 Made the itest images configurable at test-run time. add 699c3b3 itests updatet to use strimzi/kafka:0.15.0-kafka-2.3.1 image. new 7063630 Added support for testing the Kafka service using Strimzi (#66) 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: parent/pom.xml | 3 + tests/pom.xml | 2 +- .../services/kafka/KafkaServiceFactory.java| 10 ++- .../services/kafka/StrimziContainer.java | 71 ++ ...rLocalKafkaService.java => StrimziService.java} | 32 +++--- .../services/kafka/ZookeeperContainer.java | 57 + 6 files changed, 164 insertions(+), 11 deletions(-) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java copy tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/{ContainerLocalKafkaService.java => StrimziService.java} (54%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
[camel-kafka-connector] branch master updated (84ea014 -> b1ef1a0)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 84ea014 Updated integration test image to kafka 2.4 new ca26346 Added sourcecheck to github actions, added master push github action workflow and badge in readme. new b1ef1a0 Fixed codestyle in itests 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: .../{pr-build.yml => master-pr-build.yml} | 8 --- .../{pr-build.yml => master-push-build.yml}| 20 README.adoc| 1 + parent/pom.xml | 11 - .../services/kafka/StrimziContainer.java | 25 ++-- .../services/kafka/ZookeeperContainer.java | 27 +++--- 6 files changed, 54 insertions(+), 38 deletions(-) copy .github/workflows/{pr-build.yml => master-pr-build.yml} (79%) rename .github/workflows/{pr-build.yml => master-push-build.yml} (66%)
[camel-kafka-connector] 01/02: Added sourcecheck to github actions, added master push github action workflow and badge in readme.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit ca263464838e521dbd6d4dfcd3a0f0314f10b9cc Author: Andrea Tarocchi AuthorDate: Mon Jan 13 00:44:42 2020 +0100 Added sourcecheck to github actions, added master push github action workflow and badge in readme. --- .../workflows/{pr-build.yml => master-pr-build.yml} | 8 +--- .../{pr-build.yml => master-push-build.yml} | 20 +++- README.adoc | 1 + parent/pom.xml | 9 + 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/master-pr-build.yml similarity index 79% copy from .github/workflows/pr-build.yml copy to .github/workflows/master-pr-build.yml index c331ad5..37c750c 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/master-pr-build.yml @@ -15,7 +15,7 @@ # limitations under the License. # -name: Build PR +name: master pr build on: pull_request: @@ -33,5 +33,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} -- name: mvn verify - run: ./mvnw -V --no-transfer-progress clean install -DskipIntegrationTests=false +- name: mvn sourcecheck + run: ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify +- name: mvn build and itests + run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install diff --git a/.github/workflows/pr-build.yml b/.github/workflows/master-push-build.yml similarity index 66% rename from .github/workflows/pr-build.yml rename to .github/workflows/master-push-build.yml index c331ad5..d36e1bd 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/master-push-build.yml @@ -15,10 +15,10 @@ # limitations under the License. # -name: Build PR +name: master build on: - pull_request: + push: branches: - master jobs: @@ -28,10 +28,12 @@ jobs: matrix: java: [ '1.8', '11' ] steps: -- uses: actions/checkout@v1 -- name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 - with: -java-version: ${{ matrix.java }} -- name: mvn verify - run: ./mvnw -V --no-transfer-progress clean install -DskipIntegrationTests=false + - uses: actions/checkout@v1 + - name: Set up JDK ${{ matrix.java }} +uses: actions/setup-java@v1 +with: + java-version: ${{ matrix.java }} + - name: mvn sourcecheck +run: ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify + - name: mvn build and itests +run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean install diff --git a/README.adoc b/README.adoc index d2db51a..0f8d3f8 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,7 @@ == Camel Kafka Connector image:https://img.shields.io/gitter/room/apache/camel-kafka-connector["Chat on Gitter", link="https://gitter.im/apache/camel-kafka-connector;] +image:https://github.com/apache/camel-kafka-connector/workflows/master%20build/badge.svg[Master Build, link="https://github.com/apache/camel-kafka-connector/actions?query=workflow%3A%22master+build%22;] === Introduction [NOTE] diff --git a/parent/pom.xml b/parent/pom.xml index a9cdf46..e2f9255 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -62,6 +62,7 @@ 2.12.4 1.12.4 0.40.0 + 1.6.0 8.26 3.1.0 @@ -70,6 +71,8 @@ strimzi/kafka:0.16.0-rc1-kafka-2.4.0 strimzi/kafka:0.16.0-rc1-kafka-2.4.0 + +false @@ -386,6 +389,12 @@ org.apache.maven.plugins +maven-remote-resources-plugin + ${version.maven.maven-remote-resources-plugin} + + + +org.apache.maven.plugins maven-checkstyle-plugin ${version.maven.checkstyle.plugin}
[camel-kafka-connector] 02/02: Fixed codestyle in itests
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit b1ef1a01c4e87626011c8e7163000e0069f39fba Author: Andrea Tarocchi AuthorDate: Mon Jan 13 09:55:34 2020 +0100 Fixed codestyle in itests --- parent/pom.xml | 2 +- .../services/kafka/StrimziContainer.java | 25 ++-- .../services/kafka/ZookeeperContainer.java | 27 +++--- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e2f9255..531583a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -427,7 +427,7 @@ header-java.txt **/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd - **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java + **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java,**/camel-checkstyle.xml diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java index 748a1d1..0b7e45d 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java @@ -1,23 +1,24 @@ /* - * 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 + * 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 + * 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. + * 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.kafkaconnector.services.kafka; import java.util.function.Consumer; + import com.github.dockerjava.api.command.CreateContainerCmd; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java index 4051b94..c6d81f1 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java @@ -1,23 +1,24 @@ /* - * 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 + * 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
[camel-kafka-connector] branch master updated (b1ef1a0 -> 0c276d8)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from b1ef1a0 Fixed codestyle in itests add 3c73f80 Migrates all the test cases to Junit 5 new 0c276d8 Migrates all the test cases to Junit 5 (#75) 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: core/pom.xml | 11 ++-- .../camel/kafkaconnector/CamelSinkTaskTest.java| 6 +-- .../camel/kafkaconnector/CamelSourceTaskTest.java | 14 ++--- .../camel/kafkaconnector/DataFormatTest.java | 25 + .../camel/kafkaconnector/PropertiesOrderTest.java | 2 +- .../CamelTypeConverterTransformTest.java | 15 +++--- .../kafkaconnector/utils/SchemaHelperTest.java | 5 +- parent/pom.xml | 28 -- tests/pom.xml | 23 +++-- .../camel/kafkaconnector/AbstractKafkaTest.java| 16 -- .../services/kafka/ContainerLocalKafkaService.java | 1 - .../services/kafka/KafkaService.java | 18 ++- .../services/kafka/KafkaServiceFactory.java| 2 + .../services/kafka/StrimziService.java | 1 - .../kafkaconnect/KafkaConnectRunnerService.java| 60 +- .../services/kafkaconnect/KafkaConnectService.java | 21 +++- .../sink/aws/sns/CamelSinkAWSSNSITCase.java| 24 + .../sink/aws/sqs/CamelSinkAWSSQSITCase.java| 24 + .../sink/cassandra/CamelSinkCassandraITCase.java | 20 .../CamelSinkElasticSearchITCase.java | 31 ++- .../sink/file/CamelSinkFileITCase.java | 24 + .../sink/http/CamelSinkHTTPITCase.java | 23 + .../sink/jms/CamelSinkJMSITCase.java | 21 .../aws/kinesis/CamelSourceAWSKinesisITCase.java | 20 +--- .../source/aws/s3/CamelSourceAWSS3ITCase.java | 21 +--- .../source/aws/sqs/CamelSourceAWSSQSITCase.java| 21 +--- .../source/jms/CamelSourceJMSITCase.java | 28 ++ .../source/timer/CamelSourceTimerITCase.java | 17 +++--- 28 files changed, 313 insertions(+), 209 deletions(-)
[camel-kafka-connector] 01/01: Migrates all the test cases to Junit 5 (#75)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 0c276d80bae5b0776271a9d1d3dac53af7b0fffc Merge: b1ef1a0 3c73f80 Author: Andrea Tarocchi AuthorDate: Fri Jan 17 15:36:17 2020 +0100 Migrates all the test cases to Junit 5 (#75) Migrates all the test cases to Junit 5 core/pom.xml | 11 ++-- .../camel/kafkaconnector/CamelSinkTaskTest.java| 6 +-- .../camel/kafkaconnector/CamelSourceTaskTest.java | 14 ++--- .../camel/kafkaconnector/DataFormatTest.java | 25 + .../camel/kafkaconnector/PropertiesOrderTest.java | 2 +- .../CamelTypeConverterTransformTest.java | 15 +++--- .../kafkaconnector/utils/SchemaHelperTest.java | 5 +- parent/pom.xml | 28 -- tests/pom.xml | 23 +++-- .../camel/kafkaconnector/AbstractKafkaTest.java| 16 -- .../services/kafka/ContainerLocalKafkaService.java | 1 - .../services/kafka/KafkaService.java | 18 ++- .../services/kafka/KafkaServiceFactory.java| 2 + .../services/kafka/StrimziService.java | 1 - .../kafkaconnect/KafkaConnectRunnerService.java| 60 +- .../services/kafkaconnect/KafkaConnectService.java | 21 +++- .../sink/aws/sns/CamelSinkAWSSNSITCase.java| 24 + .../sink/aws/sqs/CamelSinkAWSSQSITCase.java| 24 + .../sink/cassandra/CamelSinkCassandraITCase.java | 20 .../CamelSinkElasticSearchITCase.java | 31 ++- .../sink/file/CamelSinkFileITCase.java | 24 + .../sink/http/CamelSinkHTTPITCase.java | 23 + .../sink/jms/CamelSinkJMSITCase.java | 21 .../aws/kinesis/CamelSourceAWSKinesisITCase.java | 20 +--- .../source/aws/s3/CamelSourceAWSS3ITCase.java | 21 +--- .../source/aws/sqs/CamelSourceAWSSQSITCase.java| 21 +--- .../source/jms/CamelSourceJMSITCase.java | 28 ++ .../source/timer/CamelSourceTimerITCase.java | 17 +++--- 28 files changed, 313 insertions(+), 209 deletions(-)
[camel-kafka-connector] branch master updated: Updated integration test image to kafka 2.4
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 84ea014 Updated integration test image to kafka 2.4 84ea014 is described below commit 84ea014f193fec1cc0a6b2089dd10e6b58b30faa Author: Andrea Tarocchi AuthorDate: Sun Jan 12 15:51:37 2020 +0100 Updated integration test image to kafka 2.4 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a4d5590..a9cdf46 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,8 +68,8 @@ 3.0.0-M4 3.0 - strimzi/kafka:0.15.0-kafka-2.3.1 - strimzi/kafka:0.15.0-kafka-2.3.1 + strimzi/kafka:0.16.0-rc1-kafka-2.4.0 + strimzi/kafka:0.16.0-rc1-kafka-2.4.0
[camel-kafka-connector] branch master updated (e0ed770 -> f1b3f80)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from e0ed770 Merge pull request #63 from apache/jackson-2.10.2 add 99f4aba Make the waitFor logic reusable for other classes add 0594848 Added integration tests for Cassandra CQL sink component new f1b3f80 Add integration test for Cassandra CQL (#64) 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: .../apache/camel/kafkaconnector/TestCommon.java| 58 ++ .../cassandra/CassandraClient.java}| 32 +++--- .../clients/cassandra/dao/TestDataDao.java | 116 .../clients/elasticsearch/ElasticSearchClient.java | 47 +--- .../CassandraService.java} | 36 +-- .../CamelCassandraPropertyFactory.java}| 21 ++-- .../sink/cassandra/CamelSinkCassandraITCase.java | 118 + 7 files changed, 353 insertions(+), 75 deletions(-) copy tests/src/test/java/org/apache/camel/kafkaconnector/{services/kafka/ContainerLocalKafkaService.java => clients/cassandra/CassandraClient.java} (56%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/clients/cassandra/dao/TestDataDao.java copy tests/src/test/java/org/apache/camel/kafkaconnector/services/{jms/JMSService.java => cassandra/CassandraService.java} (53%) copy tests/src/test/java/org/apache/camel/kafkaconnector/sink/{http/CamelHTTPPropertyFactory.java => cassandra/CamelCassandraPropertyFactory.java} (74%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/sink/cassandra/CamelSinkCassandraITCase.java
[camel-kafka-connector] 01/01: Add integration test for Cassandra CQL (#64)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit f1b3f8009684f93b4dac6d32978d04e393503495 Merge: e0ed770 0594848 Author: Andrea Tarocchi AuthorDate: Wed Jan 8 22:47:39 2020 +0100 Add integration test for Cassandra CQL (#64) Add integration test for Cassandra CQL .../apache/camel/kafkaconnector/TestCommon.java| 58 ++ .../clients/cassandra/CassandraClient.java | 47 .../clients/cassandra/dao/TestDataDao.java | 116 .../clients/elasticsearch/ElasticSearchClient.java | 47 +--- .../services/cassandra/CassandraService.java | 49 + .../cassandra/CamelCassandraPropertyFactory.java | 58 ++ .../sink/cassandra/CamelSinkCassandraITCase.java | 118 + 7 files changed, 448 insertions(+), 45 deletions(-)
[camel-kafka-connector] 02/02: Kafka upgraded to version 2.3.1
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 1b29b732909e6987874e31a8002952293d31589c Author: Andrea Tarocchi AuthorDate: Wed Jan 8 22:38:27 2020 +0100 Kafka upgraded to version 2.3.1 --- parent/pom.xml | 2 +- .../kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java | 7 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index d12adf0..9b0ac61 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ https://repository.jboss.org/nexus/content/repositories/snapshots/ 5.15.9 -2.1.1 +2.3.1 4.13 3.0.0 2.10.2 diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java index 43c354a..2d552b8 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java @@ -29,6 +29,8 @@ import java.util.function.Consumer; import org.apache.camel.kafkaconnector.ConnectorPropertyFactory; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; +import org.apache.kafka.connect.connector.policy.AllConnectorClientConfigOverridePolicy; +import org.apache.kafka.connect.connector.policy.ConnectorClientConfigOverridePolicy; import org.apache.kafka.connect.runtime.Connect; import org.apache.kafka.connect.runtime.ConnectorConfig; import org.apache.kafka.connect.runtime.Herder; @@ -125,6 +127,7 @@ class KafkaConnectRunner { StandaloneConfig config = new StandaloneConfig(standAloneProperties); String kafkaClusterId = ConnectUtils.lookupKafkaClusterId(config); +AllConnectorClientConfigOverridePolicy allConnectorClientConfigOverridePolicy = new AllConnectorClientConfigOverridePolicy(); RestServer rest = new RestServer(config); @@ -132,13 +135,13 @@ class KafkaConnectRunner { According to the Kafka source code "... Worker runs a (dynamic) set of tasks in a set of threads, doing the work of actually moving data to/from Kafka ..." */ -Worker worker = new Worker(bootstrapServer, time, plugins, config, new FileOffsetBackingStore()); +Worker worker = new Worker(bootstrapServer, time, plugins, config, new FileOffsetBackingStore(), allConnectorClientConfigOverridePolicy); /* From Kafka source code: " ... The herder interface tracks and manages workers and connectors ..." */ -herder = new StandaloneHerder(worker, kafkaClusterId); +herder = new StandaloneHerder(worker, kafkaClusterId, allConnectorClientConfigOverridePolicy); connect = new Connect(herder, rest); LOG.info("Finished initializing the worker"); }
[camel-kafka-connector] branch master updated (f1b3f80 -> 1b29b73)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from f1b3f80 Add integration test for Cassandra CQL (#64) new c5e48ad Minor naming and source checkstyle fixes. new 1b29b73 Kafka upgraded to version 2.3.1 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: .../apache/camel/kafkaconnector/converters/S3ObjectConverter.java | 2 +- .../apache/camel/kafkaconnector/converters/S3ObjectSerializer.java | 4 ++-- .../java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java | 4 ++-- .../test/java/org/apache/camel/kafkaconnector/DataFormatTest.java | 1 - parent/pom.xml | 2 +- .../kafkaconnector/services/kafkaconnect/KafkaConnectRunner.java | 7 +-- 6 files changed, 11 insertions(+), 9 deletions(-)
[camel-kafka-connector] 01/02: Minor naming and source checkstyle fixes.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit c5e48ad839c278f7e027d738c120af7d48cf2e17 Author: Andrea Tarocchi AuthorDate: Mon Dec 30 23:29:19 2019 +0100 Minor naming and source checkstyle fixes. --- .../org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java | 2 +- .../apache/camel/kafkaconnector/converters/S3ObjectSerializer.java| 4 ++-- .../java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java | 4 ++-- .../src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java b/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java index a74eb5d..b1ad0ac 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java @@ -28,7 +28,7 @@ public class S3ObjectConverter implements Converter { private final S3ObjectSerializer serializer = new S3ObjectSerializer(); @Override -public void configure(Map arg0, boolean arg1) { +public void configure(Map configs, boolean isKey) { } @Override diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java b/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java index b55579e..f4ceae5 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java @@ -45,8 +45,8 @@ public class S3ObjectSerializer implements Serializer { while ((nRead = is.read(byteArray, 0, byteArray.length)) != -1) { buffer.write(byteArray, 0, nRead); } -} catch (IOException e1) { -LOG.warn("I/O error while serializing data from topic {}: {}", topic, e1.getMessage(), e1); +} catch (IOException e) { +LOG.warn("I/O error while serializing data from topic {}: {}", topic, e.getMessage(), e); } return buffer.toByteArray(); diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index f2a8aa4..b8318db 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -193,8 +193,8 @@ public class CamelSourceTaskTest { } } while (poll == null && retries > 0); -assertTrue("Received messages are: "+poll.size()+", expected between 1 and 2.", poll.size() >= 1); -assertTrue("Received messages are: "+poll.size()+", expected between 1 and 2.", poll.size() <= 2); +assertTrue("Received messages are: " + poll.size() + ", expected between 1 and 2.", poll.size() >= 1); +assertTrue("Received messages are: " + poll.size() + ", expected between 1 and 2.", poll.size() <= 2); camelSourceTask.stop(); } diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java index 2830b47..a71b407 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java @@ -80,7 +80,6 @@ public class DataFormatTest { DefaultCamelContext dcc = new DefaultCamelContext(); CamelMainSupport cms = new CamelMainSupport(props, "direct://start", "log://test", null, "hl7", dcc); - HL7DataFormat hl7df = new HL7DataFormat(); hl7df.setValidate(false); dcc.getRegistry().bind("hl7", hl7df);
[camel-kafka-connector] branch master updated (14d9549 -> abdc9de)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 14d9549 Merge pull request #56 from orpiske/retain-containers-after-build add f8dc8db Convert the embeddable Kafka Connect runner to a JUnit rule add abdc9de Convert the embeddable Kafka Connect runner to a JUnit rule (#57) No new revisions were added by this update. Summary of changes: .../camel/kafkaconnector/AbstractKafkaTest.java| 11 +- .../apache/camel/kafkaconnector/ContainerUtil.java | 57 - .../apache/camel/kafkaconnector/TestCommon.java| 15 +-- .../kafkaconnector/clients/jms/JMSClient.java | 24 .../services/kafka/ContainerLocalKafkaService.java | 1 - .../services/kafka/KafkaService.java | 4 - .../DefaultKafkaConnectPropertyFactory.java| 6 +- .../kafkaconnect}/KafkaConnectPropertyFactory.java | 2 +- .../kafkaconnect}/KafkaConnectRunner.java | 114 +- .../kafkaconnect/KafkaConnectRunnerService.java| 132 + .../kafkaconnect/KafkaConnectService.java} | 20 ++-- .../sink/aws/sns/CamelSinkAWSSNSITCase.java| 40 +++ .../sink/aws/sqs/CamelAWSSQSPropertyFactory.java | 2 +- .../sink/aws/sqs/CamelSinkAWSSQSITCase.java| 33 ++ .../CamelSinkElasticSearchITCase.java | 26 ++-- .../sink/file/CamelSinkFileITCase.java | 25 ++-- .../sink/http/CamelSinkHTTPITCase.java | 18 +-- .../sink/jms/CamelSinkJMSITCase.java | 26 ++-- .../aws/kinesis/CamelSourceAWSKinesisITCase.java | 107 + .../source/aws/s3/CamelSourceAWSS3ITCase.java | 28 ++--- .../source/aws/sqs/CamelSourceAWSSQSITCase.java| 30 ++--- .../source/jms/CamelSourceJMSITCase.java | 54 ++--- .../source/timer/CamelSourceTimerITCase.java | 18 +-- 23 files changed, 414 insertions(+), 379 deletions(-) rename tests/src/test/java/org/apache/camel/kafkaconnector/{ => services/kafkaconnect}/DefaultKafkaConnectPropertyFactory.java (90%) copy tests/src/test/java/org/apache/camel/kafkaconnector/{ => services/kafkaconnect}/KafkaConnectPropertyFactory.java (95%) rename tests/src/test/java/org/apache/camel/kafkaconnector/{ => services/kafkaconnect}/KafkaConnectRunner.java (73%) create mode 100644 tests/src/test/java/org/apache/camel/kafkaconnector/services/kafkaconnect/KafkaConnectRunnerService.java rename tests/src/test/java/org/apache/camel/kafkaconnector/{KafkaConnectPropertyFactory.java => services/kafkaconnect/KafkaConnectService.java} (61%)
[camel] branch master updated (568f9a1 -> 67a917a)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 568f9a1 Merge pull request #3441 from fvaleri/bigxml-billboard-camel3 add a10282c CAMEL-14332: Camel route does not consider the value of ShutdownStrategy timeout. new 67a917a CAMEL-14332: Camel route does not consider the value of Shutdow… (#3442) 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: .../java/org/apache/camel/blueprint/BlueprintCamelContext.java | 7 --- 1 file changed, 7 deletions(-)
[camel] 01/01: CAMEL-14332: Camel route does not consider the value of Shutdow… (#3442)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 67a917aca5ae829dbab94690e2fbe4c0dd861b35 Merge: 568f9a1 a10282c Author: Andrea Tarocchi AuthorDate: Tue Dec 24 23:22:38 2019 +0100 CAMEL-14332: Camel route does not consider the value of Shutdow… (#3442) CAMEL-14332: Camel route does not consider the value of ShutdownStrat… .../java/org/apache/camel/blueprint/BlueprintCamelContext.java | 7 --- 1 file changed, 7 deletions(-)
[camel-kafka-connector] branch master updated (abdc9de -> 6df63a3)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from abdc9de Convert the embeddable Kafka Connect runner to a JUnit rule (#57) add 3a6f37e Relaxing condition to accomodate some timeout glitches, fix #55 new 6df63a3 Relaxing condition to accomodate some timeout glitches, fix #55 (#58) 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: .../test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel-kafka-connector] 01/01: Relaxing condition to accomodate some timeout glitches, fix #55 (#58)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 6df63a3bef4b529304478b1dbfef8bdd3b9bd06e Merge: abdc9de 3a6f37e Author: Andrea Tarocchi AuthorDate: Wed Dec 25 22:39:36 2019 +0100 Relaxing condition to accomodate some timeout glitches, fix #55 (#58) Relaxing condition to accomodate some timeout glitches, fix #55 .../test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel-kafka-connector] 01/01: Merge pull request #131 from apache/packaging-connectors
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 7c493de4273e3b33199603c084fef263b2f3e363 Merge: 2c78a0d 9f14f85 Author: Andrea Tarocchi AuthorDate: Mon Apr 20 21:44:00 2020 +0200 Merge pull request #131 from apache/packaging-connectors .../camel-activemq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-ws-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-wss-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-amqp-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-apns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-as2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-asterisk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-atmos-kafka-connector/src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-atom-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-avro-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-cw-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ddb-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-ec2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ecs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-eks-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-iam-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-kms-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-mq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-msk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-s3-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sdb-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ses-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sqs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-swf-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws2-cw-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ddb-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws2-ec2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ecs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-eks-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-iam-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-kms-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-mq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-msk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ses-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-sns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-sqs-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-bean-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-bonita-kafka-connector/src/main
[camel-kafka-connector] branch master updated (2c78a0d -> 7c493de)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 2c78a0d Camel-elasticsearch-rest must be provided. add 9f14f85 Packaging the connectors as zip and tar.gz new 7c493de Merge pull request #131 from apache/packaging-connectors 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-activemq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-ws-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-ahc-wss-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-amqp-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-apns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-as2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-asterisk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-atmos-kafka-connector/src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-atom-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-avro-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-cw-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ddb-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-ec2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ecs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-eks-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-iam-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-kms-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws-mq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-msk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-s3-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sdb-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-ses-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-sqs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws-swf-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws2-cw-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ddb-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../camel-aws2-ec2-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ecs-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-eks-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-iam-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-kms-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-mq-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-msk-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-ses-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-sns-kafka-connector/src/main/assembly/package.xml | 9 + .../camel-aws2-sqs-kafka-connector/src/main/assembly/package.xml | 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../src/main/assembly/package.xml| 9 + .../camel-bean-kafk
[camel-kafka-connector] branch master updated (e3b79bb -> 64a16e7)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from e3b79bb Update Jenkinsfile.jdk11 new ce68706 Added support for auto generate connectors from multiple camel components in the same jar, related to #15 new eae6c6d chore: regen. new 2de9987 Fixed github actions source check commands. new 64a16e7 Merge pull request #114 from valdar/autoGen The 281 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/master-pr-build.yml | 22 ++- .github/workflows/master-push-build.yml| 12 +- connectors/camel-activemq-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-ws-kafka-connector/pom.xml| 2 +- .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 connectors/camel-amqp-kafka-connector/pom.xml | 2 +- connectors/camel-apns-kafka-connector/pom.xml | 2 +- connectors/camel-as2-kafka-connector/pom.xml | 2 +- connectors/camel-asterisk-kafka-connector/pom.xml | 2 +- connectors/camel-atmos-kafka-connector/pom.xml | 2 +- .../pom.xml| 2 +- connectors/camel-atom-kafka-connector/pom.xml | 2 +- .../src/main/assembly/package.xml | 56 -- .../src/main/resources/META-INF/LICENSE.txt| 203 - .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 connectors/camel-avro-kafka-connector/pom.xml | 2 +- connectors/camel-aws-cw-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ddb-kafka-connector/pom.xml | 2 +- .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 connectors/camel-aws-ec2-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ecs-kafka-connector/pom.xml | 2 +- connectors/camel-aws-eks-kafka-connector/pom.xml | 2 +- connectors/camel-aws-iam-kafka-connector/pom.xml | 2 +- .../pom.xml| 6 +- .../src/main/assembly/package.xml | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../camel-aws-kinesis-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kms-kafka-connector/pom.xml | 2 +- .../camel-aws-lambda-kafka-connector/pom.xml | 2 +- connectors/camel-aws-mq-kafka-connector/pom.xml| 2 +- connectors/camel-aws-msk-kafka-connector/pom.xml | 2 +- connectors/camel-aws-s3-kafka-connector/pom.xml| 2 +- connectors/camel-aws-sdb-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ses-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sns-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sqs-kafka-connector/pom.xml | 2 +- connectors/camel-aws-swf-kafka-connector/pom.xml | 2 +- .../camel-aws-translate-kafka-connector/pom.xml| 2
[camel-kafka-connector] tag camel-kafka-connector-0.1.0 created (now 7fff238)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to tag camel-kafka-connector-0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at 7fff238 (commit) This tag includes the following new commits: new 7fff238 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 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.
[camel-kafka-connector] branch release0.1.0 updated (a2d46dc -> c22cbff)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch release0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. discard a2d46dc [maven-release-plugin] prepare for next development iteration discard 3a96b87 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 discard 41394d2 [maven-release-plugin] rollback the release of camel-kafka-connector-0.1.0 discard e0be8f5 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 discard 523d7b1 [maven-release-plugin] prepare for next development iteration discard 8a18583 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 add 7fff238 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 new c22cbff [maven-release-plugin] prepare for next development iteration 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 (a2d46dc) \ N -- N -- N refs/heads/release0.1.0 (c22cbff) 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-kafka-connector] 05/05: chore: fixed unused imports.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit c319e83c407f783cf4a36dfcb489263f5a01624a Author: Andrea Tarocchi AuthorDate: Tue Apr 28 23:17:42 2020 +0200 chore: fixed unused imports. --- .../test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java index 3688d76..2f32329 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java @@ -18,7 +18,6 @@ package org.apache.camel.kafkaconnector.utils; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import org.junit.jupiter.api.Test;
[camel-kafka-connector] branch master updated (2c3e418 -> c319e83)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 2c3e418 Merge pull request #160 from apache/docs-up new 94246b4 Resolved a maven warning and added SHA512 checksum generation. new 6291090 camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158 new 4ecc255 chore: connectors regen after fix 3158 new 905a6df Enabled unused import sourcecheck fix #156 new c319e83 chore: fixed unused imports. 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: .../src/main/resources/camel-checkstyle.xml| 4 +-- ...mel-kafka-connector-fix-dependencies.properties | 2 +- connectors/camel-sjms2-kafka-connector/pom.xml | 1 + .../camel/kafkaconnector/utils/TaskHelperTest.java | 1 - parent/pom.xml | 7 ++--- pom.xml| 31 ++ .../maven/CamelKafkaConnectorUpdateMojo.java | 4 +-- .../kafkaconnector/maven/utils/MavenUtils.java | 9 ++- 8 files changed, 49 insertions(+), 10 deletions(-)
[camel-kafka-connector] 03/05: chore: connectors regen after fix 3158
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 4ecc2558eba76ebe7f38dcff88355d166a1e73d5 Author: Andrea Tarocchi AuthorDate: Tue Apr 28 23:01:48 2020 +0200 chore: connectors regen after fix 3158 --- connectors/camel-sjms2-kafka-connector/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/connectors/camel-sjms2-kafka-connector/pom.xml b/connectors/camel-sjms2-kafka-connector/pom.xml index 57c7199..a62bb63 100644 --- a/connectors/camel-sjms2-kafka-connector/pom.xml +++ b/connectors/camel-sjms2-kafka-connector/pom.xml @@ -48,6 +48,7 @@ org.apache.activemq activemq-client + compile org.apache.camel.kafkaconnector
[camel-kafka-connector] 02/05: camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 62910905fdee9ab44fc53ff0dde38e875b1b66ba Author: Andrea Tarocchi AuthorDate: Tue Apr 28 23:01:04 2020 +0200 camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158 --- connectors/camel-kafka-connector-fix-dependencies.properties | 2 +- .../kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java | 4 ++-- .../org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java | 9 - 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties b/connectors/camel-kafka-connector-fix-dependencies.properties index a0c5d07..d5666ee 100644 --- a/connectors/camel-kafka-connector-fix-dependencies.properties +++ b/connectors/camel-kafka-connector-fix-dependencies.properties @@ -22,6 +22,6 @@ global=org.apache.camel.kafkaconnector:camel-kafka-connector # we add a default connection factory maven dependency (variables can be used as ${varname}) -camel-sjms2=org.apache.activemq:activemq-client +camel-sjms2=org.apache.activemq:activemq-client::compile exclude_camel-sjms2= additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616 diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java index ab15031..a5e7907 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java @@ -250,8 +250,8 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo boolean inGlobal = false; for (String gp : globalProps) { String camelGav = getMainDepGroupId() + ":" + getMainDepArtifactId(); -String camelSpringBootGav = project.getGroupId() + ":" + project.getArtifactId(); -if (gp.equals(camelGav) || gp.equals(camelSpringBootGav)) { +String camelKafkaConnectorGav = project.getGroupId() + ":" + project.getArtifactId(); +if (gp.equals(camelGav) || gp.equals(camelKafkaConnectorGav)) { inGlobal = true; break; } diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java index 7b999c2..c3aed14 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java @@ -190,7 +190,8 @@ public final class MavenUtils { String[] comps = dep.split("\\:"); String groupIdStr = comps[0]; String artifactIdStr = comps[1]; -String versionStr = comps.length > 2 ? comps[2] : null; +String versionStr = comps.length > 2 && !comps[2].isEmpty() ? comps[2] : null; +String scopeStr = comps.length > 3 ? comps[3] : null; Element groupId = pom.createElement("groupId"); groupId.setTextContent(groupIdStr); @@ -206,6 +207,12 @@ public final class MavenUtils { dependency.appendChild(version); } +if (scopeStr != null) { +Element scope = pom.createElement("scope"); +scope.setTextContent(scopeStr); +dependency.appendChild(scope); +} + } dependencies.appendChild(pom.createComment(generatedSectionStopMarker)); }
[camel-kafka-connector] 01/05: Resolved a maven warning and added SHA512 checksum generation.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 94246b414e755925086141e3743170b37123b7f3 Author: Andrea Tarocchi AuthorDate: Tue Apr 28 22:31:54 2020 +0200 Resolved a maven warning and added SHA512 checksum generation. --- parent/pom.xml | 7 --- pom.xml| 31 +++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f5e1e29..c930377 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2,9 +2,10 @@ 4.0.0 -org.apache -apache -21 +org.apache.camel.kafkaconnector +camel-kafka-connector-aggregator +0.2.0-SNAPSHOT +.. org.apache.camel.kafkaconnector diff --git a/pom.xml b/pom.xml index 6376b52..37402be 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ 3.0.0-M4 3.1.1 3.1.0 + 1.7 @@ -303,6 +304,36 @@ + +net.nicoulaj.maven.plugins +checksum-maven-plugin + ${maven-checksum-maven-plugin.version} + + +source-release-checksum + +files + + + + + +SHA-512 + +false + + + ${project.build.directory} + + ${project.artifactId}-${project.version}.jar + ${project.artifactId}-${project.version}-package.zip + ${project.artifactId}-${project.version}-package.tar* + + + +false + +
[camel-kafka-connector] 04/05: Enabled unused import sourcecheck fix #156
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 905a6dff3df6ca5337e11fc702fdcaa892965e6e Author: Andrea Tarocchi AuthorDate: Tue Apr 28 23:04:36 2020 +0200 Enabled unused import sourcecheck fix #156 --- buildingtools/src/main/resources/camel-checkstyle.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml index f699143..6e17b7d 100644 --- a/buildingtools/src/main/resources/camel-checkstyle.xml +++ b/buildingtools/src/main/resources/camel-checkstyle.xml @@ -143,9 +143,9 @@ lengths, if/try depths, etc... --> - +
[camel-kafka-connector] branch release0.1.0 created (now c22cbff)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch release0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at c22cbff [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[camel-kafka-connector] branch master updated (8629ba3 -> 11eafb9)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 8629ba3 Merge pull request #152 from apache/oscerd-patch-1 add 11eafb9 Fixed github action issue with never released builts. No new revisions were added by this update. Summary of changes: .github/workflows/master-pr-build.yml | 2 +- .github/workflows/master-push-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-kafka-connector] branch master updated (11eafb9 -> 8e7b7cd)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 11eafb9 Fixed github action issue with never released builts. new e9df138 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 new 8e7b7cd [maven-release-plugin] prepare for next development iteration 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: buildingtools/pom.xml | 2 +- connectors/camel-activemq-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-kafka-connector/pom.xml| 2 +- connectors/camel-ahc-ws-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-wss-kafka-connector/pom.xml| 2 +- connectors/camel-amqp-kafka-connector/pom.xml | 2 +- connectors/camel-apns-kafka-connector/pom.xml | 2 +- connectors/camel-as2-kafka-connector/pom.xml| 2 +- connectors/camel-asterisk-kafka-connector/pom.xml | 2 +- connectors/camel-atmos-kafka-connector/pom.xml | 2 +- connectors/camel-atmosphere-websocket-kafka-connector/pom.xml | 2 +- connectors/camel-atom-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-map-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-messaging-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-multimap-kafka-connector/pom.xml| 2 +- connectors/camel-atomix-queue-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-set-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-value-kafka-connector/pom.xml | 2 +- connectors/camel-avro-kafka-connector/pom.xml | 2 +- connectors/camel-aws-cw-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ddb-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ddbstream-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ec2-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ecs-kafka-connector/pom.xml| 2 +- connectors/camel-aws-eks-kafka-connector/pom.xml| 2 +- connectors/camel-aws-iam-kafka-connector/pom.xml| 2 +- connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kinesis-kafka-connector/pom.xml| 2 +- connectors/camel-aws-kms-kafka-connector/pom.xml| 2 +- connectors/camel-aws-lambda-kafka-connector/pom.xml | 2 +- connectors/camel-aws-mq-kafka-connector/pom.xml | 2 +- connectors/camel-aws-msk-kafka-connector/pom.xml| 2 +- connectors/camel-aws-s3-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sdb-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ses-kafka-connector/pom.xml| 2 +- connectors/camel-aws-sns-kafka-connector/pom.xml| 2 +- connectors/camel-aws-sqs-kafka-connector/pom.xml| 2 +- connectors/camel-aws-swf-kafka-connector/pom.xml| 2 +- connectors/camel-aws-translate-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-cw-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-ddb-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ddbstream-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ec2-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ecs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-eks-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-iam-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-kms-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-mq-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-msk-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ses-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sns-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sqs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-translate-kafka-connector/pom.xml | 2 +- connectors/camel-azure-blob-kafka-connector/pom.xml | 2 +- connectors/camel-azure-queue-kafka-connector/pom.xml| 2 +- connectors/camel-bean-kafka-connector/pom.xml | 2 +- connectors/camel-bean-validator-kaf
[camel-kafka-connector] branch master updated (44168cc -> 0f33098)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 44168cc Added Contributing documentation (beginning) new 522a6cb Preliminary conversion of the test code new 52a5465 Adjust the PluginPathHelper to return the plugin directories instead of the jar files new e96566b Add one additional parameter to prevent a ClassCastException error within Netty code new 0f33098 Merge pull request #138 from orpiske/fix-delegating-classpath-issues The 329 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: core/pom.xml | 1 - parent/pom.xml | 6 pom.xml| 2 +- tests/pom.xml | 33 + .../kafkaconnector/ConnectorPropertyFactory.java | 4 +-- .../camel/kafkaconnector/PluginPathHelper.java | 42 ++ .../services/kafka/EmbeddedKafkaService.java | 2 +- .../sink/aws/sns/CamelAWSSNSPropertyFactory.java | 10 +++--- .../sink/aws/sqs/CamelAWSSQSPropertyFactory.java | 10 +++--- .../cassandra/CamelCassandraPropertyFactory.java | 4 +-- .../CamelElasticSearchPropertyFactory.java | 2 +- .../ConnectRecordValueToMapTransformer.java| 2 +- .../sink/file/CamelFilePropertyFactory.java| 2 +- .../sink/http/CamelHTTPPropertyFactory.java| 2 +- .../sink/jms/CamelJMSPropertyFactory.java | 3 +- .../kinesis/CamelAWSKinesisPropertyFactory.java| 13 --- .../source/aws/s3/CamelAWSS3PropertyFactory.java | 8 ++--- .../source/aws/sqs/CamelAWSSQSPropertyFactory.java | 10 +++--- .../source/jms/CamelJMSPropertyFactory.java| 3 +- .../source/timer/CamelTimerPropertyFactory.java| 4 +-- tests/src/test/resources/log4j2.properties | 8 + 21 files changed, 106 insertions(+), 65 deletions(-)
[camel-kafka-connector] branch release0.1.0 created (now 8a18583)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch release0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at 8a18583 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 This branch includes the following new commits: new 8a18583 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 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.
[camel-kafka-connector] annotated tag camel-kafka-connector-0.1.0 created (now baeb453)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to annotated tag camel-kafka-connector-0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at baeb453 (tag) tagging 8a18583641b1a855d478460458efc292411f990f (commit) by Andrea Tarocchi on Thu Apr 23 02:03:00 2020 +0200 - Log - [maven-release-plugin] copy for tag camel-kafka-connector-0.1.0 --- No new revisions were added by this update.
[camel-kafka-connector] branch master updated: Moved from camel-core to camel-core-engine as a dependecnies. Removed unused dependencies.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new a9d6041 Moved from camel-core to camel-core-engine as a dependecnies. Removed unused dependencies. a9d6041 is described below commit a9d60411eb57edeaad6c72dee47bfc31cacb722f Author: Andrea Tarocchi AuthorDate: Wed Apr 22 23:45:50 2020 +0200 Moved from camel-core to camel-core-engine as a dependecnies. Removed unused dependencies. --- core/pom.xml | 19 ++- tests/pom.xml | 4 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 52574b2..e357192 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -37,12 +37,29 @@ org.apache.camel -camel-core +camel-core-engine org.apache.camel camel-main + +org.apache.camel +camel-seda + + +org.apache.camel +camel-direct + + +org.apache.camel +camel-timer + + +org.apache.camel +camel-log + + diff --git a/tests/pom.xml b/tests/pom.xml index 407f440..1068da2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -54,10 +54,6 @@ org.apache.camel -camel-telegram - - -org.apache.camel camel-cassandraql
[camel-kafka-connector] branch release0.1.0 updated (523d7b1 -> 3a96b87)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch release0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 523d7b1 [maven-release-plugin] prepare for next development iteration new e0be8f5 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 new 41394d2 [maven-release-plugin] rollback the release of camel-kafka-connector-0.1.0 new 3a96b87 [maven-release-plugin] prepare release camel-kafka-connector-0.1.0 The 3 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: buildingtools/pom.xml | 2 +- connectors/camel-activemq-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-kafka-connector/pom.xml| 2 +- connectors/camel-ahc-ws-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-wss-kafka-connector/pom.xml| 2 +- connectors/camel-amqp-kafka-connector/pom.xml | 2 +- connectors/camel-apns-kafka-connector/pom.xml | 2 +- connectors/camel-as2-kafka-connector/pom.xml| 2 +- connectors/camel-asterisk-kafka-connector/pom.xml | 2 +- connectors/camel-atmos-kafka-connector/pom.xml | 2 +- connectors/camel-atmosphere-websocket-kafka-connector/pom.xml | 2 +- connectors/camel-atom-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-map-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-messaging-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-multimap-kafka-connector/pom.xml| 2 +- connectors/camel-atomix-queue-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-set-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-value-kafka-connector/pom.xml | 2 +- connectors/camel-avro-kafka-connector/pom.xml | 2 +- connectors/camel-aws-cw-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ddb-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ddbstream-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ec2-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ecs-kafka-connector/pom.xml| 2 +- connectors/camel-aws-eks-kafka-connector/pom.xml| 2 +- connectors/camel-aws-iam-kafka-connector/pom.xml| 2 +- connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kinesis-kafka-connector/pom.xml| 2 +- connectors/camel-aws-kms-kafka-connector/pom.xml| 2 +- connectors/camel-aws-lambda-kafka-connector/pom.xml | 2 +- connectors/camel-aws-mq-kafka-connector/pom.xml | 2 +- connectors/camel-aws-msk-kafka-connector/pom.xml| 2 +- connectors/camel-aws-s3-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sdb-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ses-kafka-connector/pom.xml| 2 +- connectors/camel-aws-sns-kafka-connector/pom.xml| 2 +- connectors/camel-aws-sqs-kafka-connector/pom.xml| 2 +- connectors/camel-aws-swf-kafka-connector/pom.xml| 2 +- connectors/camel-aws-translate-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-cw-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-ddb-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ddbstream-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ec2-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ecs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-eks-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-iam-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-kms-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-mq-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-msk-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ses-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sns-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sqs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-translate-kafka-connector/pom.xml | 2 +- connectors/camel-azure-blob-kafka-connector/pom.xml | 2 +- connectors/camel-azure-queue-kafka-connector/pom.xml| 2 +- c
[camel-kafka-connector] annotated tag camel-kafka-connector-0.1.0 created (now b4d186f)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to annotated tag camel-kafka-connector-0.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at b4d186f (tag) tagging 3a96b871018edabc21d44aec0b231f55793f446f (commit) by Andrea Tarocchi on Thu Apr 23 08:52:00 2020 +0200 - Log - [maven-release-plugin] copy for tag camel-kafka-connector-0.1.0 --- No new revisions were added by this update.
[camel-kafka-connector] branch master updated: Added test on different component properties formats fix #132
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 74cffea Added test on different component properties formats fix #132 new fa66cd3 Merge pull request #187 from valdar/pathOptionsFix 74cffea is described below commit 74cffea7b3f8810a16acd2980ba995cc6b4405f7 Author: Andrea Tarocchi AuthorDate: Mon May 4 19:21:50 2020 +0200 Added test on different component properties formats fix #132 --- ...derTest.java => PropertiesNameFormatsTest.java} | 23 +- .../camel/kafkaconnector/PropertiesOrderTest.java | 3 ++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java similarity index 55% copy from core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java copy to core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java index 5402589..9b39e18 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java @@ -19,12 +19,18 @@ package org.apache.camel.kafkaconnector; import java.util.HashMap; import java.util.Map; +import org.apache.camel.Exchange; +import org.apache.camel.component.seda.BlockingQueueFactory; +import org.apache.camel.component.seda.SedaComponent; +import org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory; import org.junit.jupiter.api.Test; -public class PropertiesOrderTest { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class PropertiesNameFormatsTest { @Test -public void testOneOrder() { +public void testCamelCaseFormat() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); @@ -33,19 +39,26 @@ public class PropertiesOrderTest { CamelSourceTask camelsourceTask = new CamelSourceTask(); camelsourceTask.start(props); +BlockingQueueFactory sedaTestQueue = ((SedaComponent) camelsourceTask.getCms().getEndpoint("seda://test").getCamelContext().getComponent("seda")).getDefaultQueueFactory(); + assertEquals("org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory", sedaTestQueue.getClass().getName()); +assertEquals(1, ((TestBlockingQueueFactory)sedaTestQueue).getCounter()); camelsourceTask.stop(); } @Test -public void testOppositOrder() { +public void testDashSeparatedFormat() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); -props.put("camel.component.seda.defaultQueueFactory.counter", "1"); -props.put("camel.component.seda.defaultQueueFactory", "#class:org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory"); +props.put("camel.component.seda.default-queue-factory", "#class:org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory"); +props.put("camel.component.seda.default-queue-factory.counter", "1"); CamelSourceTask camelsourceTask = new CamelSourceTask(); camelsourceTask.start(props); +BlockingQueueFactory sedaTestQueue = ((SedaComponent) camelsourceTask.getCms().getEndpoint("seda://test").getCamelContext().getComponent("seda")).getDefaultQueueFactory(); + assertEquals("org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory", sedaTestQueue.getClass().getName()); +assertEquals(1, ((TestBlockingQueueFactory)sedaTestQueue).getCounter()); camelsourceTask.stop(); } } + diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java index 5402589..4d58be8 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java @@ -37,7 +37,7 @@ public class PropertiesOrderTest { } @Test -public void testOppositOrder() { +public void testOppositeOrder() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); @@ -49,3 +49,4 @@ public class PropertiesOrderTest { camelsourceTask.stop(); } } +
[camel-kafka-connector] branch master updated: Added gpg key for valdar.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new a791d05 Added gpg key for valdar. a791d05 is described below commit a791d0524831b3d75c84a6e74e975a53a4d0e68e Author: Andrea Tarocchi AuthorDate: Wed Apr 22 21:53:51 2020 +0200 Added gpg key for valdar. --- KEYS | 85 1 file changed, 85 insertions(+) diff --git a/KEYS b/KEYS index 5099276..98fc48c 100644 --- a/KEYS +++ b/KEYS @@ -1771,3 +1771,88 @@ Tv+k57x2/Dc9oRSo3kBtXeiXjTFHPgqNPCDyZyM601CZX6aqOAhvcztoPv4Xs39j Bq6lxl6uAA== =f/Ot -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2019-04-18 [SC] [expires: 2029-04-15] + 60C1443BDA990159A701A5D2EE5630CAB51A767C +uid [ultimate] Andrea Tarocchi (a.k.a. valdar) +uid [ultimate] Andrea Tarocchi (a.k.a. valdar) +sub rsa4096 2019-04-18 [E] [expires: 2029-04-15] + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFy4hzoBEADF40PFGiiuqO7sNoGOky7ELE02UW8NI9dy8haEruXI/H/THl4M +UcTSxyRTR0U9UwjLZ8IkP51mFujs6CQQJhbKSgowF5yUReyvBqyXVI21qRiwiUpF +BPs8YRgEa507TAWTFaNKna497vbFrLh4wiNwoLrwYHpfm07XSq49I2c7jjO9TUNh +wm28GepYzZYF1U1Eeal/013ySowiA3vIW5Tdq6VJKypJAq7BXAWbTcIq8TLHgRDR +z5WQLYTa0r9GfrCO5rD0hWL3Wqfk1b03xerDVQHxAOJXaeeDRLI5tqx9UJMBltU2 +dP0QTFv6p3qwz9kGeF/5WdjlU17qJ8ktlEl4abxomxtKCLkSRNGsOG6w2WQYREZr +Hdq9EzaJgvpn0a2bsVy68oq/RfJY34q8CGngQR3/E7n0qLg0IjkC01qsHKHIrbnz +/G7xOT+EoeETCLhx015wh33BiiPYU4GTjctPArCX+L1LCebzFTWsftriNsF2ouFP +CtHgdPbk/9FB+Cg6vLcye0/W+QWVoda7Ooen2+fZ6x4rdIwaoa29TYrd/d8CjVJs +DKpO7kSZ9If9y3bBlGE09t7Y1CN8u+mbydz6FFBoACcw+Xr7SMSW1ufcaj9ZU4em +VSbT/YvunjFayxqGo+pW2cSjnFlo6zKLgGVCO6aOpA/T51D0CSZ6pQqKjwARAQAB +tDNBbmRyZWEgVGFyb2NjaGkgKGEuay5hLiB2YWxkYXIpIDx2YWxkYXJAYXBhY2hl +Lm9yZz6JAlQEEwEIAD4WIQRgwUQ72pkBWacBpdLuVjDKtRp2fAUCXLiShAIbAwUJ +EswDAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRDuVjDKtRp2fHjLD/90JmLn +87lWuzx89DyIEm/VlxK2RJajpxG8/JR3xSryrSzNR2+/L5DKi/xXsM3zKhLjbPI5 +5yhO/l6k6i7yTcx0CsO/l/AAn/b2wgDqbL5po2ghkUYhSJhPhwNyVVZPCfv1MHmf +PDKfAcgptOXCl7mGGDmFoeGqIiPGiCgSIn9xeB/JY+WpeiQhiScrfZWGDU6r4NRS +3E0sLXSqsJkvhEwCqP1hL5pK5aVUURSsNOr027DNz94Njzgl56MbkOH0eWopM+RG +9CzjZnT0C9jBTvHpWSidoXmYjVA/XLHpeTppOhfJJcMWY36ECjHaPnZFIufC3jkH +7dzV97z3GS3W8snyFh7259Hq0PlgGU+u/LDBPz9058khdHpI6pqgEP2fYe8OQnp1 +cSPZx+q2fbLkBPecDiRmrem7Hzu3m9J7gRDCVfTXH3BRND095qPIJITbkPtBEtqN +Wt0300rDedrC6cVJ7gEREl8xi3JsRN8RY7eY/yjOBJzqm3++1BDmFaUbvleuXJUO +j3+xdf6vta/GPStX4hLDSUY9vpgNXfLbwDkMF3MBuO9KfQ6BkeWnMQQOD+aZR2t7 +5UCXIMDEFVbGYjspS75WJKsI7zND9FKu8YM9TCiDgWNYL76s0loB4MSXJn37/g5b +Wm51nCYauNOhdDgsDy3rfKwOS8UOMoeAWoCTXrQ7QW5kcmVhIFRhcm9jY2hpIChh +LmsuYS4gdmFsZGFyKSA8YW5kcmVhLnRhcm9jY2hpQGdtYWlsLmNvbT6JAlcEEwEI +AEECGwMFCRLMAwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQRgwUQ72pkBWacB +pdLuVjDKtRp2fAUCXOGyhQIZAQAKCRDuVjDKtRp2fAcqD/0bDJnBNbODI9MJ0Bhw +MFV3O8pZ/vQNy4ZTPkDBMCrIfeP5EqTL/pCDpzmIpXCEgYsbe0OEBGOmavDMVG29 +zIcHaGATbxgCrizwelBAVtHIb4zagoIhPWIjxSl9Clg/go0JruDRrvC+t7RfdY68 +quBfEcMcVoned6PMPSl3LbbRECtlbTgju5IifMXSUdH/IPxDGU/1/cDJwlSZ2wnU +d5LBkE+mdMj/kL1jkz4kB8jZfH0KEi1Nqflw/PoPeRhHE9uBomOegwuNPFp3jc5r +y5KbdbLnFPyRas5XsXrthvTOg+m2AHiF/BEdXw8VRYSrezzjKvnxThXiD+KME0Yc +nAoHhXPr0xR4nkpke5mRQo6EorbOY0nto/eHvUBmi2EXoIfodehB+GMOBxaSAwfK +GIG5ATAD4AVWFpYWzXXajGP7rfvnEyAallPNzPFdDQpHW17Y0yC68IGh+fNjeC2E +BWiVKLJHXWJCsoHxFkWDEBERKSLWN53d2FHxLCDX2Pl7VQzLCEpTWFhPXdxg2NKs +xk3yveYunOSMDoCH75OMQLzJyPOdd7h47cCa5Da/X7zV6W2Ro9ahhUEmoo/1pE8J +Xx94wk+ozOcweBhVIkat1+TH7dMJ+VnUXHOzpuXvoVPQNZuk3Mf76nJ4eGu78vEX +Kjvd9YMIhl9y4alCrwGlssDiRIkCVAQTAQgAPhYhBGDBRDvamQFZpwGl0u5WMMq1 +GnZ8BQJcuIc6AhsDBQkSzAMABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEO5W +MMq1GnZ8TYAQALsBX+R+wa6UJKXCEn6tfhJ2M4Elyj0+iQSrTk4NfcN8XrrJBa9p +wvuc2Bb1/NYQCZs3Gi5xGwMud+bsupi1CLn8wxaMcZl2QqTEIGjKIVMqD/YXmIw9 +ICr+8Cx0dnFB3BRgbeO9vIViBJk2Z8THhXt+RwQfsBdrRvSo0PWw8/o3iMiVphlv +O44k6/e+kCxFmWnOfDRTXGP8ctALWBRMWWwSExIHWpzMQ8f63gV2Wo7ILMDXkhQt +mz4GgLe9WSpSQFdnm0C9/o+3Ctt1Fywxu43p5rCZ1uKCcluQN18NFQE3ZiShgNk6 +TQ5DEeN4ujdaLqKtTsb5pvkzLNS6yXZW1Zc1wX3UZ2ar4DRxIBqLGva8bo3qdT64 +dxdbkOwyY2PvjKMEjXTVVch8D9sz7m4XZncHZ89dnQJw4h/D5Wb8r1PacrjHHwVT +lKsHjfjYYmBbXeDr5ZnJ2QLNglNmjPTAdXaR/Qabah+QQlRodFEqirhGj0Cokq5K +moBXNvUNoVR6qW/EWQL5PL+8VFeTClCAqGdi1X5mdh33ESjwiItwsn7CU3xEYDFk +c7sVMaM1batixC9pqcgD7cwVOXfjoVO92YLCOwamuMtM8g+BsaPBMF3asab50fiZ +9utItiavlTY+j+LYdFyHZq0e75NuXrwyYqFTcgpRgj06L4jkU18TxMV6uQINBFy4 +hzoBEACzRgUA2x1wCmxyEorJdrWZqhOtpg1pANavoEcIIRlpSvMKJrN7biF7N0Ws +fy68T0rOlNyDxrI42R8c8BBwau4yBODd9RzTJsD8lTsKdpMNfQXHvmzKm6heXLKr +hVdjKZSbgCWztAh6T//qHN0f9itlb9k6HmGp9L52jB6cCHdRmSv9Kcp4glryNe0O +dDoDvNz8aGvnnDmiYpeEFg6gJjLZUDJhkiPiSDyseFrfbm8iojpoyGXHgooOFHJc +Ei680WkEquYX5svApIqnUJPBUB9/vd7VVs4sLUtY8yEzhQcJnD0hf33g4H/dBQLM +0i54bJ7/iEGljH0g9SihU+7IodYnaZVYDObUNPBhe+8ExaJeHf+heVaJBn+NaGwx +B6adRZvXbFRlGLdlOy43ERCnv2pdV17MGri0p356nA0QqeOiFblymy+twrHbIttq +teU8hlh8xvLlTu4CmbVfpXCZM7L81aFpq11
[camel-kafka-connector] branch relase-0.2.0 created (now 633125d)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch relase-0.2.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at 633125d [maven-release-plugin] prepare release camel-kafka-connector-0.2.0 This branch includes the following new commits: new 633125d [maven-release-plugin] prepare release camel-kafka-connector-0.2.0 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.
[camel-kafka-connector] annotated tag camel-kafka-connector-0.2.0 created (now eb5dd8a)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to annotated tag camel-kafka-connector-0.2.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at eb5dd8a (tag) tagging 633125d5880fdcd9c0c8959c3c72342626fa3b71 (commit) by Andrea Tarocchi on Sun May 17 11:41:29 2020 +0200 - Log - [maven-release-plugin] copy for tag camel-kafka-connector-0.2.0 --- No new revisions were added by this update.
[camel-kafka-connector] branch master updated (d9fcbc5 -> 48b15cf)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from d9fcbc5 Merge pull request #213 from apache/Testcontainers-1.14.2 new f559af6 Fixed a problem where the same Exchange was used multiple times. new db0c4e3 Added a Burn In run script for tests/ module. new 66adc19 Added camel-syslog-kafka-connector fix #145 new 732c213 chore: doc regen. new 71d3073 Added itests for camel-syslog-kafka-connector fix #145 new 48b15cf Merge pull request #214 from valdar/syslogConnector The 431 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: .../pom.xml| 18 +-- .../src/main/assembly/package.xml | 0 .../docs/camel-syslog-kafka-sink-connector.adoc| 27 + .../docs/camel-syslog-kafka-source-connector.adoc | 27 + .../syslog/CamelSyslogSinkConnector.java} | 12 +- .../syslog/CamelSyslogSinkConnectorConfig.java}| 28 +++-- .../syslog/CamelSyslogSinkTask.java} | 21 ++-- .../syslog/CamelSyslogSourceConnector.java}| 11 +- .../syslog/CamelSyslogSourceConnectorConfig.java} | 30 +++-- .../syslog/CamelSyslogSourceTask.java} | 20 ++-- .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 connectors/pom.xml | 1 + .../apache/camel/kafkaconnector/CamelSinkTask.java | 4 +- docs/modules/ROOT/pages/connectors.adoc| 6 +- tests/pom.xml | 6 + .../camel/kafkaconnector/PluginPathHelper.java | 2 +- .../kafkaconnect/KafkaConnectEmbedded.java | 21 ++-- .../kafkaconnect/KafkaConnectRunnerService.java| 2 +- .../services/kafkaconnect/KafkaConnectService.java | 2 +- .../services/syslog/SyslogService.java | 62 ++ .../sink/aws/sqs/CamelSinkAWSSQSITCase.java| 2 +- .../sink/syslog/CamelSinkSyslogITCase.java | 88 ++ .../CamelSyslogPropertyFactory.java} | 31 ++--- .../aws/kinesis/CamelSourceAWSKinesisITCase.java | 2 +- .../source/syslog/CamelSourceSyslogITCase.java | 127 + .../CamelSyslogPropertyFactory.java} | 37 +++--- .../camel/kafkaconnector/utils/NetworkUtils.java | 82 + tests/src/test/resources/log4j2.properties | 2 +- {core => tests}/testBurnInRun.sh | 3 +- 30 files changed, 560 insertions(+), 114 deletions(-) copy connectors/{camel-sjms2-kafka-connector => camel-syslog-kafka-connector}/pom.xml (92%) copy connectors/{camel-zookeeper-master-kafka-connector => camel-syslog-kafka-connector}/src/main/assembly/package.xml (100%) create mode 100644 connectors/camel-syslog-kafka-connector/src/main/docs/camel-syslog-kafka-sink-connector.adoc create mode 100644 connectors/camel-syslog-kafka-connector/src/main/docs/camel-syslog-kafka-source-connector.adoc copy connectors/{camel-vm-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vm/CamelVmSinkConnector.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSinkConnector.java} (69%) copy connectors/{camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnector.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSinkConnectorConfig.java} (58%) copy connectors/{camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkTask.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSinkTask.java} (56%) copy connectors/{camel-vm-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vm/CamelVmSourceConnector.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSourceConnector.java} (73%) copy connectors/{camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnector.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSourceConnectorConfig.java} (57%) copy connectors/{camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceTask.java => camel-syslog-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/syslog/CamelSyslogSourceTask.java} (58%) copy {tooling/camel-kafka-connector-docs-maven-plugin => connectors/camel-syslog-kafka-connec
[camel-kafka-connector] branch master updated: Removed Thread.seep(...) in unit tests in order to avoid possible sources of flakiness fix #186
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 597b576 Removed Thread.seep(...) in unit tests in order to avoid possible sources of flakiness fix #186 new 1a65e00 Merge pull request #204 from valdar/flakeyTests 597b576 is described below commit 597b576d486c864816ce3d9d24be1fd28b5493ec Author: Andrea Tarocchi AuthorDate: Sun May 10 22:39:04 2020 +0200 Removed Thread.seep(...) in unit tests in order to avoid possible sources of flakiness fix #186 --- .../camel/kafkaconnector/CamelSourceTask.java | 2 + .../kafkaconnector/utils/CamelMainSupport.java | 2 +- .../camel/kafkaconnector/CamelSourceTaskTest.java | 178 + core/testBurnInRun.sh | 15 ++ 4 files changed, 96 insertions(+), 101 deletions(-) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java index ceecf94..c9123ed 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java @@ -154,6 +154,8 @@ public class CamelSourceTask extends SourceTask { } else { return records; } + + } @Override diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java index d84a41e..6d47e10 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java @@ -74,7 +74,7 @@ public class CamelMainSupport { camelMain.addMainListener(new CamelMainFinishedListener()); // reordering properties to place the one starting with "#class:" first -Map orderedProps = new LinkedHashMap<>(); +LinkedHashMap orderedProps = new LinkedHashMap<>(); props.keySet().stream() .filter(k -> props.get(k).startsWith("#class:")) .forEach(k -> orderedProps.put(k, props.get(k))); diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index 2934a3b..9c40d40 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -17,14 +17,12 @@ package org.apache.camel.kafkaconnector; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Stream; import org.apache.camel.ProducerTemplate; import org.apache.kafka.connect.data.Schema; -import org.apache.kafka.connect.header.Header; -import org.apache.kafka.connect.header.Headers; import org.apache.kafka.connect.source.SourceRecord; import org.junit.jupiter.api.Test; @@ -34,37 +32,27 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class CamelSourceTaskTest { -private static final String TIMER_URI = "timer:kafkaconnector?period=10=true=0"; - @Test -public void testSourcePolling() throws InterruptedException { +public void testSourcePolling() { Map props = new HashMap<>(); -props.put("camel.source.url", TIMER_URI); +props.put("camel.source.url", "direct:start"); props.put("topics", "mytopic"); CamelSourceTask camelSourceTask = new CamelSourceTask(); camelSourceTask.start(props); -Thread.sleep(11L); -List poll = camelSourceTask.poll(); -assertEquals(2, poll.size()); +final ProducerTemplate template = camelSourceTask.getCms().createProducerTemplate(); +template.sendBody("direct:start", "awesome!"); + +List poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); +assertEquals(1, poll.size()); assertEquals("mytopic", poll.get(0).topic()); -Headers headers = poll.get(0).headers(); -boolean containsHeader = false; -for (Iterator iterator = headers.iterator(); iterator.hasNext();) { -Header header = (Header)iterator.next(); -if (header.key().equalsIgnoreCase("CamelPropertyCamelTimerPeriod")) { -containsHeader = true; -break; -} -} camelSourceTask.stop(); -assertTrue(containsHeader); } @Test -public void testSourcePollingWithKey() throws InterruptedException { +public void testS
[camel-kafka-connector] 01/01: Merge pull request #206 from apache/camel-3.2.0
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 9cb3266625c9b75c177992129dbc52686b8c3620 Merge: 1a65e00 3a7cfe1 Author: Andrea Tarocchi AuthorDate: Mon May 11 14:53:02 2020 +0200 Merge pull request #206 from apache/camel-3.2.0 connectors/camel-activemq-kafka-connector/pom.xml | 12 + .../docs/camel-activemq-kafka-sink-connector.adoc | 29 +- .../camel-activemq-kafka-source-connector.adoc | 25 +- .../activemq/CamelActivemqSinkConnectorConfig.java | 68 +++-- .../CamelActivemqSourceConnectorConfig.java| 68 +++-- connectors/camel-ahc-kafka-connector/pom.xml | 12 + connectors/camel-ahc-ws-kafka-connector/pom.xml| 12 + connectors/camel-ahc-wss-kafka-connector/pom.xml | 12 + connectors/camel-amqp-kafka-connector/pom.xml | 12 + .../main/docs/camel-amqp-kafka-sink-connector.adoc | 29 +- .../docs/camel-amqp-kafka-source-connector.adoc| 25 +- .../amqp/CamelAmqpSinkConnectorConfig.java | 68 +++-- .../amqp/CamelAmqpSourceConnectorConfig.java | 68 +++-- connectors/camel-apns-kafka-connector/pom.xml | 12 + .../docs/camel-apns-kafka-source-connector.adoc| 4 +- .../apns/CamelApnsSourceConnectorConfig.java | 4 +- connectors/camel-as2-kafka-connector/pom.xml | 12 + .../docs/camel-as2-kafka-source-connector.adoc | 4 +- .../as2/CamelAs2SourceConnectorConfig.java | 4 +- connectors/camel-asterisk-kafka-connector/pom.xml | 12 + connectors/camel-atmos-kafka-connector/pom.xml | 12 + .../pom.xml| 12 + connectors/camel-atom-kafka-connector/pom.xml | 12 + .../docs/camel-atom-kafka-source-connector.adoc| 4 +- .../atom/CamelAtomSourceConnectorConfig.java | 4 +- .../camel-atomix-map-kafka-connector/pom.xml | 12 + .../camel-atomix-map-kafka-sink-connector.adoc | 15 +- .../camel-atomix-map-kafka-source-connector.adoc | 15 +- .../CamelAtomixmapSinkConnectorConfig.java | 46 +++- .../CamelAtomixmapSourceConnectorConfig.java | 46 +++- .../camel-atomix-messaging-kafka-connector/pom.xml | 12 + ...amel-atomix-messaging-kafka-sink-connector.adoc | 16 +- ...el-atomix-messaging-kafka-source-connector.adoc | 16 +- .../CamelAtomixmessagingSinkConnectorConfig.java | 50 +++- .../CamelAtomixmessagingSourceConnectorConfig.java | 50 +++- .../camel-atomix-multimap-kafka-connector/pom.xml | 12 + ...camel-atomix-multimap-kafka-sink-connector.adoc | 15 +- .../CamelAtomixmultimapSinkConnectorConfig.java| 46 +++- .../camel-atomix-queue-kafka-connector/pom.xml | 12 + .../camel-atomix-queue-kafka-sink-connector.adoc | 13 +- .../camel-atomix-queue-kafka-source-connector.adoc | 13 +- .../CamelAtomixqueueSinkConnectorConfig.java | 38 ++- .../CamelAtomixqueueSourceConnectorConfig.java | 38 ++- .../camel-atomix-set-kafka-connector/pom.xml | 12 + .../camel-atomix-set-kafka-sink-connector.adoc | 14 +- .../camel-atomix-set-kafka-source-connector.adoc | 14 +- .../CamelAtomixsetSinkConnectorConfig.java | 42 ++- .../CamelAtomixsetSourceConnectorConfig.java | 42 ++- .../camel-atomix-value-kafka-connector/pom.xml | 12 + .../camel-atomix-value-kafka-sink-connector.adoc | 14 +- .../camel-atomix-value-kafka-source-connector.adoc | 14 +- .../CamelAtomixvalueSinkConnectorConfig.java | 42 ++- .../CamelAtomixvalueSourceConnectorConfig.java | 42 ++- connectors/camel-avro-kafka-connector/pom.xml | 12 + .../main/docs/camel-avro-kafka-sink-connector.adoc | 8 +- .../docs/camel-avro-kafka-source-connector.adoc| 8 +- .../avro/CamelAvroSinkConnectorConfig.java | 24 ++ .../avro/CamelAvroSourceConnectorConfig.java | 24 ++ connectors/camel-aws-cw-kafka-connector/pom.xml| 12 + .../docs/camel-aws-cw-kafka-sink-connector.adoc| 18 +- .../awscw/CamelAwscwSinkConnectorConfig.java | 58 +++- connectors/camel-aws-ddb-kafka-connector/pom.xml | 12 + .../docs/camel-aws-ddb-kafka-sink-connector.adoc | 18 +- .../awsddb/CamelAwsddbSinkConnectorConfig.java | 64 - .../camel-aws-ddbstream-kafka-connector/pom.xml| 12 + ...camel-aws-ddbstream-kafka-source-connector.adoc | 21 +- .../CamelAwsddbstreamSourceConnectorConfig.java| 58 ++-- connectors/camel-aws-ec2-kafka-connector/pom.xml | 12 + .../docs/camel-aws-ec2-kafka-sink-connector.adoc | 13 +- .../awsec2/CamelAwsec2SinkConnectorConfig.java | 32 ++- connectors/camel-aws-ecs-kafka-connector/pom.xml | 12 + .../docs/camel-aws-ecs-kafka-sink-connector.adoc | 11 +- .../awsecs/CamelAwsecsSinkConnectorConfig.java | 30 ++- connectors/camel-aws-eks-kafka-connector/pom.xml | 12 + .../docs/camel-aws-eks-kafka-sink-connector.adoc | 11 +- .../awseks
[camel-kafka-connector] branch master updated (1a65e00 -> 9cb3266)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 1a65e00 Merge pull request #204 from valdar/flakeyTests add 3a7cfe1 Bump to Camel 3.2.0 new 9cb3266 Merge pull request #206 from apache/camel-3.2.0 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: connectors/camel-activemq-kafka-connector/pom.xml | 12 + .../docs/camel-activemq-kafka-sink-connector.adoc | 29 +- .../camel-activemq-kafka-source-connector.adoc | 25 +- .../activemq/CamelActivemqSinkConnectorConfig.java | 68 +++-- .../CamelActivemqSourceConnectorConfig.java| 68 +++-- connectors/camel-ahc-kafka-connector/pom.xml | 12 + connectors/camel-ahc-ws-kafka-connector/pom.xml| 12 + connectors/camel-ahc-wss-kafka-connector/pom.xml | 12 + connectors/camel-amqp-kafka-connector/pom.xml | 12 + .../main/docs/camel-amqp-kafka-sink-connector.adoc | 29 +- .../docs/camel-amqp-kafka-source-connector.adoc| 25 +- .../amqp/CamelAmqpSinkConnectorConfig.java | 68 +++-- .../amqp/CamelAmqpSourceConnectorConfig.java | 68 +++-- connectors/camel-apns-kafka-connector/pom.xml | 12 + .../docs/camel-apns-kafka-source-connector.adoc| 4 +- .../apns/CamelApnsSourceConnectorConfig.java | 4 +- connectors/camel-as2-kafka-connector/pom.xml | 12 + .../docs/camel-as2-kafka-source-connector.adoc | 4 +- .../as2/CamelAs2SourceConnectorConfig.java | 4 +- connectors/camel-asterisk-kafka-connector/pom.xml | 12 + connectors/camel-atmos-kafka-connector/pom.xml | 12 + .../pom.xml| 12 + connectors/camel-atom-kafka-connector/pom.xml | 12 + .../docs/camel-atom-kafka-source-connector.adoc| 4 +- .../atom/CamelAtomSourceConnectorConfig.java | 4 +- .../camel-atomix-map-kafka-connector/pom.xml | 12 + .../camel-atomix-map-kafka-sink-connector.adoc | 15 +- .../camel-atomix-map-kafka-source-connector.adoc | 15 +- .../CamelAtomixmapSinkConnectorConfig.java | 46 +++- .../CamelAtomixmapSourceConnectorConfig.java | 46 +++- .../camel-atomix-messaging-kafka-connector/pom.xml | 12 + ...amel-atomix-messaging-kafka-sink-connector.adoc | 16 +- ...el-atomix-messaging-kafka-source-connector.adoc | 16 +- .../CamelAtomixmessagingSinkConnectorConfig.java | 50 +++- .../CamelAtomixmessagingSourceConnectorConfig.java | 50 +++- .../camel-atomix-multimap-kafka-connector/pom.xml | 12 + ...camel-atomix-multimap-kafka-sink-connector.adoc | 15 +- .../CamelAtomixmultimapSinkConnectorConfig.java| 46 +++- .../camel-atomix-queue-kafka-connector/pom.xml | 12 + .../camel-atomix-queue-kafka-sink-connector.adoc | 13 +- .../camel-atomix-queue-kafka-source-connector.adoc | 13 +- .../CamelAtomixqueueSinkConnectorConfig.java | 38 ++- .../CamelAtomixqueueSourceConnectorConfig.java | 38 ++- .../camel-atomix-set-kafka-connector/pom.xml | 12 + .../camel-atomix-set-kafka-sink-connector.adoc | 14 +- .../camel-atomix-set-kafka-source-connector.adoc | 14 +- .../CamelAtomixsetSinkConnectorConfig.java | 42 ++- .../CamelAtomixsetSourceConnectorConfig.java | 42 ++- .../camel-atomix-value-kafka-connector/pom.xml | 12 + .../camel-atomix-value-kafka-sink-connector.adoc | 14 +- .../camel-atomix-value-kafka-source-connector.adoc | 14 +- .../CamelAtomixvalueSinkConnectorConfig.java | 42 ++- .../CamelAtomixvalueSourceConnectorConfig.java | 42 ++- connectors/camel-avro-kafka-connector/pom.xml | 12 + .../main/docs/camel-avro-kafka-sink-connector.adoc | 8 +- .../docs/camel-avro-kafka-source-connector.adoc| 8 +- .../avro/CamelAvroSinkConnectorConfig.java | 24 ++ .../avro/CamelAvroSourceConnectorConfig.java | 24 ++ connectors/camel-aws-cw-kafka-connector/pom.xml| 12 + .../docs/camel-aws-cw-kafka-sink-connector.adoc| 18 +- .../awscw/CamelAwscwSinkConnectorConfig.java | 58 +++- connectors/camel-aws-ddb-kafka-connector/pom.xml | 12 + .../docs/camel-aws-ddb-kafka-sink-connector.adoc | 18 +- .../awsddb/CamelAwsddbSinkConnectorConfig.java | 64 - .../camel-aws-ddbstream-kafka-connector/pom.xml| 12 + ...camel-aws-ddbstream-kafka-source-connector.adoc | 21 +- .../CamelAwsddbstreamSourceConnectorConfig.java| 58 ++-- connectors/camel-aws-ec2-kafka-connector/pom.xml | 12 + .../docs/camel-aws-ec2-kafka-sink-connector.adoc | 13 +- .../awsec2/CamelAwsec2SinkConnectorConfig.java | 32 ++- connectors/camel-aws-ecs-kafka-connector/pom.xml | 12 + .../docs/came
[camel-kafka-connector] branch master updated: Improved CamelSourceTaskTest
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 49aa5e8 Improved CamelSourceTaskTest new 5593ea7 Merge pull request #205 from fvaleri/no-flaky 49aa5e8 is described below commit 49aa5e8cba11a49c9fa57f4dc1a3639e9a2c0e29 Author: Federico Valeri AuthorDate: Sat May 9 21:06:28 2020 +0200 Improved CamelSourceTaskTest --- .../camel/kafkaconnector/CamelSourceTaskTest.java | 365 ++--- 1 file changed, 165 insertions(+), 200 deletions(-) diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index 9c40d40..33807ee 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -19,7 +19,6 @@ package org.apache.camel.kafkaconnector; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Stream; import org.apache.camel.ProducerTemplate; import org.apache.kafka.connect.data.Schema; @@ -32,270 +31,236 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class CamelSourceTaskTest { +private static final String DIRECT_URI = "direct:start"; +private static final String TOPIC_NAME = "my-topic"; + +private void sendBatchOfRecords(CamelSourceTask sourceTask, long size) { +final ProducerTemplate template = sourceTask.getCms().createProducerTemplate(); +for (int i = 0; i < size; i++) { +template.sendBody(DIRECT_URI, "test" + i); +} +} + @Test public void testSourcePolling() { +final long size = 2; Map props = new HashMap<>(); -props.put("camel.source.url", "direct:start"); -props.put("topics", "mytopic"); +props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME); +props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI); -CamelSourceTask camelSourceTask = new CamelSourceTask(); -camelSourceTask.start(props); +CamelSourceTask sourceTask = new CamelSourceTask(); +sourceTask.start(props); -final ProducerTemplate template = camelSourceTask.getCms().createProducerTemplate(); -template.sendBody("direct:start", "awesome!"); +sendBatchOfRecords(sourceTask, size); +List poll = sourceTask.poll(); -List poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); -assertEquals(1, poll.size()); -assertEquals("mytopic", poll.get(0).topic()); +assertEquals(size, poll.size()); +assertEquals(TOPIC_NAME, poll.get(0).topic()); -camelSourceTask.stop(); +sourceTask.stop(); } @Test -public void testSourcePollingWithKey() { +public void testSourcePollingMaxBatchPollSize() { +final long size = 2; Map props = new HashMap<>(); -props.put("camel.source.url", "direct:start"); -props.put("topics", "mytopic"); - props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MESSAGE_HEADER_KEY_CONF, "CamelSpecialTestKey"); - -CamelSourceTask camelSourceTask = new CamelSourceTask(); -camelSourceTask.start(props); - -final ProducerTemplate template = camelSourceTask.getCms().createProducerTemplate(); - -// first we test if we have a key in the message with body -template.sendBodyAndHeader("direct:start", "awesome!", "CamelSpecialTestKey", 1234); - -List poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); -assertEquals(1, poll.size()); -assertEquals(1234, poll.get(0).key()); -assertEquals(Schema.Type.INT32, poll.get(0).keySchema().type()); - -// second we test if we have no key under the header -template.sendBodyAndHeader("direct:start", "awesome!", "WrongHeader", 1234); - -poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); -assertEquals(1, poll.size()); -assertNull(poll.get(0).key()); -assertNull(poll.get(0).keySchema()); - -// third we test if we have the header but with null value -template.sendBodyAndHeader("direct:start", "awesome!", "CamelSpecialTestKey", null); +props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME); +props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI); + props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_CONF, Stri
[camel-kafka-connector] branch master updated (48b15cf -> 6bd4309)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 48b15cf Merge pull request #214 from valdar/syslogConnector add 633125d [maven-release-plugin] prepare release camel-kafka-connector-0.2.0 add 6bd4309 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: buildingtools/pom.xml | 2 +- connectors/camel-activemq-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-ws-kafka-connector/pom.xml | 2 +- connectors/camel-ahc-wss-kafka-connector/pom.xml | 2 +- connectors/camel-amqp-kafka-connector/pom.xml | 2 +- connectors/camel-apns-kafka-connector/pom.xml | 2 +- connectors/camel-as2-kafka-connector/pom.xml | 2 +- connectors/camel-asterisk-kafka-connector/pom.xml | 2 +- connectors/camel-atmos-kafka-connector/pom.xml| 2 +- connectors/camel-atmosphere-websocket-kafka-connector/pom.xml | 2 +- connectors/camel-atom-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-map-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-messaging-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-multimap-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-queue-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-set-kafka-connector/pom.xml | 2 +- connectors/camel-atomix-value-kafka-connector/pom.xml | 2 +- connectors/camel-avro-kafka-connector/pom.xml | 2 +- connectors/camel-aws-cw-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ddb-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ddbstream-kafka-connector/pom.xml| 2 +- connectors/camel-aws-ec2-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ecs-kafka-connector/pom.xml | 2 +- connectors/camel-aws-eks-kafka-connector/pom.xml | 2 +- connectors/camel-aws-iam-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kinesis-firehose-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kinesis-kafka-connector/pom.xml | 2 +- connectors/camel-aws-kms-kafka-connector/pom.xml | 2 +- connectors/camel-aws-lambda-kafka-connector/pom.xml | 2 +- connectors/camel-aws-mq-kafka-connector/pom.xml | 2 +- connectors/camel-aws-msk-kafka-connector/pom.xml | 2 +- connectors/camel-aws-s3-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sdb-kafka-connector/pom.xml | 2 +- connectors/camel-aws-ses-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sns-kafka-connector/pom.xml | 2 +- connectors/camel-aws-sqs-kafka-connector/pom.xml | 2 +- connectors/camel-aws-swf-kafka-connector/pom.xml | 2 +- connectors/camel-aws-translate-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-cw-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ddb-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ddbstream-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ec2-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ecs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-eks-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-iam-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-kinesis-firehose-kafka-connector/pom.xml| 2 +- connectors/camel-aws2-kinesis-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-kms-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-lambda-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-mq-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-msk-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-s3-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-ses-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sns-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-sqs-kafka-connector/pom.xml | 2 +- connectors/camel-aws2-translate-kafka-connector/pom.xml | 2 +- connectors/camel-azure-blob-kafka-connector/pom.xml
[camel-kafka-connector] branch master updated: chore: rename poorly named variable in test code
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 4b96891 chore: rename poorly named variable in test code 4b96891 is described below commit 4b968918b963cdc9c1c0308c9848402be2d34fcd Author: Otavio Rodolfo Piske AuthorDate: Mon May 11 16:17:50 2020 +0200 chore: rename poorly named variable in test code --- .../apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java b/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java index 221384d..ecab0db 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java @@ -25,8 +25,8 @@ public abstract class SourceConnectorPropertyFactory
[camel-kafka-connector] branch master updated (9cb3266 -> 8e60b91)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 9cb3266 Merge pull request #206 from apache/camel-3.2.0 add 8e60b91 Re-enable Cassandra test using properties No new revisions were added by this update. Summary of changes: .../kafkaconnector/clients/cassandra/dao/TestDataDao.java| 9 + .../sink/cassandra/CamelSinkCassandraITCase.java | 12 ++-- 2 files changed, 19 insertions(+), 2 deletions(-)
[camel-kafka-connector] branch master updated (c036453 -> f23480c)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from c036453 Merge pull request #110 from apache/junit-5.6.1 add b9a5976 Pointing to ASF Snapshot and use the apache Parent new f23480c Merge pull request #111 from apache/asf-stuff 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: parent/pom.xml | 67 -- 1 file changed, 18 insertions(+), 49 deletions(-)
[camel-kafka-connector] 01/01: Merge pull request #111 from apache/asf-stuff
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit f23480c8d93c0e1cb98a073673e5c8649e914776 Merge: c036453 b9a5976 Author: Andrea Tarocchi AuthorDate: Mon Mar 23 18:36:36 2020 +0100 Merge pull request #111 from apache/asf-stuff Pointing to ASF Snapshot and use the apache Parent parent/pom.xml | 67 -- 1 file changed, 18 insertions(+), 49 deletions(-)
[camel-kafka-connector] 02/03: Ordered the component list by name in order to change only if components are added or removed.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit a54fa694def3b88fce03f7ef244379990090b32d Author: Andrea Tarocchi AuthorDate: Fri May 8 23:31:40 2020 +0200 Ordered the component list by name in order to change only if components are added or removed. --- .../maven/docs/UpdateDocComponentsListMojo.java| 22 -- .../docs/dto/CamelKafkaConnectorTableModel.java| 8 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java index 183cf87..b821027 100644 --- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java +++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.List; import org.apache.camel.kafkaconnector.maven.docs.dto.CamelKafkaConnectorTableModel; import org.apache.camel.kafkaconnector.maven.docs.dto.CamelKafkaConnectorTableOptionModel; @@ -49,6 +48,9 @@ import static org.apache.camel.tooling.util.PackageHelper.writeText; */ @Mojo(name = "update-doc-connectors-list", threadSafe = true) public class UpdateDocComponentsListMojo extends AbstractMojo { +private static final String SINK_CONNECTOR_LINK_SUFFIX_ADOC = "kafka-sink-connector.adoc[Sink Docs]"; +private static final String SOURCE_CONNECTOR_LINK_SUFFIX_ADOC = "kafka-source-connector.adoc[Source Docs]"; +private static final String XREF_CONNECTOR_LINK_PREFIX = "xref:connectors/"; /** * The maven project. @@ -73,10 +75,6 @@ public class UpdateDocComponentsListMojo extends AbstractMojo { */ @Component private MavenProjectHelper projectHelper; - -private final String SINK_CONNECTOR_LINK_SUFFIX_ADOC = "kafka-sink-connector.adoc[Sink Docs]"; -private final String SOURCE_CONNECTOR_LINK_SUFFIX_ADOC = "kafka-source-connector.adoc[Source Docs]"; -private final String XREF_CONNECTOR_LINK_PREFIX = "xref:connectors/"; /** * Execute goal. @@ -92,7 +90,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo { protected void executeComponentsReadme() throws MojoExecutionException, MojoFailureException { CamelKafkaConnectorTableModel tableModel = new CamelKafkaConnectorTableModel(); -List options = new ArrayList(); +ArrayList options = new ArrayList(); if (connectorsDir != null && connectorsDir.isDirectory()) { File[] files = connectorsDir.listFiles(); @@ -110,8 +108,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo { String connectorFinal = StringUtils.removeEnd(file.getName(), "kafka-connector"); if (connectorFinal.equalsIgnoreCase("camel-coap-tcp-")) { singleConnector.setDocsSink("xref:connectors/camel-coap+tcp-kafka-sink-connector.adoc[Sink Docs]"); -} -else if (connectorFinal.equalsIgnoreCase("camel-coaps-tcp-")) { +} else if (connectorFinal.equalsIgnoreCase("camel-coaps-tcp-")) { singleConnector.setDocsSink("xref:connectors/camel-coaps+tcp-kafka-sink-connector.adoc[Sink Docs]"); } else if (connectorFinal.equalsIgnoreCase("camel-solrcloud-")) { singleConnector.setDocsSink("xref:connectors/camel-solrCloud-kafka-sink-connector.adoc[Sink Docs]"); @@ -124,8 +121,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo { String connectorFinal = StringUtils.removeEnd(file.getName(), "kafka-connector"); if (connectorFinal.equalsIgnoreCase("camel-coap-tcp-")) { singleConnector.setDocsSource("xref:connectors/camel-coap+tcp-kafka-source-connector.adoc[Source Docs]"); -} -else if (connectorFinal.equalsIgnoreCase("camel-coaps-tcp-")) { +} else if
[camel-kafka-connector] branch master updated (f52aff2 -> 0f3193a)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from f52aff2 Fixed nav with basic concepts new b39ea20 Attempt to remove some Thread.sleep() in tests see #186 new a54fa69 Ordered the component list by name in order to change only if components are added or removed. new 0f3193a chore: regen doc. The 3 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/kafkaconnector/CamelSourceTaskTest.java | 69 --- .../camel/kafkaconnector/utils/TaskHelperTest.java | 14 ++-- docs/modules/ROOT/pages/connectors.adoc| 80 +++--- .../maven/docs/UpdateDocComponentsListMojo.java| 22 +++--- .../docs/dto/CamelKafkaConnectorTableModel.java| 8 +-- 5 files changed, 92 insertions(+), 101 deletions(-)
[camel-kafka-connector] 01/03: Attempt to remove some Thread.sleep() in tests see #186
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit b39ea20ffac05ac237d8a39fd8af91f1f5df0986 Author: Andrea Tarocchi AuthorDate: Fri May 8 23:30:16 2020 +0200 Attempt to remove some Thread.sleep() in tests see #186 --- .../camel/kafkaconnector/CamelSourceTaskTest.java | 69 +- .../camel/kafkaconnector/utils/TaskHelperTest.java | 14 ++--- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index 2f02d68..2934a3b 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; public class CamelSourceTaskTest { @@ -79,9 +78,7 @@ public class CamelSourceTaskTest { // first we test if we have a key in the message with body template.sendBodyAndHeader("direct:start", "awesome!", "CamelSpecialTestKey", 1234); -Thread.sleep(11L); - -List poll = camelSourceTask.poll(); +List poll = camelSourceTaskPollWithRetries(camelSourceTask, 3); assertEquals(1, poll.size()); assertEquals(1234, poll.get(0).key()); assertEquals(Schema.Type.INT32, poll.get(0).keySchema().type()); @@ -89,9 +86,7 @@ public class CamelSourceTaskTest { // second we test if we have no key under the header template.sendBodyAndHeader("direct:start", "awesome!", "WrongHeader", 1234); -Thread.sleep(11L); - -poll = camelSourceTask.poll(); +poll = camelSourceTaskPollWithRetries(camelSourceTask, 3); assertEquals(1, poll.size()); assertNull(poll.get(0).key()); assertNull(poll.get(0).keySchema()); @@ -99,9 +94,7 @@ public class CamelSourceTaskTest { // third we test if we have the header but with null value template.sendBodyAndHeader("direct:start", "awesome!", "CamelSpecialTestKey", null); -Thread.sleep(10L); - -camelSourceTask.poll(); +poll = camelSourceTaskPollWithRetries(camelSourceTask, 3); assertEquals(1, poll.size()); assertNull(poll.get(0).key()); assertNull(poll.get(0).keySchema()); @@ -123,9 +116,7 @@ public class CamelSourceTaskTest { // send first data template.sendBody("direct:start", "testing kafka connect"); -Thread.sleep(11L); - -List poll = camelSourceTask.poll(); +List poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); assertEquals(1, poll.size()); assertEquals("testing kafka connect", poll.get(0).value()); assertEquals(Schema.Type.STRING, poll.get(0).valueSchema().type()); @@ -135,9 +126,7 @@ public class CamelSourceTaskTest { // send second data template.sendBody("direct:start", true); -Thread.sleep(11L); - -poll = camelSourceTask.poll(); +poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); assertEquals(1, poll.size()); assertTrue((boolean)poll.get(0).value()); assertEquals(Schema.Type.BOOLEAN, poll.get(0).valueSchema().type()); @@ -147,9 +136,7 @@ public class CamelSourceTaskTest { // second third data template.sendBody("direct:start", 1234L); -Thread.sleep(10L); - -poll = camelSourceTask.poll(); +poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); assertEquals(1, poll.size()); assertEquals(1234L, poll.get(0).value()); assertEquals(Schema.Type.INT64, poll.get(0).valueSchema().type()); @@ -159,8 +146,7 @@ public class CamelSourceTaskTest { // third with null data template.sendBody("direct:start", null); -Thread.sleep(10L); -poll = camelSourceTask.poll(); +poll = camelSourceTaskPollWithRetries(camelSourceTask, 5); assertNull(poll.get(0).key()); assertNull(poll.get(0).keySchema()); assertNull(poll.get(0).value()); @@ -179,26 +165,14 @@ public class CamelSourceTaskTest { CamelSourceTask camelSourceTask = new CamelSourceTask(); camelSourceTask.start(props); -long sleepTime = 30L; -Thread.sleep(sleepTime); -List poll; -int retries = 3; -do { -poll = camelSourceTask.poll(); -
[camel-kafka-connector] 03/03: chore: regen doc.
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 0f3193adc8785c7f5bb1d623b4966ec111c2312d Author: Andrea Tarocchi AuthorDate: Fri May 8 23:44:58 2020 +0200 chore: regen doc. --- docs/modules/ROOT/pages/connectors.adoc | 80 - 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc index da28c1f..616b859 100644 --- a/docs/modules/ROOT/pages/connectors.adoc +++ b/docs/modules/ROOT/pages/connectors.adoc @@ -32,8 +32,8 @@ Number of Camel Kafka connectors: 344 | *camel-aws-ecs-kafka-connector* | true | false | xref:connectors/camel-aws-ecs-kafka-sink-connector.adoc[Sink Docs] | | *camel-aws-eks-kafka-connector* | true | false | xref:connectors/camel-aws-eks-kafka-sink-connector.adoc[Sink Docs] | | *camel-aws-iam-kafka-connector* | true | false | xref:connectors/camel-aws-iam-kafka-sink-connector.adoc[Sink Docs] | -| *camel-aws-kinesis-kafka-connector* | true | true | xref:connectors/camel-aws-kinesis-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-kinesis-kafka-source-connector.adoc[Source Docs] | *camel-aws-kinesis-firehose-kafka-connector* | true | false | xref:connectors/camel-aws-kinesis-firehose-kafka-sink-connector.adoc[Sink Docs] | +| *camel-aws-kinesis-kafka-connector* | true | true | xref:connectors/camel-aws-kinesis-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-kinesis-kafka-source-connector.adoc[Source Docs] | *camel-aws-kms-kafka-connector* | true | false | xref:connectors/camel-aws-kms-kafka-sink-connector.adoc[Sink Docs] | | *camel-aws-lambda-kafka-connector* | true | false | xref:connectors/camel-aws-lambda-kafka-sink-connector.adoc[Sink Docs] | | *camel-aws-mq-kafka-connector* | true | false | xref:connectors/camel-aws-mq-kafka-sink-connector.adoc[Sink Docs] | @@ -88,8 +88,8 @@ Number of Camel Kafka connectors: 344 | *camel-couchdb-kafka-connector* | true | true | xref:connectors/camel-couchdb-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-couchdb-kafka-source-connector.adoc[Source Docs] | *camel-cql-kafka-connector* | true | true | xref:connectors/camel-cql-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-cql-kafka-source-connector.adoc[Source Docs] | *camel-cron-kafka-connector* | false | true | | xref:connectors/camel-cron-kafka-source-connector.adoc[Source Docs] -| *camel-crypto-kafka-connector* | true | false | xref:connectors/camel-crypto-kafka-sink-connector.adoc[Sink Docs] | | *camel-crypto-cms-kafka-connector* | true | false | xref:connectors/camel-crypto-cms-kafka-sink-connector.adoc[Sink Docs] | +| *camel-crypto-kafka-connector* | true | false | xref:connectors/camel-crypto-kafka-sink-connector.adoc[Sink Docs] | | *camel-cxf-kafka-connector* | true | true | xref:connectors/camel-cxf-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-cxf-kafka-source-connector.adoc[Source Docs] | *camel-cxfrs-kafka-connector* | true | true | xref:connectors/camel-cxfrs-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-cxfrs-kafka-source-connector.adoc[Source Docs] | *camel-dataformat-kafka-connector* | true | false | xref:connectors/camel-dataformat-kafka-sink-connector.adoc[Sink Docs] | @@ -171,8 +171,8 @@ Number of Camel Kafka connectors: 344 | *camel-ignite-idgen-kafka-connector* | true | false | xref:connectors/camel-ignite-idgen-kafka-sink-connector.adoc[Sink Docs] | | *camel-ignite-messaging-kafka-connector* | true | true | xref:connectors/camel-ignite-messaging-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-ignite-messaging-kafka-source-connector.adoc[Source Docs] | *camel-ignite-queue-kafka-connector* | true | false | xref:connectors/camel-ignite-queue-kafka-sink-connector.adoc[Sink Docs] | -| *camel-imap-kafka-connector* | true | true | xref:connectors/camel-imap-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-imap-kafka-source-connector.adoc[Source Docs] | *camel-ignite-set-kafka-connector* | true | false | xref:connectors/camel-ignite-set-kafka-sink-connector.adoc[Sink Docs] | +| *camel-imap-kafka-connector* | true | true | xref:connectors/camel-imap-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-imap-kafka-source-connector.adoc[Source Docs] | *camel-imaps-kafka-connector* | true | true | xref:connectors/camel-imaps-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-imaps-kafka-source-connector.adoc[Source Docs] | *camel-infinispan-kafka-connector* | true | true | xref:connectors/camel-infinispan-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-infinispan-kafka-source-connector.adoc[Source Docs] | *camel-influxdb-kafka-connector* | true | false | xref:connectors/camel-influxdb-kafka-sink-connector.adoc
[camel-kafka-connector] branch master updated: Sink test refactoring
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 1de9ad6 Sink test refactoring new 9bcd681 Merge pull request #216 from fvaleri/sink-test-ref 1de9ad6 is described below commit 1de9ad69644b5c46ebee471bf02e23f2930df8e7 Author: Federico Valeri AuthorDate: Sat May 16 19:29:22 2020 +0200 Sink test refactoring --- .../kafkaconnector/CamelSinkConnectorConfig.java | 4 + .../kafkaconnector/CamelSourceConnectorConfig.java | 2 +- .../camel/kafkaconnector/CamelSinkTaskTest.java| 232 ++--- 3 files changed, 116 insertions(+), 122 deletions(-) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java index e11e84d..c353c58 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java @@ -38,6 +38,10 @@ public class CamelSinkConnectorConfig extends AbstractConfig { public static final String CAMEL_SINK_URL_DOC = "The camel url to configure the destination. If this is set " + CAMEL_SINK_COMPONENT_CONF + " and all the properties starting with " + CamelSinkTask.getCamelSinkEndpointConfigPrefix() + ".<" + CAMEL_SINK_COMPONENT_CONF + " value> are ignored."; +public static final String TOPIC_DEFAULT = "test"; +public static final String TOPIC_CONF = "topics"; +public static final String TOPIC_DOC = "A list of topics to use as input for this connector"; + private static final ConfigDef CONFIG_DEF = new ConfigDef() .define(CAMEL_SINK_URL_CONF, Type.STRING, CAMEL_SINK_URL_DEFAULT, Importance.HIGH, CAMEL_SINK_URL_DOC) .define(CAMEL_SINK_MARSHAL_CONF, Type.STRING, CAMEL_SINK_MARSHAL_DEFAULT, Importance.HIGH, CAMEL_SINK_MARSHAL_DOC) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java index 01a55b8..34e2495 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java @@ -40,7 +40,7 @@ public class CamelSourceConnectorConfig extends AbstractConfig { public static final String TOPIC_DEFAULT = "test"; public static final String TOPIC_CONF = "topics"; -public static final String TOPIC_DOC = "The topic to publish data to"; +public static final String TOPIC_DOC = "A list of topics to use as output for this connector"; public static final Long CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_DEFAULT = 1000L; public static final String CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_CONF = "camel.source.maxBatchPollSize"; diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java index ba147b8..24cd03c 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java @@ -34,40 +34,41 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class CamelSinkTaskTest { +private static final String SEDA_URI = "seda:test"; +private static final String TOPIC_NAME = "my-topic"; +private static final long RECEIVE_TIMEOUT = 1_000; + @Test public void testOnlyBody() { Map props = new HashMap<>(); -props.put("camel.sink.url", "seda:test"); -props.put("topics", "mytopic"); - -CamelSinkTask camelSinkTask = new CamelSinkTask(); -camelSinkTask.start(props); +props.put(CamelSinkConnectorConfig.TOPIC_CONF, TOPIC_NAME); +props.put(CamelSinkConnectorConfig.CAMEL_SINK_URL_CONF, SEDA_URI); -String topic = "mytopic"; +CamelSinkTask sinkTask = new CamelSinkTask(); +sinkTask.start(props); List records = new ArrayList(); -SinkRecord record = new SinkRecord(topic, 1, null, "test", null, "camel", 42); +SinkRecord record = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42); records.add(record); -camelSinkTask.put(records); +sinkTask.put(records); -ConsumerTemplate c = camelSinkTask.getCms().createConsumerTemplate(); -Exchange exchange = c.receive("seda:test", 1000L); +ConsumerTemplate consumer =
[camel-kafka-connector] branch master updated: Add contentLogLevel task property
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 5527e2f Add contentLogLevel task property new 569cc3e Merge pull request #193 from fvaleri/log-payload 5527e2f is described below commit 5527e2fd9d46c1293cf531e233ca9cf43385704b Author: Federico Valeri AuthorDate: Wed May 6 09:59:37 2020 +0200 Add contentLogLevel task property --- core/pom.xml | 5 + .../kafkaconnector/CamelSinkConnectorConfig.java | 8 +- .../apache/camel/kafkaconnector/CamelSinkTask.java | 4 +- .../kafkaconnector/CamelSourceConnectorConfig.java | 10 +- .../camel/kafkaconnector/CamelSourceTask.java | 38 ++-- .../camel/kafkaconnector/utils/TaskHelper.java | 42 + .../camel/kafkaconnector/CamelSinkTaskTest.java| 3 + .../camel/kafkaconnector/CamelSourceTaskTest.java | 3 + .../camel/kafkaconnector/utils/TaskHelperTest.java | 200 + parent/pom.xml | 7 + 10 files changed, 267 insertions(+), 53 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 91f8ec0..f082a9c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -89,6 +89,11 @@ test +org.slf4j +slf4j-ext +test + + org.apache.logging.log4j log4j-api test diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java index c353c58..61b 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java @@ -18,6 +18,7 @@ package org.apache.camel.kafkaconnector; import java.util.Map; +import org.apache.camel.LoggingLevel; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; @@ -42,10 +43,15 @@ public class CamelSinkConnectorConfig extends AbstractConfig { public static final String TOPIC_CONF = "topics"; public static final String TOPIC_DOC = "A list of topics to use as input for this connector"; +public static final String CAMEL_SINK_CONTENT_LOG_LEVEL_DEFAULT = LoggingLevel.OFF.toString(); +public static final String CAMEL_SINK_CONTENT_LOG_LEVEL_CONF = "camel.sink.contentLogLevel"; +public static final String CAMEL_SINK_CONTENT_LOG_LEVEL_DOC = "Log level for the record's content (default: " + CAMEL_SINK_CONTENT_LOG_LEVEL_DEFAULT + "). Valid values: TRACE, DEBUG, INFO, WARN, ERROR, OFF."; + private static final ConfigDef CONFIG_DEF = new ConfigDef() .define(CAMEL_SINK_URL_CONF, Type.STRING, CAMEL_SINK_URL_DEFAULT, Importance.HIGH, CAMEL_SINK_URL_DOC) .define(CAMEL_SINK_MARSHAL_CONF, Type.STRING, CAMEL_SINK_MARSHAL_DEFAULT, Importance.HIGH, CAMEL_SINK_MARSHAL_DOC) -.define(CAMEL_SINK_COMPONENT_CONF, Type.STRING, CAMEL_SINK_COMPONENT_DEFAULT, Importance.HIGH, CAMEL_SINK_COMPONENT_DOC); +.define(CAMEL_SINK_COMPONENT_CONF, Type.STRING, CAMEL_SINK_COMPONENT_DEFAULT, Importance.HIGH, CAMEL_SINK_COMPONENT_DOC) +.define(CAMEL_SINK_CONTENT_LOG_LEVEL_CONF, Type.STRING, CAMEL_SINK_CONTENT_LOG_LEVEL_DEFAULT, Importance.HIGH, CAMEL_SINK_CONTENT_LOG_LEVEL_DOC); public CamelSinkConnectorConfig(ConfigDef config, Map parsedConfig) { super(config, parsedConfig); diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java index bd0870b..15ccd2b 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java @@ -110,6 +110,7 @@ public class CamelSinkTask extends SinkTask { @Override public void put(Collection sinkRecords) { for (SinkRecord record : sinkRecords) { +TaskHelper.logRecordContent(LOG, record, config); Map headers = new HashMap(); Exchange exchange = new DefaultExchange(producer.getCamelContext()); headers.put(KAFKA_RECORD_KEY_HEADER, record.key()); @@ -123,7 +124,8 @@ public class CamelSinkTask extends SinkTask { } exchange.getMessage().setHeaders(headers); exchange.getMessage().setBody(record.value()); -LOG.debug("Sending {} to {}", exchange, LOCAL_URL); + +LOG.debug("Sending exchange {} to {}", exchange.getExchangeId(), LOCAL_URL); producer.send(LOCAL_URL, exchange