[camel] branch master updated: CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise the
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 802d1ba CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise there may be problems in OSGi. 802d1ba is described below commit 802d1ba7bb7838e355111e488e5e7dfcc3aa099d Author: Claus Ibsen AuthorDate: Tue Nov 3 09:05:46 2020 +0100 CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise there may be problems in OSGi. --- .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java index 09dd1ed..6c5face 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -454,6 +454,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); +verb.setTypeClass(classType); verb.setType(asTypeName(classType)); return this; } @@ -465,6 +466,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); +verb.setOutTypeClass(classType); verb.setOutType(asTypeName(classType)); return this; }
[camel-karaf] branch master updated: CAMEL-15277: Deprecate camel-osgi-activator
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new a28553e CAMEL-15277: Deprecate camel-osgi-activator a28553e is described below commit a28553ed3091c6ea0c0e4a602ee3b506e00ebfed Author: Claus Ibsen AuthorDate: Tue Nov 3 09:15:18 2020 +0100 CAMEL-15277: Deprecate camel-osgi-activator --- components/camel-osgi-activator/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../camel-osgi-activator/src/generated/resources/osgi-activator.json | 2 +- components/camel-osgi-activator/src/main/docs/osgi-activator.adoc | 2 +- docs/modules/ROOT/pages/components.adoc | 4 ++-- docs/modules/ROOT/pages/osgi-activator.adoc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/camel-osgi-activator/pom.xml b/components/camel-osgi-activator/pom.xml index 4b972a1..eb000ee 100644 --- a/components/camel-osgi-activator/pom.xml +++ b/components/camel-osgi-activator/pom.xml @@ -31,7 +31,7 @@ camel-osgi-activator jar -Camel Karaf :: OSGi Activator +Camel Karaf :: OSGi Activator (deprecated) Camel OSGi Activator for running Camel routes from other bundles diff --git a/components/camel-osgi-activator/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-osgi-activator/src/generated/resources/META-INF/services/org/apache/camel/other.properties index e0007e9..297ffb2 100644 --- a/components/camel-osgi-activator/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-osgi-activator/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=osgi-activator groupId=org.apache.camel.karaf artifactId=camel-osgi-activator version=3.7.0-SNAPSHOT -projectName=Camel Karaf :: OSGi Activator +projectName=Camel Karaf :: OSGi Activator (deprecated) projectDescription=Camel OSGi Activator for running Camel routes from other bundles diff --git a/components/camel-osgi-activator/src/generated/resources/osgi-activator.json b/components/camel-osgi-activator/src/generated/resources/osgi-activator.json index 0a9ef4e..7ef4baa 100644 --- a/components/camel-osgi-activator/src/generated/resources/osgi-activator.json +++ b/components/camel-osgi-activator/src/generated/resources/osgi-activator.json @@ -4,7 +4,7 @@ "name": "osgi-activator", "title": "Osgi Activator", "description": "Camel OSGi Activator for running Camel routes from other bundles", -"deprecated": false, +"deprecated": true, "firstVersion": "3.1.0", "supportLevel": "Preview", "groupId": "org.apache.camel.karaf", diff --git a/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc b/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc index e4de6bb..6546cb1 100644 --- a/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc +++ b/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc @@ -1,5 +1,5 @@ [[OsgiActivator]] -= OSGi Camel Routes Activator += OSGi Camel Routes Activator (deprecated) :page-source: components/camel-osgi-activator/src/main/docs/osgi-activator.adoc *Since Camel 3.1* diff --git a/docs/modules/ROOT/pages/components.adoc b/docs/modules/ROOT/pages/components.adoc index b14cf7d..1f27358 100644 --- a/docs/modules/ROOT/pages/components.adoc +++ b/docs/modules/ROOT/pages/components.adoc @@ -850,7 +850,7 @@ Number of Camel languages: 18 in 12 JAR artifacts (0 deprecated) == Miscellaneous Extensions // others: START -Number of miscellaneous extensions: 20 in 20 JAR artifacts (1 deprecated) +Number of miscellaneous extensions: 20 in 20 JAR artifacts (2 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -893,7 +893,7 @@ Number of miscellaneous extensions: 20 in 20 JAR artifacts (1 deprecated) (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing | xref:camel-karaf::osgi-activator.adoc[Osgi Activator] + -(camel-osgi-activator) | 3.1 | Camel OSGi Activator for running Camel routes from other bundles +(camel-osgi-activator) | 3.1 | *deprecated* Camel OSGi Activator for running Camel routes from other bundles | xref:components:others:reactor.adoc[Reactor] + (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component diff --git a/docs/modules/ROOT/pages/osgi-activator.adoc b/docs/modules/ROOT/pages/osgi-activator.adoc index e4de6bb..6546cb1 100644 --- a/docs/modules/ROOT/pages/osgi-activator.adoc +++ b/docs/modules/ROOT/pages/osgi-activator.adoc @@ -1,5 +1,5 @@ [[OsgiActivator]] -= OSGi Camel Routes Activator += OSGi Camel Routes Activator (deprecated) :page-source: components/camel-osgi-a
[camel] branch regen_bot updated (2f97578 -> 6986c54)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 2f97578 Sync deps add 6986c54 CAMEL-15793: camel-bean - To make OSGi service reference in blueprint work again. Thanks to Josh Smith for reporting this. No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/bean/BeanInfo.java| 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-)
[camel] branch regen_bot updated (6986c54 -> 802d1ba)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 6986c54 CAMEL-15793: camel-bean - To make OSGi service reference in blueprint work again. Thanks to Josh Smith for reporting this. add 802d1ba CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise there may be problems in OSGi. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 ++ 1 file changed, 2 insertions(+)
[camel] 03/03: CAMEL-15795: camel-core - Remove tangle from impl route to route model as its no longer needed after route has been created via reifier.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit df369b44cccdeb8a79497f07894ae63fe540ecca Author: Claus Ibsen AuthorDate: Tue Nov 3 10:04:38 2020 +0100 CAMEL-15795: camel-core - Remove tangle from impl route to route model as its no longer needed after route has been created via reifier. --- core/camel-api/src/main/java/org/apache/camel/Route.java | 11 +-- .../main/java/org/apache/camel/impl/engine/DefaultRoute.java | 5 + .../src/main/java/org/apache/camel/reifier/RouteReifier.java | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/Route.java b/core/camel-api/src/main/java/org/apache/camel/Route.java index 83a6e7b..b40bbd3 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Route.java +++ b/core/camel-api/src/main/java/org/apache/camel/Route.java @@ -238,12 +238,19 @@ public interface Route extends RuntimeConfiguration { String getRouteDescription(); /** - * Get the route type + * Get the route type. * - * @return the route type + * Important: is null after the route has been created. + * + * @return the route type during creation of the route, is null after the route has been created. */ NamedNode getRoute(); +/** + * Clears the route model when its no longer needed. + */ +void clearRouteModel(); + // // CREATION TIME // diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java index e17a055..9ad83bf 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java @@ -261,6 +261,11 @@ public class DefaultRoute extends ServiceSupport implements Route { } @Override +public void clearRouteModel() { +route = null; +} + +@Override public String getRouteId() { return routeId; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java index 1ac63f5..fb2dbdf 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java @@ -316,6 +316,9 @@ public class RouteReifier extends ProcessorReifier { } } +// okay route has been created from the model, then the model is no longer needed and we can de-reference +route.clearRouteModel(); + return route; }
[camel] branch master updated (802d1ba -> df369b4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 802d1ba CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise there may be problems in OSGi. new 8809361 camel-core - Optimize to only one camel context reference in channel new 2101aee CAMEL-15795: camel-core - Reduce tangle from impl engine to model new df369b4 CAMEL-15795: camel-core - Remove tangle from impl route to route model as its no longer needed after route has been created via reifier. 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: .../src/main/java/org/apache/camel/Channel.java| 7 -- .../src/main/java/org/apache/camel/Route.java | 11 +- .../camel/impl/engine/CamelInternalProcessor.java | 2 +- .../apache/camel/impl/engine/DefaultChannel.java | 13 --- .../org/apache/camel/impl/engine/DefaultRoute.java | 5 + .../camel/impl/lw/LightweightCamelContext.java | 4 - .../org/apache/camel/reifier/RouteReifier.java | 3 + .../RandomLoadBalanceJavaDSLBuilderTest.java | 123 - 8 files changed, 18 insertions(+), 150 deletions(-) delete mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
[camel] 02/03: CAMEL-15795: camel-core - Reduce tangle from impl engine to model
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 2101aee43b4e46716a760bca11a68a2d70ff79a2 Author: Claus Ibsen AuthorDate: Tue Nov 3 09:51:20 2020 +0100 CAMEL-15795: camel-core - Reduce tangle from impl engine to model --- .../src/main/java/org/apache/camel/Channel.java| 7 -- .../apache/camel/impl/engine/DefaultChannel.java | 11 -- .../camel/impl/lw/LightweightCamelContext.java | 4 - .../RandomLoadBalanceJavaDSLBuilderTest.java | 123 - 4 files changed, 145 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/Channel.java b/core/camel-api/src/main/java/org/apache/camel/Channel.java index e2777f8..9778df2 100644 --- a/core/camel-api/src/main/java/org/apache/camel/Channel.java +++ b/core/camel-api/src/main/java/org/apache/camel/Channel.java @@ -84,11 +84,4 @@ public interface Channel extends AsyncProcessor, Navigate { */ Route getRoute(); -/** - * Gets the definition of the next processor - * - * @return the processor definition - */ -NamedNode getProcessorDefinition(); - } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java index 776f958..902eec4 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java @@ -62,7 +62,6 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { private Processor nextProcessor; // the real output to invoke that has been wrapped private Processor output; -private NamedNode definition; private ManagementInterceptStrategy.InstrumentationProcessor instrumentationProcessor; private Route route; @@ -114,15 +113,6 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { } @Override -public NamedNode getProcessorDefinition() { -return definition; -} - -public void clearModelReferences() { -this.definition = null; -} - -@Override public Route getRoute() { return route; } @@ -162,7 +152,6 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { boolean first) throws Exception { this.route = route; -this.definition = definition; this.nextProcessor = nextProcessor; // init CamelContextAware as early as possible on nextProcessor diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java index 1453f02..3b0cedb 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java @@ -53,7 +53,6 @@ import org.apache.camel.ValueHolder; import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.catalog.RuntimeCamelCatalog; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.engine.DefaultChannel; import org.apache.camel.impl.engine.DefaultRoute; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.FaultToleranceConfigurationDefinition; @@ -1861,9 +1860,6 @@ public class LightweightCamelContext implements ExtendedCamelContext, CatalogCam private void clearModelReferences(Navigate nav) { for (Processor processor : nav.next()) { -if (processor instanceof DefaultChannel) { -((DefaultChannel) processor).clearModelReferences(); -} if (processor instanceof Navigate) { clearModelReferences((Navigate) processor); } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java deleted file mode 100644 index 0bc0f6b..000 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java +++ /dev/null @@ -1,123 +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 applic
[camel] 01/03: camel-core - Optimize to only one camel context reference in channel
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 880936157c1fc46eeafebc5d539a1194e662b972 Author: Claus Ibsen AuthorDate: Tue Nov 3 09:39:23 2020 +0100 camel-core - Optimize to only one camel context reference in channel --- .../main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 2 +- .../src/main/java/org/apache/camel/impl/engine/DefaultChannel.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java index b409d9f..ac2014b 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java @@ -98,7 +98,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor implements In private static final Object[] EMPTY_STATES = new Object[0]; -private final CamelContext camelContext; +final CamelContext camelContext; private final ReactiveExecutor reactiveExecutor; private final ShutdownStrategy shutdownStrategy; private final List> advices = new ArrayList<>(); diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java index 3f1e5c6..776f958 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java @@ -64,7 +64,6 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { private Processor output; private NamedNode definition; private ManagementInterceptStrategy.InstrumentationProcessor instrumentationProcessor; -private CamelContext camelContext; private Route route; public DefaultChannel(CamelContext camelContext) { @@ -164,7 +163,6 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel { throws Exception { this.route = route; this.definition = definition; -this.camelContext = route.getCamelContext(); this.nextProcessor = nextProcessor; // init CamelContextAware as early as possible on nextProcessor
[camel] branch master updated: CAMEL-15795: camel-core - Remove unused code
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 254367e CAMEL-15795: camel-core - Remove unused code 254367e is described below commit 254367eb5252ed614becad8253b68a8509973717 Author: Claus Ibsen AuthorDate: Tue Nov 3 10:47:40 2020 +0100 CAMEL-15795: camel-core - Remove unused code --- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 10 -- 1 file changed, 10 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 0c8add5..dd96566 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -49,10 +49,8 @@ import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; import org.apache.camel.model.FaultToleranceConfigurationDefinition; import org.apache.camel.model.HystrixConfigurationDefinition; -import org.apache.camel.model.Model; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.Resilience4jConfigurationDefinition; -import org.apache.camel.model.RouteDefinition; import org.apache.camel.saga.CamelSagaService; import org.apache.camel.spi.CamelBeanPostProcessor; import org.apache.camel.spi.DataFormat; @@ -285,14 +283,6 @@ public abstract class BaseMainSupport extends BaseService { listeners.remove(listener); } -public List getRouteDefinitions() { -List answer = new ArrayList<>(); -if (camelContext != null) { - answer.addAll(camelContext.getExtension(Model.class).getRouteDefinitions()); -} -return answer; -} - protected void loadRouteBuilders(CamelContext camelContext) throws Exception { // lets use Camel's bean post processor on any existing route builder classes // so the instance has some support for dependency injection
[camel] branch master updated: CAMEL-15795: camel-core - Reduce tangle from impl engine to model
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 64c3637 CAMEL-15795: camel-core - Reduce tangle from impl engine to model 64c3637 is described below commit 64c36378ea244963149fc53ad2427ecd4b73e293 Author: Claus Ibsen AuthorDate: Tue Nov 3 11:00:36 2020 +0100 CAMEL-15795: camel-core - Reduce tangle from impl engine to model --- .../org/apache/camel/main/BaseMainSupport.java | 54 +--- .../camel/main/MainSupportModelConfigurer.java | 96 ++ 2 files changed, 100 insertions(+), 50 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index dd96566..87b0c8a 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -47,10 +47,6 @@ import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckConfiguration; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; -import org.apache.camel.model.FaultToleranceConfigurationDefinition; -import org.apache.camel.model.HystrixConfigurationDefinition; -import org.apache.camel.model.ModelCamelContext; -import org.apache.camel.model.Resilience4jConfigurationDefinition; import org.apache.camel.saga.CamelSagaService; import org.apache.camel.spi.CamelBeanPostProcessor; import org.apache.camel.spi.DataFormat; @@ -208,7 +204,6 @@ public abstract class BaseMainSupport extends BaseService { * * @param key the property key * @param value the property value - * * @see #addInitialProperty(String, String) * @see #addOverrideProperty(String, String) */ @@ -702,8 +697,6 @@ public abstract class BaseMainSupport extends BaseService { } } -ModelCamelContext model = camelContext.adapt(ModelCamelContext.class); - // create beans first as they may be used later if (!beansProperties.isEmpty()) { LOG.debug("Creating and binding beans to registry from loaded properties: {}", beansProperties.size()); @@ -716,49 +709,6 @@ public abstract class BaseMainSupport extends BaseService { mainConfigurationProperties.isAutoConfigurationFailFast(), true, autoConfiguredProperties); } -if (!hystrixProperties.isEmpty()) { -HystrixConfigurationProperties hystrix = mainConfigurationProperties.hystrix(); -LOG.debug("Auto-configuring Hystrix Circuit Breaker EIP from loaded properties: {}", hystrixProperties.size()); -setPropertiesOnTarget(camelContext, hystrix, hystrixProperties, "camel.hystrix.", -mainConfigurationProperties.isAutoConfigurationFailFast(), true, autoConfiguredProperties); -HystrixConfigurationDefinition hystrixModel = model.getHystrixConfiguration(null); -if (hystrixModel == null) { -hystrixModel = new HystrixConfigurationDefinition(); -model.setHystrixConfiguration(hystrixModel); -} -if (hystrix != null) { -setPropertiesOnTarget(camelContext, hystrixModel, hystrix); -} -} - -if (!resilience4jProperties.isEmpty()) { -Resilience4jConfigurationProperties resilience4j = mainConfigurationProperties.resilience4j(); -LOG.debug("Auto-configuring Resilience4j Circuit Breaker EIP from loaded properties: {}", -resilience4jProperties.size()); -setPropertiesOnTarget(camelContext, resilience4j, resilience4jProperties, "camel.resilience4j.", -mainConfigurationProperties.isAutoConfigurationFailFast(), true, autoConfiguredProperties); -Resilience4jConfigurationDefinition resilience4jModel = model.getResilience4jConfiguration(null); -if (resilience4jModel == null) { -resilience4jModel = new Resilience4jConfigurationDefinition(); -model.setResilience4jConfiguration(resilience4jModel); -} -setPropertiesOnTarget(camelContext, resilience4jModel, resilience4j); -} - -if (!faultToleranceProperties.isEmpty()) { -FaultToleranceConfigurationProperties faultTolerance = mainConfigurationProperties.faultTolerance(); -LOG.debug("Auto-configuring MicroProfile Fault Tolerance Circuit Breaker EIP from loaded properties: {}", -faultToleranceProperties.size()); -setPropertiesOnTarget(camelContext, faultTolerance, faultToleranceProperties, "camel.faulttolerance.", -mainConfigurationProp
[camel] branch master updated: CAMEL-15795: camel-core - Reduce tangle from impl engine to model
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 59fc1bb CAMEL-15795: camel-core - Reduce tangle from impl engine to model 59fc1bb is described below commit 59fc1bb02f33531f850b375c247c3b49da2889ce Author: Claus Ibsen AuthorDate: Tue Nov 3 11:03:55 2020 +0100 CAMEL-15795: camel-core - Reduce tangle from impl engine to model --- .../org/apache/camel/main/BaseMainSupport.java | 64 + .../camel/main/MainSupportModelConfigurer.java | 66 ++ 2 files changed, 67 insertions(+), 63 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 87b0c8a..6111c68 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -42,7 +42,6 @@ import org.apache.camel.ExtendedCamelContext; import org.apache.camel.NoSuchLanguageException; import org.apache.camel.RoutesBuilder; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.builder.ThreadPoolProfileBuilder; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckConfiguration; import org.apache.camel.health.HealthCheckRegistry; @@ -53,7 +52,6 @@ import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Language; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.RouteTemplateParameterSource; -import org.apache.camel.spi.ThreadPoolProfile; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.LifecycleStrategySupport; import org.apache.camel.support.PropertyBindingSupport; @@ -719,7 +717,7 @@ public abstract class BaseMainSupport extends BaseService { if (!threadPoolProperties.isEmpty()) { LOG.debug("Auto-configuring Thread Pool from loaded properties: {}", threadPoolProperties.size()); -setThreadPoolProperties(camelContext, threadPoolProperties, +MainSupportModelConfigurer.setThreadPoolProperties(camelContext, mainConfigurationProperties, threadPoolProperties, mainConfigurationProperties.isAutoConfigurationFailFast(), autoConfiguredProperties); } if (!healthProperties.isEmpty()) { @@ -798,66 +796,6 @@ public abstract class BaseMainSupport extends BaseService { DefaultConfigurationConfigurer.afterPropertiesSet(camelContext); } -private void setThreadPoolProperties( -CamelContext camelContext, Map threadPoolProperties, -boolean failIfNotSet, Map autoConfiguredProperties) -throws Exception { - -ThreadPoolConfigurationProperties tp = mainConfigurationProperties.threadPool(); - -// extract all config to know their parent ids so we can set the values afterwards -Map hcConfig = PropertiesHelper.extractProperties(threadPoolProperties, "config", false); -Map tpConfigs = new HashMap<>(); -// build set of configuration objects -for (Map.Entry entry : hcConfig.entrySet()) { -String id = StringHelper.between(entry.getKey(), "[", "]"); -if (id != null) { -ThreadPoolProfileConfigurationProperties tcp = tpConfigs.get(id); -if (tcp == null) { -tcp = new ThreadPoolProfileConfigurationProperties(); -tcp.setId(id); -tpConfigs.put(id, tcp); -} -} -} -if (tp.getConfig() != null) { -tp.getConfig().putAll(tpConfigs); -} else { -tp.setConfig(tpConfigs); -} - -setPropertiesOnTarget(camelContext, tp, threadPoolProperties, "camel.threadpool.", -mainConfigurationProperties.isAutoConfigurationFailFast(), true, autoConfiguredProperties); - -// okay we have all properties set so we should be able to create thread pool profiles and register them on camel -final ThreadPoolProfile dp = new ThreadPoolProfileBuilder("default") -.poolSize(tp.getPoolSize()) -.maxPoolSize(tp.getMaxPoolSize()) -.keepAliveTime(tp.getKeepAliveTime(), tp.getTimeUnit()) -.maxQueueSize(tp.getMaxQueueSize()) -.allowCoreThreadTimeOut(tp.getAllowCoreThreadTimeOut()) -.rejectedPolicy(tp.getRejectedPolicy()).build(); - -for (ThreadPoolProfileConfigurationProperties config : tp.getConfig().values()) { -ThreadPoolProfileBuilder builder = new ThreadPoolProfileBuilder(config.getId(), dp); -final ThreadPoolProfile tpp = builder.poolSize(config.getPoolSize()) -
[camel-kafka-connector-examples] branch master updated: Added a SQL Sink example
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new b9cccbb Added a SQL Sink example b9cccbb is described below commit b9cccbb1a9253445bec7d94b07e192f6cdf311e4 Author: Andrea Cosentino AuthorDate: Tue Nov 3 11:24:20 2020 +0100 Added a SQL Sink example --- sql/sql-sink/README.adoc | 156 + .../config/CamelSqlSinkConnector.properties| 30 2 files changed, 186 insertions(+) diff --git a/sql/sql-sink/README.adoc b/sql/sql-sink/README.adoc new file mode 100644 index 000..c0dd1d2 --- /dev/null +++ b/sql/sql-sink/README.adoc @@ -0,0 +1,156 @@ += Camel-Kafka-connector SQL Sink + +This is an example for Camel-Kafka-connector SQL Sink + +== Standalone + +=== What is needed + +- An AWS Account +- A running postgresql instance through docker +- Postgresql Jdbc Driver + +=== Running Kafka + +[source] + +$KAFKA_HOME/bin/zookeeper-server-start.sh $KAFKA_HOME/config/zookeeper.properties +$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties +$KAFKA_HOME/bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic mytopic + + +=== Download the connector package + +Download the connector package zip and extract the content to a directory. In this example we'll use `/home/oscerd/connectors/` + +[source] + +> cd /home/oscerd/connectors/ +> wget https://repo1.maven.org/maven2/org/apache/camel/kafkaconnector/camel-sql-kafka-connector/0.6.0/camel-sql-kafka-connector-0.6.0-package.zip +> unzip camel-sql-kafka-connector-0.6.0-package.zip + + +There is also the need of the driver for this example + +[source] + +> cd /home/oscerd/connectors/camel-sql-kafka-connector/ +> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.4/postgresql-42.2.4.jar + + +=== Configuring Kafka Connect + +You'll need to set up the `plugin.path` property in your kafka + +Open the `$KAFKA_HOME/config/connect-standalone.properties` and set the `plugin.path` property to your choosen location: + +[source] + +... +plugin.path=/home/oscerd/connectors +... + + +=== Setup the docker image + +We'll need a full running Postgresql instance. + +First step is running it: + +[source] + +> docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres +6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb + + +Take note of the container id. +We need now to create the table we'll use: the table is the following + +[source] + +CREATE TABLE accounts ( + user_id serial PRIMARY KEY, + username VARCHAR ( 50 ) UNIQUE NOT NULL, + city VARCHAR ( 50 ) NOT NULL +); + + +We are now ready to create the table + +[source] + +> docker exec -it 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb psql -U postgres +psql (13.0 (Debian 13.0-1.pgdg100+1)) +Type "help" for help. + +postgres=# CREATE TABLE accounts ( +postgres(# user_id serial PRIMARY KEY, +postgres(# username VARCHAR ( 50 ) UNIQUE NOT NULL, +postgres(# city VARCHAR ( 50 ) NOT NULL +postgres(# ); + + +We need to take note also of the container ip + + +> docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb +172.17.0.2 + + +=== Setup the connectors + +Open the SQL configuration file at `$EXAMPLES/sql/sql-sink/config/CamelSqlSinkConnector.properties` + +[source] + +name=CamelSqlSinkConnector +connector.class=org.apache.camel.kafkaconnector.sql.CamelSqlSinkConnector +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.component.sql.dataSource.user=postgres +camel.component.sql.dataSource.password=mysecretpassword +camel.component.sql.dataSource.serverName=172.17.0.2 +camel.component.sql.dataSource=#class:org.postgresql.ds.PGSimpleDataSource + +camel.sink.path.query=INSERT INTO accounts (username,city) VALUES (:#username,:#city) + + +and add the correct IP for the container. + +=== Running the example + +Run the kafka connect with the SQL Sink connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/sql/sql-sink/config/CamelSqlSinkConnector.properties + + +On a different terminal run the kafkacat producer and send the following message + +[source] + +> echo "test" | ./kafkacat -b localhost:9092 -t dbtest1 -H "CamelHeader.username=andrea" -H "CamelHeader.city=Roma" +% Auto-selecting Producer mode (use -P or -C to override) +> echo "test" | ./kafkacat -b localhost:9092 -t dbtest1 -H "CamelHeader.username=John" -H "CamelHeader.city=New York" +% A
[camel-kafka-connector-examples] branch sql-sink created (now c9a6fe5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sql-sink in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at c9a6fe5 Added a SQL Sink example This branch includes the following new commits: new c9a6fe5 Added a SQL Sink example 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-examples] 01/01: Added a SQL Sink example
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sql-sink in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git commit c9a6fe5d12397d41ba70446c2055ca34bee79a2a Author: Andrea Cosentino AuthorDate: Tue Nov 3 11:24:20 2020 +0100 Added a SQL Sink example --- sql/sql-sink/README.adoc | 156 + .../config/CamelSqlSinkConnector.properties| 30 2 files changed, 186 insertions(+) diff --git a/sql/sql-sink/README.adoc b/sql/sql-sink/README.adoc new file mode 100644 index 000..c0dd1d2 --- /dev/null +++ b/sql/sql-sink/README.adoc @@ -0,0 +1,156 @@ += Camel-Kafka-connector SQL Sink + +This is an example for Camel-Kafka-connector SQL Sink + +== Standalone + +=== What is needed + +- An AWS Account +- A running postgresql instance through docker +- Postgresql Jdbc Driver + +=== Running Kafka + +[source] + +$KAFKA_HOME/bin/zookeeper-server-start.sh $KAFKA_HOME/config/zookeeper.properties +$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties +$KAFKA_HOME/bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic mytopic + + +=== Download the connector package + +Download the connector package zip and extract the content to a directory. In this example we'll use `/home/oscerd/connectors/` + +[source] + +> cd /home/oscerd/connectors/ +> wget https://repo1.maven.org/maven2/org/apache/camel/kafkaconnector/camel-sql-kafka-connector/0.6.0/camel-sql-kafka-connector-0.6.0-package.zip +> unzip camel-sql-kafka-connector-0.6.0-package.zip + + +There is also the need of the driver for this example + +[source] + +> cd /home/oscerd/connectors/camel-sql-kafka-connector/ +> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.4/postgresql-42.2.4.jar + + +=== Configuring Kafka Connect + +You'll need to set up the `plugin.path` property in your kafka + +Open the `$KAFKA_HOME/config/connect-standalone.properties` and set the `plugin.path` property to your choosen location: + +[source] + +... +plugin.path=/home/oscerd/connectors +... + + +=== Setup the docker image + +We'll need a full running Postgresql instance. + +First step is running it: + +[source] + +> docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres +6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb + + +Take note of the container id. +We need now to create the table we'll use: the table is the following + +[source] + +CREATE TABLE accounts ( + user_id serial PRIMARY KEY, + username VARCHAR ( 50 ) UNIQUE NOT NULL, + city VARCHAR ( 50 ) NOT NULL +); + + +We are now ready to create the table + +[source] + +> docker exec -it 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb psql -U postgres +psql (13.0 (Debian 13.0-1.pgdg100+1)) +Type "help" for help. + +postgres=# CREATE TABLE accounts ( +postgres(# user_id serial PRIMARY KEY, +postgres(# username VARCHAR ( 50 ) UNIQUE NOT NULL, +postgres(# city VARCHAR ( 50 ) NOT NULL +postgres(# ); + + +We need to take note also of the container ip + + +> docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb +172.17.0.2 + + +=== Setup the connectors + +Open the SQL configuration file at `$EXAMPLES/sql/sql-sink/config/CamelSqlSinkConnector.properties` + +[source] + +name=CamelSqlSinkConnector +connector.class=org.apache.camel.kafkaconnector.sql.CamelSqlSinkConnector +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.component.sql.dataSource.user=postgres +camel.component.sql.dataSource.password=mysecretpassword +camel.component.sql.dataSource.serverName=172.17.0.2 +camel.component.sql.dataSource=#class:org.postgresql.ds.PGSimpleDataSource + +camel.sink.path.query=INSERT INTO accounts (username,city) VALUES (:#username,:#city) + + +and add the correct IP for the container. + +=== Running the example + +Run the kafka connect with the SQL Sink connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/sql/sql-sink/config/CamelSqlSinkConnector.properties + + +On a different terminal run the kafkacat producer and send the following message + +[source] + +> echo "test" | ./kafkacat -b localhost:9092 -t dbtest1 -H "CamelHeader.username=andrea" -H "CamelHeader.city=Roma" +% Auto-selecting Producer mode (use -P or -C to override) +> echo "test" | ./kafkacat -b localhost:9092 -t dbtest1 -H "CamelHeader.username=John" -H "CamelHeader.city=New York" +% Auto-selecting Producer mode (use -P or -C to override) + + +Now you can search through the psql command the record inserted + +[source]
[camel-kafka-connector-examples] branch master updated: Added SQL Sink to example list
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new f785097 Added SQL Sink to example list f785097 is described below commit f7850977e4bc594b553ecd08dbce4f07ba9f62ba Author: Andrea Cosentino AuthorDate: Tue Nov 3 11:25:58 2020 +0100 Added SQL Sink to example list --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index 2c4e34c..f35ff56 100644 --- a/README.adoc +++ b/README.adoc @@ -20,5 +20,6 @@ List of existing examples: - NSQ source and sink examples - RabbitMQ source and sink examples - Slack source, sink and apicurio registry example +- SQL sink example - Telegram source and sink examples - Twitter Search source example
[camel-kafka-connector-examples] branch oscerd-patch-1 created (now 4673a54)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch oscerd-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at 4673a54 Added SQL Sink to example list No new revisions were added by this update.
[camel] branch regen_bot updated (802d1ba -> df369b4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 802d1ba CAMEL-15745: rest-dsl for type/outType using class should set that as well so camel binding uses the class and do not attempt to load it via a string name. Otherwise there may be problems in OSGi. add 8809361 camel-core - Optimize to only one camel context reference in channel add 2101aee CAMEL-15795: camel-core - Reduce tangle from impl engine to model add df369b4 CAMEL-15795: camel-core - Remove tangle from impl route to route model as its no longer needed after route has been created via reifier. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/Channel.java| 7 -- .../src/main/java/org/apache/camel/Route.java | 11 +- .../camel/impl/engine/CamelInternalProcessor.java | 2 +- .../apache/camel/impl/engine/DefaultChannel.java | 13 --- .../org/apache/camel/impl/engine/DefaultRoute.java | 5 + .../camel/impl/lw/LightweightCamelContext.java | 4 - .../org/apache/camel/reifier/RouteReifier.java | 3 + .../RandomLoadBalanceJavaDSLBuilderTest.java | 123 - 8 files changed, 18 insertions(+), 150 deletions(-) delete mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
[camel] branch regen_bot updated (df369b4 -> 254367e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from df369b4 CAMEL-15795: camel-core - Remove tangle from impl route to route model as its no longer needed after route has been created via reifier. add 254367e CAMEL-15795: camel-core - Remove unused code No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 10 -- 1 file changed, 10 deletions(-)
[camel] branch regen_bot updated (254367e -> 64c3637)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 254367e CAMEL-15795: camel-core - Remove unused code add 64c3637 CAMEL-15795: camel-core - Reduce tangle from impl engine to model No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/BaseMainSupport.java | 54 +--- .../camel/main/MainSupportModelConfigurer.java | 96 ++ 2 files changed, 100 insertions(+), 50 deletions(-) create mode 100644 core/camel-main/src/main/java/org/apache/camel/main/MainSupportModelConfigurer.java
[camel] branch regen_bot updated (64c3637 -> 59fc1bb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 64c3637 CAMEL-15795: camel-core - Reduce tangle from impl engine to model add 59fc1bb CAMEL-15795: camel-core - Reduce tangle from impl engine to model No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/BaseMainSupport.java | 64 + .../camel/main/MainSupportModelConfigurer.java | 66 ++ 2 files changed, 67 insertions(+), 63 deletions(-)
[camel] branch master updated: (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555)
This is an automated email from the ASF dual-hosted git repository. orpiske 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 64efc7e (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) 64efc7e is described below commit 64efc7e72bd305bbdcd0dbe1a089abb3c51d35a1 Author: Otavio Rodolfo Piske AuthorDate: Tue Nov 3 11:53:17 2020 +0100 (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) --- test-infra/camel-test-infra-elasticsearch/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml index 340733c..62005ea 100644 --- a/test-infra/camel-test-infra-elasticsearch/pom.xml +++ b/test-infra/camel-test-infra-elasticsearch/pom.xml @@ -48,11 +48,6 @@ org.testcontainers elasticsearch - - -org.testcontainers -couchbase -
[camel] branch master updated: (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555)
This is an automated email from the ASF dual-hosted git repository. orpiske 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 64efc7e (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) 64efc7e is described below commit 64efc7e72bd305bbdcd0dbe1a089abb3c51d35a1 Author: Otavio Rodolfo Piske AuthorDate: Tue Nov 3 11:53:17 2020 +0100 (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) --- test-infra/camel-test-infra-elasticsearch/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml index 340733c..62005ea 100644 --- a/test-infra/camel-test-infra-elasticsearch/pom.xml +++ b/test-infra/camel-test-infra-elasticsearch/pom.xml @@ -48,11 +48,6 @@ org.testcontainers elasticsearch - - -org.testcontainers -couchbase -
[camel] branch master updated: (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555)
This is an automated email from the ASF dual-hosted git repository. orpiske 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 64efc7e (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) 64efc7e is described below commit 64efc7e72bd305bbdcd0dbe1a089abb3c51d35a1 Author: Otavio Rodolfo Piske AuthorDate: Tue Nov 3 11:53:17 2020 +0100 (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) --- test-infra/camel-test-infra-elasticsearch/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml index 340733c..62005ea 100644 --- a/test-infra/camel-test-infra-elasticsearch/pom.xml +++ b/test-infra/camel-test-infra-elasticsearch/pom.xml @@ -48,11 +48,6 @@ org.testcontainers elasticsearch - - -org.testcontainers -couchbase -
[camel-kafka-connector-examples] branch sql-source created (now db7e98a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sql-source in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at db7e98a Added SQL Source example No new revisions were added by this update.
[camel-kafka-connector-examples] branch master updated: Added SQL Source example
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 494bb8d Added SQL Source example 494bb8d is described below commit 494bb8d4017e2529a43e7791c8ee2a732452468e Author: Andrea Cosentino AuthorDate: Tue Nov 3 12:21:57 2020 +0100 Added SQL Source example --- sql/sql-source/README.adoc | 150 + .../config/CamelSqlSourceConnector.properties | 30 + 2 files changed, 180 insertions(+) diff --git a/sql/sql-source/README.adoc b/sql/sql-source/README.adoc new file mode 100644 index 000..b727f5d --- /dev/null +++ b/sql/sql-source/README.adoc @@ -0,0 +1,150 @@ += Camel-Kafka-connector SQL Source + +This is an example for Camel-Kafka-connector SQL Source + +== Standalone + +=== What is needed + +- An AWS Account +- A running postgresql instance through docker +- Postgresql Jdbc Driver + +=== Running Kafka + +[source] + +$KAFKA_HOME/bin/zookeeper-server-start.sh $KAFKA_HOME/config/zookeeper.properties +$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties +$KAFKA_HOME/bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic mytopic + + +=== Download the connector package + +Download the connector package zip and extract the content to a directory. In this example we'll use `/home/oscerd/connectors/` + +[source] + +> cd /home/oscerd/connectors/ +> wget https://repo1.maven.org/maven2/org/apache/camel/kafkaconnector/camel-sql-kafka-connector/0.6.0/camel-sql-kafka-connector-0.6.0-package.zip +> unzip camel-sql-kafka-connector-0.6.0-package.zip + + +There is also the need of the driver for this example + +[source] + +> cd /home/oscerd/connectors/camel-sql-kafka-connector/ +> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.4/postgresql-42.2.4.jar + + +=== Configuring Kafka Connect + +You'll need to set up the `plugin.path` property in your kafka + +Open the `$KAFKA_HOME/config/connect-standalone.properties` and set the `plugin.path` property to your choosen location: + +[source] + +... +plugin.path=/home/oscerd/connectors +... + + +=== Setup the docker image + +We'll need a full running Postgresql instance. + +First step is running it: + +[source] + +> docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres +6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb + + +Take note of the container id. +We need now to create the table we'll use: the table is the following + +[source] + +CREATE TABLE accounts ( + user_id serial PRIMARY KEY, + username VARCHAR ( 50 ) UNIQUE NOT NULL, + city VARCHAR ( 50 ) NOT NULL +); + + +We are now ready to create the table + +[source] + +> docker exec -it 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb psql -U postgres +psql (13.0 (Debian 13.0-1.pgdg100+1)) +Type "help" for help. + +postgres=# CREATE TABLE accounts ( +postgres(# user_id serial PRIMARY KEY, +postgres(# username VARCHAR ( 50 ) UNIQUE NOT NULL, +postgres(# city VARCHAR ( 50 ) NOT NULL +postgres(# ); + + +and populate it + + +postgres=# INSERT into accounts (username,city) VALUES ('andrea', 'Roma'); +INSERT 0 1 +postgres=# INSERT into accounts (username,city) VALUES ('John', 'New York'); +INSERT 0 1 + + +We need to take note also of the container ip + + +> docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' 6cd4ba4696f2e8872f3787faaa8d03d1dae5cb5f22986648adf132823f3690eb +172.17.0.2 + + +=== Setup the connectors + +Open the SQL configuration file at `$EXAMPLES/sql/sql-source/config/CamelSqlSourceConnector.properties` + +[source] + +name=CamelSqlSourceConnector +connector.class=org.apache.camel.kafkaconnector.sql.CamelSqlSourceConnector +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.component.sql.dataSource.user=postgres +camel.component.sql.dataSource.password=mysecretpassword +camel.component.sql.dataSource.serverName=172.17.0.2 +camel.component.sql.dataSource=#class:org.postgresql.ds.PGSimpleDataSource + +camel.source.path.query=select * from accounts + + +and add the correct IP for the container. + +=== Running the example + +Run the kafka connect with the SQL Source connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/sql/sql-source/config/CamelSqlSourceConnector.properties + + +On a different terminal run the kafkacat consumer + +[source] + +> ./kafkacat -b localhost:9092 -t mytopic +% Auto-selecting Consumer mode (use -P or -C to override) +{user_id=1, username=andrea, city
[camel-kafka-connector-examples] branch master updated (494bb8d -> 97ab7c8)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. from 494bb8d Added SQL Source example add 97ab7c8 [SQS] Fix sqs sink typos No new revisions were added by this update. Summary of changes: aws2-sqs/aws2-sqs-sink/README.adoc | 2 +- .../aws2-sqs-sink/config/openshift/aws2-sqs-sink-connector.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel-kafka-connector-examples] branch sql-list created (now 46ffd03)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sql-list in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at 46ffd03 Added SQL source example to list No new revisions were added by this update.
[camel-kafka-connector-examples] branch master updated (494bb8d -> 97ab7c8)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. from 494bb8d Added SQL Source example add 97ab7c8 [SQS] Fix sqs sink typos No new revisions were added by this update. Summary of changes: aws2-sqs/aws2-sqs-sink/README.adoc | 2 +- .../aws2-sqs-sink/config/openshift/aws2-sqs-sink-connector.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel-kafka-connector-examples] branch master updated: Added SQL source example to list
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 648790b Added SQL source example to list 648790b is described below commit 648790b60925b7d070db21ac91e0e47b5b5405f8 Author: Andrea Cosentino AuthorDate: Tue Nov 3 12:24:27 2020 +0100 Added SQL source example to list --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index f35ff56..a2bd75a 100644 --- a/README.adoc +++ b/README.adoc @@ -20,6 +20,6 @@ List of existing examples: - NSQ source and sink examples - RabbitMQ source and sink examples - Slack source, sink and apicurio registry example -- SQL sink example +- SQL source and sink examples - Telegram source and sink examples - Twitter Search source example
[camel] branch regen_bot updated (59fc1bb -> 64efc7e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 59fc1bb CAMEL-15795: camel-core - Reduce tangle from impl engine to model add 64efc7e (chore) Remove unnecessary dependency from the ElasticSearch test infra (#4555) No new revisions were added by this update. Summary of changes: test-infra/camel-test-infra-elasticsearch/pom.xml | 5 - 1 file changed, 5 deletions(-)
[camel-website] branch asf-site updated (a6a133b -> 3e278bc)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard a6a133b Website updated to 5f7813774aac2db57aefc29b73df0b4537f5307c discard 9d00e32 Website updated to 1da92ff622 discard 67cbd4e Website updated to 55df093697 discard 5cbe745 Website updated to 273df1538a discard d5ecf0c Website updated to f07c9c59c2 discard 634559c Website updated to 3eb6ce9eff discard 29e672b Website updated to 5e55103941 discard 814e748 Website updated to e5edadb880 discard f8ed558 Website updated to f63e4124f1 discard afa5cbc Website updated to fefa5f3d7e discard a2ac1eb Updated the website to b19baea new ac83125 Updated the website to b19baea new 3e278bc Website updated to 5f7813774aac2db57aefc29b73df0b4537f5307c 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 (a6a133b) \ N -- N -- N refs/heads/asf-site (3e278bc) 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 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-karaf/latest/components.html |2 +- camel-karaf/latest/osgi-activator.html |4 +- sitemap-camel-k.xml| 154 +- sitemap-camel-kafka-connector.xml | 3292 sitemap-camel-karaf.xml| 28 +- sitemap-camel-quarkus-examples.xml | 24 +- sitemap-camel-quarkus.xml | 1290 +- sitemap-camel-spring-boot.xml | 1276 +- sitemap-components.xml | 4270 sitemap-manual.xml | 480 ++-- 10 files changed, 5410 insertions(+), 5410 deletions(-)
[camel-kafka-connector-examples] branch driver created (now e6cd7be)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch driver in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at e6cd7be Use latest postgresql driver with the same version of Camel 42.2.14 No new revisions were added by this update.
[camel-kafka-connector-examples] branch master updated: Use latest postgresql driver with the same version of Camel 42.2.14
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 3e4ecf5 Use latest postgresql driver with the same version of Camel 42.2.14 3e4ecf5 is described below commit 3e4ecf570f278a60782adb1f4e19ef7674e79731 Author: Andrea Cosentino AuthorDate: Tue Nov 3 14:08:05 2020 +0100 Use latest postgresql driver with the same version of Camel 42.2.14 --- sql/sql-sink/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql-sink/README.adoc b/sql/sql-sink/README.adoc index c0dd1d2..36358ff 100644 --- a/sql/sql-sink/README.adoc +++ b/sql/sql-sink/README.adoc @@ -35,7 +35,7 @@ There is also the need of the driver for this example [source] > cd /home/oscerd/connectors/camel-sql-kafka-connector/ -> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.4/postgresql-42.2.4.jar +> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.14/postgresql-42.2.14.jar === Configuring Kafka Connect
[camel-kafka-connector-examples] branch driver-source created (now 7173125)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch driver-source in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at 7173125 Use latest postgresql driver with the same version of Camel 42.2.14 3e4ecf5 No new revisions were added by this update.
[camel-kafka-connector-examples] branch master updated: Use latest postgresql driver with the same version of Camel 42.2.14 3e4ecf5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 989c9f6 Use latest postgresql driver with the same version of Camel 42.2.14 3e4ecf5 989c9f6 is described below commit 989c9f640f1ec07cf0d24dd198e2dc1b37a6b2de Author: Andrea Cosentino AuthorDate: Tue Nov 3 14:09:28 2020 +0100 Use latest postgresql driver with the same version of Camel 42.2.14 3e4ecf5 --- sql/sql-source/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql-source/README.adoc b/sql/sql-source/README.adoc index b727f5d..54e8ed6 100644 --- a/sql/sql-source/README.adoc +++ b/sql/sql-source/README.adoc @@ -35,7 +35,7 @@ There is also the need of the driver for this example [source] > cd /home/oscerd/connectors/camel-sql-kafka-connector/ -> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.4/postgresql-42.2.4.jar +> wget https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.14/postgresql-42.2.14.jar === Configuring Kafka Connect
[GitHub] [camel-k] astefanutti commented on issue #36: Document architecture
astefanutti commented on issue #36: URL: https://github.com/apache/camel-k/issues/36#issuecomment-720336623 I think the bulk of it is there: https://camel.apache.org/camel-k/latest/architecture/architecture.html. Let me close this. We can create more specific issues for the missing pieces if needed. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #4554: Make double checked locking in factory getter methods of AbstractCame…
oscerd commented on pull request #4554: URL: https://github.com/apache/camel/pull/4554#issuecomment-720739526 Cc @davsclaus This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #1980: Reenable Olingo4 integration test
jamesnetherton merged pull request #1980: URL: https://github.com/apache/camel-quarkus/pull/1980 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new issue #660: Add an extensible connector archetype with dataformat
oscerd opened a new issue #660: URL: https://github.com/apache/camel-kafka-connector/issues/660 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd merged pull request #655: Docs antora 0.6.x
oscerd merged pull request #655: URL: https://github.com/apache/camel-kafka-connector/pull/655 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on issue #1082: Add camel-k-quarkus example
astefanutti commented on issue #1082: URL: https://github.com/apache/camel-k/issues/1082#issuecomment-720326130 Now that Quarkus is the default runtime and will become the only runtime, would it make sense to close this? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] oscerd merged pull request #220: Updated archetype to unclude JUnit 5 test example
oscerd merged pull request #220: URL: https://github.com/apache/camel-spring-boot/pull/220 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #541: kamelet: ensure URL encoded values is properly handled
lburgazzoli merged pull request #541: URL: https://github.com/apache/camel-k-runtime/pull/541 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] nicolaferraro merged pull request #1793: #1283: Enhance the `kamel log` command to show more detail prior to i…
nicolaferraro merged pull request #1793: URL: https://github.com/apache/camel-k/pull/1793 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] unsortedhashsets opened a new pull request #659: Update azure-tests
unsortedhashsets opened a new pull request #659: URL: https://github.com/apache/camel-kafka-connector/pull/659 Hello, I have prepares some updates for azure-tests (mainly for blob) Blob: 1) fixed endpoint link 2) Consume function updated with retries loop due the fact of not instant response from real Azure service 3) Added verification of messages content 4) Added teardown function Blob+queue: 1) Kindly ask you to review issue #409, it seems to me that everything is Ok for now. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new pull request #658: Index.adoc should reflect nav.adoc
oscerd opened a new pull request #658: URL: https://github.com/apache/camel-kafka-connector/pull/658 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on issue #1798: Scalability of integration components in a non knative environment
astefanutti commented on issue #1798: URL: https://github.com/apache/camel-k/issues/1798#issuecomment-720305288 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] akihikokuroda commented on pull request #4541: [CAMEL-14003] Add Kubernetes component for the custom resource instance support
akihikokuroda commented on pull request #4541: URL: https://github.com/apache/camel/pull/4541#issuecomment-720686264 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a change in pull request #1787: WIP: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787: URL: https://github.com/apache/camel-k/pull/1787#discussion_r516092283 ## File path: pkg/trait/pod.go ## @@ -0,0 +1,100 @@ +/* +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 trait + +import ( + "fmt" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "k8s.io/api/policy/v1beta1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" +) + +// The PodDisruptionBudget trait is used to configure the pdb +// +// +camel-k:trait=pod +type podTrait struct { + BaseTrait `property:",squash"` + MaxUnavailable string `property:"max-unavailable" json:"maxUnavailable,omitempty"` + MinAvailable string `property:"min-available" json:"minAvailable,omitempty"` +} + +func newPodTrait() Trait { + return &podTrait{ + BaseTrait: NewBaseTrait("pod", 900), + } +} + +func (t *podTrait) Configure(e *Environment) (bool, error) { + if t.Enabled != nil && !*t.Enabled { + return false, nil + } + + return e.IntegrationInPhase( + v1.IntegrationPhaseDeploying, + v1.IntegrationPhaseRunning, + ), nil +} + +func (t *podTrait) Apply(e *Environment) error { + var err error + var pdb *v1beta1.PodDisruptionBudget Review comment: I think quick assignment can be used instead of declaring variables. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request #542: build(deps-dev): bump spock-core from 2.0-M3-groovy-3.0 to 2.0-M4-groovy-3.0
dependabot[bot] opened a new pull request #542: URL: https://github.com/apache/camel-k-runtime/pull/542 Bumps spock-core from 2.0-M3-groovy-3.0 to 2.0-M4-groovy-3.0. [](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] fizzet opened a new pull request #4556: CAMEL-15794: don't recreate SSL socket factory for every invocation
fizzet opened a new pull request #4556: URL: https://github.com/apache/camel/pull/4556 Create the configured SSLSocketFactory once and cache it in the endpoint instead of recreating it on every request. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti closed issue #1580: Error during unshare(...): Operation not permitted
astefanutti closed issue #1580: URL: https://github.com/apache/camel-k/issues/1580 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #1970: [CI] - Camel Master Branch Build Failure
github-actions[bot] commented on issue #1970: URL: https://github.com/apache/camel-quarkus/issues/1970#issuecomment-720804284 The [camel-master](https://github.com/apache/camel-quarkus/tree/camel-master) branch build is still failing: * Build ID: 342684936-90-81ecabba-ac5d-4bd2-944d-e3a33a600bfa * Camel Quarkus Commit: 04ad24ec6579491f154a15de20faf02d7616555e * Camel Master Commit: 03a9b37b41bc58e747729f5e894046bad0261ec0 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/342684936 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch master updated (5f78137 -> c2b5b1e)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from 5f78137 refactor: speedup relative links rule new 3e8d717 fix: extra comma in the JSON-LD data new c2b5b1e chore: add rule to check JSON-LD structured data 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: .htmlvalidate.json | 3 +- .../src/partials/breadcrumbs-microdata.hbs | 13 +++ rules.js | 40 +- 3 files changed, 48 insertions(+), 8 deletions(-)
[camel-website] 01/02: fix: extra comma in the JSON-LD data
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 3e8d717038d2fa0f6d1dc37dd20cc4cdbb9a798a Author: Zoran Regvart AuthorDate: Tue Nov 3 10:12:45 2020 +0100 fix: extra comma in the JSON-LD data We have an issue in the generated JSON-LD data, there is an extra comma being generated, and the URLs are not absolute (as the site.url no longer is). --- antora-ui-camel/src/partials/breadcrumbs-microdata.hbs | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs index 613bd1a..2c5badb 100644 --- a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs +++ b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs @@ -6,30 +6,31 @@ "@type": "ListItem", "position": 1, "name": "{{{site.title}}}", -"item": "{{{site.url}}}" +"item": "https://camel.apache.org/"; }, { "@type": "ListItem", "position": 2, "name": "{{{page.component.title}}}", -"item": "{{{add site.url page.component.url}}}" +"item": "https://camel.apache.org{{{page.component.url}}}"; }, { "@type": "ListItem", "position": 3, "name": "{{{page.componentVersion.displayVersion}}}", -"item": "{{{add site.url page.componentVersion.url}}}" +"item": "https://camel.apache.org{{{page.componentVersion.url}}}"; } {{#if page.breadcrumbs}} +, {{#each page.breadcrumbs}} -,{ +{ "@type": "ListItem", "position": {{add @index 4}}, "name": "{{{ ./content }}}", {{~#if (and ./url (eq ./urlType 'internal'))~}} -"item": "{{{add ../site.url ./url}}}" +"item": "https://camel.apache.org{{{./url}}}"; {{~else~}} -"item": "{{{add ../site.url ../page.componentVersion.url}}}" +"item": "https://camel.apache.org{{{../page.componentVersion.url}}}"; {{~/if~}} } {{#unless @last}}
[camel-website] 02/02: chore: add rule to check JSON-LD structured data
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit c2b5b1e287f433b2e261e65ced7073c6ebd3fc77 Author: Zoran Regvart AuthorDate: Tue Nov 3 13:49:19 2020 +0100 chore: add rule to check JSON-LD structured data --- .htmlvalidate.json | 3 ++- rules.js | 40 +++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.htmlvalidate.json b/.htmlvalidate.json index 1c69ddf..64899fb 100644 --- a/.htmlvalidate.json +++ b/.htmlvalidate.json @@ -12,6 +12,7 @@ "element-required-attributes": "off", "prefer-tbody": "off", "long-title": "off", -"camel/title": "error" +"camel/title": "error", +"camel/structured-data": "error" } } diff --git a/rules.js b/rules.js index 9271c3f..2bf21ec 100644 --- a/rules.js +++ b/rules.js @@ -49,9 +49,47 @@ class RelativeLinks extends Rule { } } +class StructuredData extends Rule { + documentation(context) { +return { + description: "Validates JSON-LD according to schema.org" +}; + } + + setup() { +let start = -1; + +this.on('tag:open', event => { + if (event.target.nodeName === 'script') { +start = event.target.location.offset; + } +}); + +this.on('tag:close', async event => { + const tag = event.previous; + if (event.target.nodeName === 'script' && tag.hasAttribute('type') && tag.getAttribute('type').value === 'application/ld+json') { +const startIdx = data.indexOf('>', start) + 1; +const endIdx = event.target.location.offset - 1; // omit the opening tag angled bracket +const content = data.substring(startIdx, endIdx); +try { + JSON.parse(content); +} catch (err) { + this.report(tag, `Unable to parse JSON-LD as JSON: ${err}`); +} + } +}); + } +} + +let data; + module.exports = { + setup(source) { +data = source.data; + }, rules: { "camel/title": HtmlTitle, -"camel/relative-links": RelativeLinks +"camel/relative-links": RelativeLinks, +"camel/structured-data": StructuredData } };
[GitHub] [camel-spring-boot-examples] oscerd merged pull request #26: Fix test with incorrect producerTemplate position
oscerd merged pull request #26: URL: https://github.com/apache/camel-spring-boot-examples/pull/26 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #1980: Reenable Olingo4 integration test
jamesnetherton opened a new pull request #1980: URL: https://github.com/apache/camel-quarkus/pull/1980 Fixes #1972 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek opened a new pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek opened a new pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984 Fixing build problems because of canges in camel-master (https://github.com/apache/camel/commit/75d61761b225d0fd92d16d4b3e3345b6f5dd36e7, https://github.com/apache/camel/commit/68cd5afe733c383c6c862bda1fa65244cf6dfa9a) Linked to https://issues.apache.org/jira/browse/CAMEL-15784 As I'm not 100% sure about fix of `BaseServiceResolver`, I'd suggest to wait for tests (it is camel-master) [ ] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #. [ ] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough. [ ] Phrases like Fix # or Fixes # will auto-close the named issue upon merging the pull request. Using them is typically a good idea. [ ] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request. [ ] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #151: Added SQL Source example
oscerd opened a new pull request #151: URL: https://github.com/apache/camel-kafka-connector-examples/pull/151 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #149: Added a SQL Sink example
oscerd opened a new pull request #149: URL: https://github.com/apache/camel-kafka-connector-examples/pull/149 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti edited a comment on issue #1798: Scalability of integration components in a non knative environment
astefanutti edited a comment on issue #1798: URL: https://github.com/apache/camel-k/issues/1798#issuecomment-721021227 There is currently no option to the `kamel run` subcommand to set the replicas count. That would make a good enhancement. Feel free to create an issue for that. It is possible to edit the Integration resource with `kubectl edit` or `kubectl patch`, e.g.: $ kubectl patch it my-integration -p '{"spec":{"replicas":2}}' This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #145: Added an AWS2 IAM sink example for creating a group
oscerd opened a new pull request #145: URL: https://github.com/apache/camel-kafka-connector-examples/pull/145 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] nicolaferraro opened a new pull request #1800: Fix #751: add guard to global operator
nicolaferraro opened a new pull request #1800: URL: https://github.com/apache/camel-k/pull/1800 **Release Note** ```release-note Added guard so that global and local operators can coexist in the same cluster ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #153: Use latest postgresql driver with the same version of Camel 42.2.14
oscerd opened a new pull request #153: URL: https://github.com/apache/camel-kafka-connector-examples/pull/153 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] lburgazzoli edited a comment on issue #1799: Implementing a global build strategy
lburgazzoli edited a comment on issue #1799: URL: https://github.com/apache/camel-k/issues/1799#issuecomment-720411881 I think we may need to revisit some of the options we have for kits, as example you can define properties, secrets and configmaps and you don't want to share them across tenants I guess. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #4551: Migrates the Couchbase test infrastructure
orpiske opened a new pull request #4551: URL: https://github.com/apache/camel/pull/4551 Move the Couchbase test infra from Camel Kafka Connector so it can be reused The tests are not migrated yet due to CAMEL-15789 - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd merged pull request #656: Added specific section in documentation related to archetype
oscerd merged pull request #656: URL: https://github.com/apache/camel-kafka-connector/pull/656 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] rafaljaw opened a new pull request #4552: CAMEL-15731: Add support for InOnly exchange pattern to camel-mllp
rafaljaw opened a new pull request #4552: URL: https://github.com/apache/camel/pull/4552 This change allows sending and receiving HL7 messages using MLLP without waiting or sending back any acknowledgment. This is possible when autoAck=false and exchangePattern=InOnly. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new pull request #661: Added a dataformat archetype for extending connectors
oscerd opened a new pull request #661: URL: https://github.com/apache/camel-kafka-connector/pull/661 Fixes #660 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd merged pull request #658: Index.adoc should reflect nav.adoc
oscerd merged pull request #658: URL: https://github.com/apache/camel-kafka-connector/pull/658 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on issue #1983: Data Format : Unable marshal LinkedHashMap to Protobuf
jamesnetherton commented on issue #1983: URL: https://github.com/apache/camel-quarkus/issues/1983#issuecomment-720953164 Shouldn't [this](https://github.com/weimeilin79/avroprotobuf/blob/master/camel-quarkus-restprotobuf/src/main/java/demo/camel/MyRouteBuilder.java#L26) be `unmarshal`? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] weimeilin79 opened a new issue #1983: Data Format : Unable marshal LinkedHashMap to Protobuf
weimeilin79 opened a new issue #1983: URL: https://github.com/apache/camel-quarkus/issues/1983 Making a simple demo on format convert, but was getting error msg: This works with java main, so I am assuming it's an Quarkus problem? ``` from("platform-http:/transfer?httpMethodRestrict=POST&consumes=application/json") .marshal().protobuf("demo.camel.TransactionProtos$Transaction") .toD("kafka:weborder?brokers=localhost:9092&groupId=producergroup&serializerClass=org.apache.kafka.common.serialization.ByteBufferSerializer&key=${header.sender}") ``` ``` org.apache.camel.NoTypeConversionAvailableException: No type converter available to convert from type: byte[] to the required type: com.google.protobuf.Message with value [B@2eeab517 at org.apache.camel.impl.converter.CoreTypeConverterRegistry.mandatoryConvertTo(CoreTypeConverterRegistry.java:220) at org.apache.camel.dataformat.protobuf.ProtobufDataFormat.convertGraphToMessage(ProtobufDataFormat.java:160) at org.apache.camel.dataformat.protobuf.ProtobufDataFormat.marshal(ProtobufDataFormat.java:129) at org.apache.camel.support.processor.MarshalProcessor.process(MarshalProcessor.java:64) at org.apache.camel.processor.errorhandler.RedeliveryErrorHandler$SimpleTask.run(RedeliveryErrorHandler.java:404) at org.apache.camel.impl.engine.DefaultReactiveExecutor$Worker.schedule(DefaultReactiveExecutor.java:148) at org.apache.camel.impl.engine.DefaultReactiveExecutor.scheduleMain(DefaultReactiveExecutor.java:60) at org.apache.camel.processor.Pipeline.process(Pipeline.java:147) at org.apache.camel.processor.CamelInternalProcessor.process(CamelInternalProcessor.java:288) at org.apache.camel.quarkus.component.platform.http.runtime.QuarkusPlatformHttpConsumer.lambda$handleRequest$2(QuarkusPlatformHttpConsumer.java:397) at io.vertx.core.impl.ContextImpl.lambda$executeBlocking$2(ContextImpl.java:313) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:834) ``` Project repo: Java Main: https://github.com/weimeilin79/avroprotobuf/tree/master/camel-demo-restprotobuf Quarkus: https://github.com/weimeilin79/avroprotobuf/tree/master/camel-quarkus-restprotobuf This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot-examples] fg78nc opened a new pull request #26: Fix test with incorrect producerTemplate position
fg78nc opened a new pull request #26: URL: https://github.com/apache/camel-spring-boot-examples/pull/26 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #4547: Added spring-boot archetype
oscerd commented on pull request #4547: URL: https://github.com/apache/camel/pull/4547#issuecomment-720245971 It's for 3.7.0, https://github.com/apache/camel-spring-boot/tree/master/archetypes/camel-archetype-spring-boot This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #4552: CAMEL-15731: Add support for InOnly exchange pattern to camel-mllp
davsclaus merged pull request #4552: URL: https://github.com/apache/camel/pull/4552 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new issue #663: Support Idempotency on the source side
oscerd opened a new issue #663: URL: https://github.com/apache/camel-kafka-connector/issues/663 We have this feature easily available in Camel, we can try to leverage it on our side. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #143: Added AWS2-IAM Example for deleting user
oscerd opened a new pull request #143: URL: https://github.com/apache/camel-kafka-connector-examples/pull/143 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd merged pull request #151: Added SQL Source example
oscerd merged pull request #151: URL: https://github.com/apache/camel-kafka-connector-examples/pull/151 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd merged pull request #144: Changed a bit the description for AWS2-IAM examples
oscerd merged pull request #144: URL: https://github.com/apache/camel-kafka-connector-examples/pull/144 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] mmelko commented on pull request #1787: WIP: Create PodDisruptionBudget for every integration
mmelko commented on pull request #1787: URL: https://github.com/apache/camel-k/pull/1787#issuecomment-720585915 Should that be in operator-role-kubernetes/openshift,yaml file ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new pull request #657: Added a page in docs related to basic configuration of camel kafka co…
oscerd opened a new pull request #657: URL: https://github.com/apache/camel-kafka-connector/pull/657 …nnector This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti closed issue #1231: helm.sh entries in go.sum
astefanutti closed issue #1231: URL: https://github.com/apache/camel-k/issues/1231 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #4555: (chore) Remove unnecessary dependency from the ElasticSearch test infra
orpiske opened a new pull request #4555: URL: https://github.com/apache/camel/pull/4555 - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #4546: [CAMEL-15748] nullify mqtt client on producer and consumer stop
davsclaus merged pull request #4546: URL: https://github.com/apache/camel/pull/4546 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch master updated: refactor: make git commands quiet
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new dda5214 refactor: make git commands quiet dda5214 is described below commit dda521493a7ff41fb6afb99340f7b5821d954153 Author: Zoran Regvart AuthorDate: Tue Nov 3 14:46:10 2020 +0100 refactor: make git commands quiet This makes the build log on CI easier to read. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7077d55..7c5e010 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -87,8 +87,8 @@ pipeline { dir('deploy/staging') { deleteDir() sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .' -sh 'git -c core.editor="sed -i 2,/$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/" rebase --interactive 1586f65bf7f24784dc99e22aff08e44c7dbb1920' // squash all but initial and last 9 commits -sh 'git rm -r *' +sh 'git -c core.editor="sed -i 2,/$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/" rebase -q --interactive 1586f65bf7f24784dc99e22aff08e44c7dbb1920' // squash all but initial and last 9 commits +sh 'git rm -q -r *' sh "cp -R $WORKSPACE/camel-website/public/. ." sh 'git add .' sh 'git commit -m "Website updated to $GIT_COMMIT"'
[GitHub] [camel-website] oscerd opened a new pull request #497: Publish camel-kafka-connector 0.6.x documentation
oscerd opened a new pull request #497: URL: https://github.com/apache/camel-website/pull/497 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on issue #1981: Mocking endpoints in camel-quarkus tests
jamesnetherton commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-720559807 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd merged pull request #661: Added a dataformat archetype for extending connectors
oscerd merged pull request #661: URL: https://github.com/apache/camel-kafka-connector/pull/661 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti closed issue #36: Document architecture
astefanutti closed issue #36: URL: https://github.com/apache/camel-k/issues/36 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on pull request #1980: Reenable Olingo4 integration test
jamesnetherton commented on pull request #1980: URL: https://github.com/apache/camel-quarkus/pull/1980#issuecomment-720298676 > The test service works again? Yes, there were some SSL cert issues which seem to be resolved. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] omarsmak commented on a change in pull request #4541: [CAMEL-14003] Add Kubernetes component for the custom resource instance support
omarsmak commented on a change in pull request #4541: URL: https://github.com/apache/camel/pull/4541#discussion_r515829456 ## File path: components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesConsumer.java ## @@ -0,0 +1,145 @@ +/* + * 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.component.kubernetes.customresources; + +import java.util.concurrent.ExecutorService; + +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watch; +import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; +import io.fabric8.kubernetes.client.dsl.internal.RawCustomResourceOperationsImpl; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; +import org.apache.camel.component.kubernetes.KubernetesConfiguration; +import org.apache.camel.component.kubernetes.KubernetesConstants; +import org.apache.camel.support.DefaultConsumer; +import org.apache.camel.util.ObjectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class KubernetesCustomResourcesConsumer extends DefaultConsumer { + +private static final Logger LOG = LoggerFactory.getLogger(KubernetesCustomResourcesConsumer.class); + +private final Processor processor; +private ExecutorService executor; +private CustomResourcesConsumerTask customResourcesWatcher; + +public KubernetesCustomResourcesConsumer(AbstractKubernetesEndpoint endpoint, Processor processor) { +super(endpoint, processor); +this.processor = processor; +} + +@Override +public AbstractKubernetesEndpoint getEndpoint() { +return (AbstractKubernetesEndpoint) super.getEndpoint(); +} + +@Override +protected void doStart() throws Exception { +super.doStart(); +executor = getEndpoint().createExecutor(); + +customResourcesWatcher = new CustomResourcesConsumerTask(); +executor.submit(customResourcesWatcher); +} + +@Override +protected void doStop() throws Exception { +super.doStop(); Review comment: INHO I'd stop the camel context last after stopping the executor ## File path: components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java ## @@ -0,0 +1,194 @@ +/* + * 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.component.kubernetes.customresources; + +import java.util.Map; + +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; +import org.apache.camel.Exchange; +import org.apache.camel.Message; +import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; +import org.apache.camel.component.kubernetes.KubernetesConstants; +import org.apache.camel.component.kubernetes.KubernetesOperations; +import org.apache.camel.support.DefaultProducer; +import org.apache.camel.support.MessageHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.json.JsonArray; +import org.apache.camel.util.json.JsonObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class KubernetesCustomResourcesProducer extends DefaultProd
[GitHub] [camel-website] zregvart merged pull request #417: CAMEL-14682: Upgrade to Yarn Berry
zregvart merged pull request #417: URL: https://github.com/apache/camel-website/pull/417 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] rschlegel-cc commented on issue #1981: Mocking endpoints in camel-quarkus tests
rschlegel-cc commented on issue #1981: URL: https://github.com/apache/camel-quarkus/issues/1981#issuecomment-721033489 Thanks for the quick response, this helps quite a bit. And just to be absolutely sure that I did not misunderstand anything: CamelTestSupport should not be used together with camel-quarkus, right? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd merged pull request #4553: Generated sources regen
oscerd merged pull request #4553: URL: https://github.com/apache/camel/pull/4553 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd merged pull request #146: AWS2-IAM create user sink example: Fixed refs
oscerd merged pull request #146: URL: https://github.com/apache/camel-kafka-connector-examples/pull/146 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] oscerd merged pull request #497: Publish camel-kafka-connector 0.6.x documentation
oscerd merged pull request #497: URL: https://github.com/apache/camel-website/pull/497 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] orpiske merged pull request #659: Update azure-tests
orpiske merged pull request #659: URL: https://github.com/apache/camel-kafka-connector/pull/659 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #150: Added SQL Sink to example list
oscerd opened a new pull request #150: URL: https://github.com/apache/camel-kafka-connector-examples/pull/150 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] rafaljaw commented on a change in pull request #4552: CAMEL-15731: Add support for InOnly exchange pattern to camel-mllp
rafaljaw commented on a change in pull request #4552: URL: https://github.com/apache/camel/pull/4552#discussion_r516442641 ## File path: components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java ## @@ -193,7 +194,14 @@ public synchronized void process(Exchange exchange) throws MllpException { mllpBuffer.resetSocket(socket); } } - +if (getConfiguration().getExchangePattern() == ExchangePattern.InOnly) { +log.debug("process({}) [{}] - not checking acknowledgement from external system", +exchange.getExchangeId(), socket); +if (exchange.getException() != null) { +exchange.getException().printStackTrace(); Review comment: Sorry, completely forgot to remove this. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org