[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #1988: WireMockTestResourceLifecycleManager improvements
jamesnetherton opened a new pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988 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] lburgazzoli opened a new issue #1989: [Camel 3.7] ass support for camel-atlasmap
lburgazzoli opened a new issue #1989: URL: https://github.com/apache/camel-quarkus/issues/1989 https://github.com/apache/camel/tree/master/components/camel-atlasmap 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] oscerd opened a new issue #1990: Support native for AWS2 Eventbridge extension
oscerd opened a new issue #1990: URL: https://github.com/apache/camel-quarkus/issues/1990 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 #1990: Support native for AWS2 Eventbridge extension
jamesnetherton commented on issue #1990: URL: https://github.com/apache/camel-quarkus/issues/1990#issuecomment-721576682 Duplicate of https://github.com/apache/camel-quarkus/issues/1976. 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] oscerd commented on issue #1990: Support native for AWS2 Eventbridge extension
oscerd commented on issue #1990: URL: https://github.com/apache/camel-quarkus/issues/1990#issuecomment-721577428 Sorry 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] oscerd commented on issue #1990: Support native for AWS2 Eventbridge extension
oscerd commented on issue #1990: URL: https://github.com/apache/camel-quarkus/issues/1990#issuecomment-721577527 Assigned #1976 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] oscerd closed issue #1990: Support native for AWS2 Eventbridge extension
oscerd closed issue #1990: URL: https://github.com/apache/camel-quarkus/issues/1990 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] branch regen_bot updated (0d8aa70 -> 860d39e)
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 0d8aa70 Fixed CS add 82b1d14 Upgrade Zipkin Reporter to version 2.15.4 add 3c864f0 Upgrade Brave to version 5.13.0 add 860d39e Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (860d39e -> 251dd93)
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 860d39e Sync deps add b62143a Polished add d27dd49 Polished add 251dd93 CAMEL-15802: camel-core - Optimize No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/impl/engine/DefaultRoute.java | 13 ++--- .../java/org/apache/camel/reifier/DynamicRouterReifier.java | 5 + 2 files changed, 7 insertions(+), 11 deletions(-)
[camel] branch master updated: CAMEL-15802: camel-core - Optimize
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 1f6716c CAMEL-15802: camel-core - Optimize 1f6716c is described below commit 1f6716c0c22906743e6f4bb09647ccc7b2df32f4 Author: Claus Ibsen AuthorDate: Wed Nov 4 09:38:41 2020 +0100 CAMEL-15802: camel-core - Optimize --- core/camel-api/src/main/java/org/apache/camel/Route.java | 11 ++- .../main/java/org/apache/camel/impl/engine/DefaultRoute.java | 11 --- .../java/org/apache/camel/processor/MulticastProcessor.java | 4 +--- 3 files changed, 7 insertions(+), 19 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 b40bbd3..9f14a1c 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 @@ -291,24 +291,25 @@ public interface Route extends RuntimeConfiguration { */ List getRoutePolicyList(); +// called at completion time void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory); +// called at runtime ErrorHandlerFactory getErrorHandlerFactory(); -Processor createErrorHandler(Processor processor) throws Exception; - -Collection getOnCompletions(); - // called at runtime -Processor getOnCompletion(String onCompletionId); +Collection getOnCompletions(); // called at completion time void setOnCompletion(String onCompletionId, Processor processor); +// called at runtime Collection getOnExceptions(); +// called at runtime Processor getOnException(String onExceptionId); +// called at completion time void setOnException(String onExceptionId, Processor processor); /** 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 bc66a03..d07ac95 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 @@ -31,7 +31,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Consumer; import org.apache.camel.Endpoint; import org.apache.camel.ErrorHandlerFactory; -import org.apache.camel.ExtendedCamelContext; import org.apache.camel.NamedNode; import org.apache.camel.Navigate; import org.apache.camel.Processor; @@ -107,11 +106,6 @@ public class DefaultRoute extends ServiceSupport implements Route { } @Override -public Processor createErrorHandler(Processor processor) throws Exception { -return camelContext.adapt(ExtendedCamelContext.class).createErrorHandler(this, processor); -} - -@Override public String getId() { return routeId; } @@ -499,11 +493,6 @@ public class DefaultRoute extends ServiceSupport implements Route { } @Override -public Processor getOnCompletion(String onCompletionId) { -return onCompletions.get(onCompletionId); -} - -@Override public void setOnCompletion(String onCompletionId, Processor processor) { onCompletions.put(onCompletionId, processor); } diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java index da1fbe1..a38c399 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -758,10 +758,8 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } LOG.trace("Creating error handler for: {}", processor); -// create error handler (create error handler directly to keep it light weight, -// instead of using ProcessorReifier.wrapInErrorHandler) try { -processor = route.createErrorHandler(processor); +processor = camelContext.adapt(ExtendedCamelContext.class).createErrorHandler(route, processor); // and wrap in unit of work processor so the copy exchange also can run under UoW answer = createUnitOfWorkProcessor(route, processor, exchange);
[GitHub] [camel-k] mmelko commented on a change in pull request #1787: WIP: Create PodDisruptionBudget for every integration
mmelko commented on a change in pull request #1787: URL: https://github.com/apache/camel-k/pull/1787#discussion_r517180694 ## File path: deploy/operator-role-olm.yaml ## @@ -47,6 +47,15 @@ rules: - patch - update - watch +- apiGroups: + - "policy" + resources: + - poddisruptionbudgets + verbs: + - create + - delete + - get + - update Review comment: actually `list` is missing too.. 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] ppalaga commented on a change in pull request #1988: WireMockTestResourceLifecycleManager improvements
ppalaga commented on a change in pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988#discussion_r517184827 ## File path: integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java ## @@ -78,30 +82,35 @@ */ @Override public void stop() { -if (server != null) { -LOG.info("Stopping WireMockServer"); -if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { -LOG.info("Stopping recording"); -SnapshotRecordResult recordResult = server.stopRecording(); - -List stubMappings = recordResult.getStubMappings(); -if (isDeleteRecordedMappingsOnError()) { -for (StubMapping mapping : stubMappings) { -int status = mapping.getResponse().getStatus(); -if (status >= 300 && mapping.shouldBePersisted()) { -try { -String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; -Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); -Files.deleteIfExists(mappingFilePath); -LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); -} catch (IOException e) { -LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +WireMockServer server = getServer(); +try { +if (server != null) { +LOG.info("Stopping WireMockServer"); +if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { +LOG.info("Stopping recording"); +SnapshotRecordResult recordResult = server.stopRecording(); + +List stubMappings = recordResult.getStubMappings(); +if (isDeleteRecordedMappingsOnError()) { +for (StubMapping mapping : stubMappings) { +int status = mapping.getResponse().getStatus(); +if (status >= 300 && mapping.shouldBePersisted()) { +try { +String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; +Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); +Files.deleteIfExists(mappingFilePath); +LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); +} catch (IOException e) { +LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +} } } } } +server.stop(); } -server.stop(); +} finally { +servers.remove(getServerKey()); Review comment: How is the caching supposed to work, when you remove the server on every stop()? I thought the cache was meant to keep the same server instance for multiple test classes referring to the same TestResourceLifecycleManager. Maybe you meant something different? 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] branch master updated: camel-jcache - Should init key expression in jcache policy.
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 d6f0f9d camel-jcache - Should init key expression in jcache policy. d6f0f9d is described below commit d6f0f9dcc19b3ab6e1820539f9de2dd98178404e Author: Claus Ibsen AuthorDate: Wed Nov 4 09:44:36 2020 +0100 camel-jcache - Should init key expression in jcache policy. --- .../apache/camel/component/jcache/policy/JCachePolicy.java | 6 ++ .../component/jcache/policy/JCachePolicyProcessor.java | 13 - 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java index 216ff6a..87d82d8 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java @@ -57,7 +57,7 @@ public class JCachePolicy implements Policy { @Override public void beforeWrap(Route route, NamedNode namedNode) { - +// noop } @Override @@ -105,9 +105,7 @@ public class JCachePolicy implements Policy { } -//Create processor -return new JCachePolicyProcessor(cache, keyExpression, processor); - +return new JCachePolicyProcessor(route.getCamelContext(), cache, keyExpression, processor); } public Cache getCache() { diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java index d9bacd0..d561d85 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java @@ -19,6 +19,7 @@ package org.apache.camel.component.jcache.policy; import javax.cache.Cache; import org.apache.camel.AsyncCallback; +import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.Processor; @@ -29,11 +30,13 @@ import org.slf4j.LoggerFactory; public class JCachePolicyProcessor extends DelegateAsyncProcessor { private static final Logger LOG = LoggerFactory.getLogger(JCachePolicyProcessor.class); +private final CamelContext camelContext; private Cache cache; private Expression keyExpression; -public JCachePolicyProcessor(Cache cache, Expression keyExpression, Processor processor) { +public JCachePolicyProcessor(CamelContext camelContext, Cache cache, Expression keyExpression, Processor processor) { super(processor); +this.camelContext = camelContext; this.cache = cache; this.keyExpression = keyExpression; } @@ -102,6 +105,14 @@ public class JCachePolicyProcessor extends DelegateAsyncProcessor { } @Override +protected void doInit() throws Exception { +super.doInit(); +if (keyExpression != null) { +keyExpression.init(camelContext); +} +} + +@Override protected void doStop() throws Exception { //Clear cache if stopping. if (!cache.isClosed()) {
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #1988: WireMockTestResourceLifecycleManager improvements
jamesnetherton commented on a change in pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988#discussion_r517192117 ## File path: integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java ## @@ -78,30 +82,35 @@ */ @Override public void stop() { -if (server != null) { -LOG.info("Stopping WireMockServer"); -if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { -LOG.info("Stopping recording"); -SnapshotRecordResult recordResult = server.stopRecording(); - -List stubMappings = recordResult.getStubMappings(); -if (isDeleteRecordedMappingsOnError()) { -for (StubMapping mapping : stubMappings) { -int status = mapping.getResponse().getStatus(); -if (status >= 300 && mapping.shouldBePersisted()) { -try { -String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; -Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); -Files.deleteIfExists(mappingFilePath); -LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); -} catch (IOException e) { -LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +WireMockServer server = getServer(); +try { +if (server != null) { +LOG.info("Stopping WireMockServer"); +if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { +LOG.info("Stopping recording"); +SnapshotRecordResult recordResult = server.stopRecording(); + +List stubMappings = recordResult.getStubMappings(); +if (isDeleteRecordedMappingsOnError()) { +for (StubMapping mapping : stubMappings) { +int status = mapping.getResponse().getStatus(); +if (status >= 300 && mapping.shouldBePersisted()) { +try { +String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; +Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); +Files.deleteIfExists(mappingFilePath); +LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); +} catch (IOException e) { +LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +} } } } } +server.stop(); } -server.stop(); +} finally { +servers.remove(getServerKey()); Review comment: If an integration test has multiple test classes annotated with `@TestResource(Foo.class)`. Then `start()` / `stop()` is only invoked once. I.e when the first test starts and the last test completes. 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 commented on pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek commented on pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#issuecomment-721610640 @ppalaga @jamesnetherton may I ask for help with this test failure? Problem is caused by the fact, that `BootstrapFactoryFinder` can not instantiate `FaultToleranceProcessor` which is caused probably by the fact that either resource `META-INF/services/org/apache/camel/model/CircuitBreakerDefinition` is missing or reflective registration for `org.apache.camel.component.resilience4j.ResilienceProcessorFactory` is missing. Fact is, that this code returns null in native - https://github.com/apache/camel/blob/master/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java#L110 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] rmannibucau opened a new pull request #4562: setting up basic OSGi-CDI metadata in the manifest
rmannibucau opened a new pull request #4562: URL: https://github.com/apache/camel/pull/4562 - [ ] 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. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] 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. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] 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
[camel] branch regen_bot updated (251dd93 -> 1f6716c)
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 251dd93 CAMEL-15802: camel-core - Optimize add 1f6716c CAMEL-15802: camel-core - Optimize No new revisions were added by this update. Summary of changes: core/camel-api/src/main/java/org/apache/camel/Route.java | 11 ++- .../main/java/org/apache/camel/impl/engine/DefaultRoute.java | 11 --- .../java/org/apache/camel/processor/MulticastProcessor.java | 4 +--- 3 files changed, 7 insertions(+), 19 deletions(-)
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #1988: WireMockTestResourceLifecycleManager improvements
ppalaga commented on a change in pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988#discussion_r517204637 ## File path: integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java ## @@ -78,30 +82,35 @@ */ @Override public void stop() { -if (server != null) { -LOG.info("Stopping WireMockServer"); -if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { -LOG.info("Stopping recording"); -SnapshotRecordResult recordResult = server.stopRecording(); - -List stubMappings = recordResult.getStubMappings(); -if (isDeleteRecordedMappingsOnError()) { -for (StubMapping mapping : stubMappings) { -int status = mapping.getResponse().getStatus(); -if (status >= 300 && mapping.shouldBePersisted()) { -try { -String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; -Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); -Files.deleteIfExists(mappingFilePath); -LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); -} catch (IOException e) { -LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +WireMockServer server = getServer(); +try { +if (server != null) { +LOG.info("Stopping WireMockServer"); +if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { +LOG.info("Stopping recording"); +SnapshotRecordResult recordResult = server.stopRecording(); + +List stubMappings = recordResult.getStubMappings(); +if (isDeleteRecordedMappingsOnError()) { +for (StubMapping mapping : stubMappings) { +int status = mapping.getResponse().getStatus(); +if (status >= 300 && mapping.shouldBePersisted()) { +try { +String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; +Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); +Files.deleteIfExists(mappingFilePath); +LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); +} catch (IOException e) { +LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +} } } } } +server.stop(); } -server.stop(); +} finally { +servers.remove(getServerKey()); Review comment: I see. Is the TestResourceLifecycleManager instance on which start() and stop() are called different? A comment somewhere would be nice so that future readers do not need to wonder. 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 pull request #4541: [CAMEL-14003] Add Kubernetes component for the custom resource instance support
omarsmak commented on pull request #4541: URL: https://github.com/apache/camel/pull/4541#issuecomment-721618818 Shall this be merged or further reviews needed @oscerd ? 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] astefanutti commented on a change in pull request #4562: [CAMEL-15725] setting up basic OSGi-CDI metadata in the manifest
astefanutti commented on a change in pull request #4562: URL: https://github.com/apache/camel/pull/4562#discussion_r517207009 ## File path: components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java ## @@ -21,11 +21,13 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.Vetoed; Review comment: IIRC, we did not used the `@Vetoed` annotation to maintain compatibility with CDI 1.0. It works because the default profile `weld-3.0` uses CDI 2.0, but other profiles may fail. That being said, we may want to consider dropping CDI 1.0 support. 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 #4541: [CAMEL-14003] Add Kubernetes component for the custom resource instance support
oscerd commented on pull request #4541: URL: https://github.com/apache/camel/pull/4541#issuecomment-721620048 To me it's fine. If you have time for merging it, go ahead :-) 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] branch master updated (d6f0f9d -> d47d974)
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 d6f0f9d camel-jcache - Should init key expression in jcache policy. add d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models No new revisions were added by this update. Summary of changes: .../org/apache/camel/ExtendedCamelContext.java | 7 + .../camel/impl/engine/AbstractCamelContext.java| 6 +- .../org/apache/camel/impl/engine/DefaultRoute.java | 4 - .../camel/impl/engine/SimpleCamelContext.java | 5 + .../org/apache/camel/impl/DefaultCamelContext.java | 323 - .../camel/impl/lw/LightweightCamelContext.java | 24 +- .../impl/lw/LightweightRuntimeCamelContext.java| 5 + 7 files changed, 272 insertions(+), 102 deletions(-)
[camel] branch master updated (d6f0f9d -> d47d974)
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 d6f0f9d camel-jcache - Should init key expression in jcache policy. add d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models No new revisions were added by this update. Summary of changes: .../org/apache/camel/ExtendedCamelContext.java | 7 + .../camel/impl/engine/AbstractCamelContext.java| 6 +- .../org/apache/camel/impl/engine/DefaultRoute.java | 4 - .../camel/impl/engine/SimpleCamelContext.java | 5 + .../org/apache/camel/impl/DefaultCamelContext.java | 323 - .../camel/impl/lw/LightweightCamelContext.java | 24 +- .../impl/lw/LightweightRuntimeCamelContext.java| 5 + 7 files changed, 272 insertions(+), 102 deletions(-)
[GitHub] [camel-quarkus] davsclaus commented on a change in pull request #1984: Fixing core build because of recent changes in camel master
davsclaus commented on a change in pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#discussion_r517209261 ## File path: extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java ## @@ -344,10 +345,11 @@ protected HeadersMapFactory createHeadersMapFactory() { @Override protected BeanProxyFactory createBeanProxyFactory() { -return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class) -.resolve(getCamelContextReference()) -.orElseThrow(() -> new IllegalArgumentException("Cannot find BeanProxyFactory on classpath. " -+ "Add camel-bean to classpath.")); +return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class, +getFactoryFinder(FactoryFinder.DEFAULT_PATH)) Review comment: That should be getBootstrapFactoryFinder for all these kinds where they are resolved once during bootstapping. The same for the other places where you changed. Thanks for fixing 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-quarkus] JiriOndrusek commented on pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek commented on pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#issuecomment-721621602 I was able to fix it by adding dependency into extension/microrofile-fault-tolerance: > >org.apache.camel > camel-resilience4j > and by registering service: >@BuildStep NativeImageResourceBuildItem initResources() { return new NativeImageResourceBuildItem( "META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"); } But I'm not sure if this is correct solution, WDYT? 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 commented on a change in pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek commented on a change in pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#discussion_r517210504 ## File path: extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java ## @@ -344,10 +345,11 @@ protected HeadersMapFactory createHeadersMapFactory() { @Override protected BeanProxyFactory createBeanProxyFactory() { -return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class) -.resolve(getCamelContextReference()) -.orElseThrow(() -> new IllegalArgumentException("Cannot find BeanProxyFactory on classpath. " -+ "Add camel-bean to classpath.")); +return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class, +getFactoryFinder(FactoryFinder.DEFAULT_PATH)) Review comment: oh, I'll fix it, thanks for the advice 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] davsclaus commented on pull request #1984: Fixing core build because of recent changes in camel master
davsclaus commented on pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#issuecomment-721623687 That should be this JAR https://github.com/apache/camel/tree/master/components/camel-microprofile-fault-tolerance This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] omarsmak merged pull request #4541: [CAMEL-14003] Add Kubernetes component for the custom resource instance support
omarsmak merged pull request #4541: URL: https://github.com/apache/camel/pull/4541 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] branch master updated (d47d974 -> 3933825)
This is an automated email from the ASF dual-hosted git repository. oalsafi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models add 9d312b3 Add kubernetes custom resource component add 7b1f5af undo some files add 83345d8 review comments add aece422 Fix style error add 3933825 review comments No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components.properties | 1 + ...llers.json => kubernetes-custom-resources.json} | 21 +- .../catalog/components/kubernetes-deployments.json | 5 + .../camel/catalog/components/kubernetes-hpa.json | 5 + .../camel/catalog/components/kubernetes-job.json | 5 + .../catalog/components/kubernetes-namespaces.json | 5 + .../camel/catalog/components/kubernetes-nodes.json | 5 + .../camel/catalog/components/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../catalog/components/kubernetes-services.json| 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../catalog/docs/kubernetes-hpa-component.adoc | 7 +- .../catalog/docs/kubernetes-job-component.adoc | 7 +- .../docs/kubernetes-namespaces-component.adoc | 7 +- .../catalog/docs/kubernetes-nodes-component.adoc | 7 +- .../catalog/docs/kubernetes-pods-component.adoc| 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../docs/kubernetes-services-component.adoc| 7 +- components/camel-kubernetes/pom.xml| 5 +- ...bernetesCustomResourcesComponentConfigurer.java | 69 + ...bernetesCustomResourcesEndpointConfigurer.java} | 35 ++- ...bernetesCustomResourcesEndpointUriFactory.java} | 13 +- .../KubernetesDeploymentsEndpointConfigurer.java | 25 ++ .../KubernetesDeploymentsEndpointUriFactory.java | 7 +- .../hpa/KubernetesHPAEndpointConfigurer.java | 25 ++ .../hpa/KubernetesHPAEndpointUriFactory.java | 7 +- .../job/KubernetesJobEndpointConfigurer.java | 25 ++ .../job/KubernetesJobEndpointUriFactory.java | 7 +- .../KubernetesNamespacesEndpointConfigurer.java| 25 ++ .../KubernetesNamespacesEndpointUriFactory.java| 7 +- .../nodes/KubernetesNodesEndpointConfigurer.java | 25 ++ .../nodes/KubernetesNodesEndpointUriFactory.java | 7 +- .../pods/KubernetesPodsEndpointConfigurer.java | 25 ++ .../pods/KubernetesPodsEndpointUriFactory.java | 7 +- ...esReplicationControllersEndpointConfigurer.java | 25 ++ ...esReplicationControllersEndpointUriFactory.java | 7 +- .../KubernetesServicesEndpointConfigurer.java | 25 ++ .../KubernetesServicesEndpointUriFactory.java | 7 +- .../services/org/apache/camel/component.properties | 2 +- .../camel/component/kubernetes-custom-resources| 2 + .../kubernetes-custom-resources-component | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources.json | 21 +- .../deployments/kubernetes-deployments.json| 5 + .../component/kubernetes/hpa/kubernetes-hpa.json | 5 + .../component/kubernetes/job/kubernetes-job.json | 5 + .../namespaces/kubernetes-namespaces.json | 5 + .../kubernetes/nodes/kubernetes-nodes.json | 5 + .../component/kubernetes/pods/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../kubernetes/services/kubernetes-services.json | 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../src/main/docs/kubernetes-hpa-component.adoc| 7 +- .../src/main/docs/kubernetes-job-component.adoc| 7 +- .../main/docs/kubernetes-namespaces-component.adoc | 7 +- .../src/main/docs/kubernetes-nodes-component.adoc | 7 +- .../src/main/docs/kubernetes-pods-component.adoc | 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../main/docs/kubernetes-services-component.adoc | 7 +- .../kubernetes/KubernetesConfiguration.java| 70 + .../component/kubernetes/KubernetesConstants.java | 10 + .../component/kubernetes/KubernetesOperations.java | 7 + .../KubernetesCustomResourcesComponent.java| 32 ++ .../KubernetesCustomResourcesConsumer.java | 151 + .../KubernetesCustomResourcesEndpoint.java | 51 +++ .../KubernetesCustomResourcesProducer.java | 234 ++ .../KubernetesCustomResourcesConsumerTest.java | 129 .../KubernetesCustomResourcesProducerTest.java | 186 +++ .../component/ComponentsBuilderFactory.java| 12 + ...etesCustomResourcesComponentBuilderFactory.java | 132 .../src/generated/resources/metadata.json | 22 ++ .../builder/endpoint/EndpointBuilderFactory.java | 1 + ..
[camel] branch master updated (d47d974 -> 3933825)
This is an automated email from the ASF dual-hosted git repository. oalsafi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models add 9d312b3 Add kubernetes custom resource component add 7b1f5af undo some files add 83345d8 review comments add aece422 Fix style error add 3933825 review comments No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components.properties | 1 + ...llers.json => kubernetes-custom-resources.json} | 21 +- .../catalog/components/kubernetes-deployments.json | 5 + .../camel/catalog/components/kubernetes-hpa.json | 5 + .../camel/catalog/components/kubernetes-job.json | 5 + .../catalog/components/kubernetes-namespaces.json | 5 + .../camel/catalog/components/kubernetes-nodes.json | 5 + .../camel/catalog/components/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../catalog/components/kubernetes-services.json| 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../catalog/docs/kubernetes-hpa-component.adoc | 7 +- .../catalog/docs/kubernetes-job-component.adoc | 7 +- .../docs/kubernetes-namespaces-component.adoc | 7 +- .../catalog/docs/kubernetes-nodes-component.adoc | 7 +- .../catalog/docs/kubernetes-pods-component.adoc| 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../docs/kubernetes-services-component.adoc| 7 +- components/camel-kubernetes/pom.xml| 5 +- ...bernetesCustomResourcesComponentConfigurer.java | 69 + ...bernetesCustomResourcesEndpointConfigurer.java} | 35 ++- ...bernetesCustomResourcesEndpointUriFactory.java} | 13 +- .../KubernetesDeploymentsEndpointConfigurer.java | 25 ++ .../KubernetesDeploymentsEndpointUriFactory.java | 7 +- .../hpa/KubernetesHPAEndpointConfigurer.java | 25 ++ .../hpa/KubernetesHPAEndpointUriFactory.java | 7 +- .../job/KubernetesJobEndpointConfigurer.java | 25 ++ .../job/KubernetesJobEndpointUriFactory.java | 7 +- .../KubernetesNamespacesEndpointConfigurer.java| 25 ++ .../KubernetesNamespacesEndpointUriFactory.java| 7 +- .../nodes/KubernetesNodesEndpointConfigurer.java | 25 ++ .../nodes/KubernetesNodesEndpointUriFactory.java | 7 +- .../pods/KubernetesPodsEndpointConfigurer.java | 25 ++ .../pods/KubernetesPodsEndpointUriFactory.java | 7 +- ...esReplicationControllersEndpointConfigurer.java | 25 ++ ...esReplicationControllersEndpointUriFactory.java | 7 +- .../KubernetesServicesEndpointConfigurer.java | 25 ++ .../KubernetesServicesEndpointUriFactory.java | 7 +- .../services/org/apache/camel/component.properties | 2 +- .../camel/component/kubernetes-custom-resources| 2 + .../kubernetes-custom-resources-component | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources.json | 21 +- .../deployments/kubernetes-deployments.json| 5 + .../component/kubernetes/hpa/kubernetes-hpa.json | 5 + .../component/kubernetes/job/kubernetes-job.json | 5 + .../namespaces/kubernetes-namespaces.json | 5 + .../kubernetes/nodes/kubernetes-nodes.json | 5 + .../component/kubernetes/pods/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../kubernetes/services/kubernetes-services.json | 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../src/main/docs/kubernetes-hpa-component.adoc| 7 +- .../src/main/docs/kubernetes-job-component.adoc| 7 +- .../main/docs/kubernetes-namespaces-component.adoc | 7 +- .../src/main/docs/kubernetes-nodes-component.adoc | 7 +- .../src/main/docs/kubernetes-pods-component.adoc | 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../main/docs/kubernetes-services-component.adoc | 7 +- .../kubernetes/KubernetesConfiguration.java| 70 + .../component/kubernetes/KubernetesConstants.java | 10 + .../component/kubernetes/KubernetesOperations.java | 7 + .../KubernetesCustomResourcesComponent.java| 32 ++ .../KubernetesCustomResourcesConsumer.java | 151 + .../KubernetesCustomResourcesEndpoint.java | 51 +++ .../KubernetesCustomResourcesProducer.java | 234 ++ .../KubernetesCustomResourcesConsumerTest.java | 129 .../KubernetesCustomResourcesProducerTest.java | 186 +++ .../component/ComponentsBuilderFactory.java| 12 + ...etesCustomResourcesComponentBuilderFactory.java | 132 .../src/generated/resources/metadata.json | 22 ++ .../builder/endpoint/EndpointBuilderFactory.java | 1 + ..
[camel] branch regen_bot updated (1f6716c -> d6f0f9d)
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 1f6716c CAMEL-15802: camel-core - Optimize add d6f0f9d camel-jcache - Should init key expression in jcache policy. No new revisions were added by this update. Summary of changes: .../apache/camel/component/jcache/policy/JCachePolicy.java | 6 ++ .../component/jcache/policy/JCachePolicyProcessor.java | 13 - 2 files changed, 14 insertions(+), 5 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #1988: WireMockTestResourceLifecycleManager improvements
jamesnetherton commented on a change in pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988#discussion_r517218920 ## File path: integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java ## @@ -78,30 +82,35 @@ */ @Override public void stop() { -if (server != null) { -LOG.info("Stopping WireMockServer"); -if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { -LOG.info("Stopping recording"); -SnapshotRecordResult recordResult = server.stopRecording(); - -List stubMappings = recordResult.getStubMappings(); -if (isDeleteRecordedMappingsOnError()) { -for (StubMapping mapping : stubMappings) { -int status = mapping.getResponse().getStatus(); -if (status >= 300 && mapping.shouldBePersisted()) { -try { -String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; -Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); -Files.deleteIfExists(mappingFilePath); -LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); -} catch (IOException e) { -LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +WireMockServer server = getServer(); +try { +if (server != null) { +LOG.info("Stopping WireMockServer"); +if (server.getRecordingStatus().getStatus().equals(RecordingStatus.Recording)) { +LOG.info("Stopping recording"); +SnapshotRecordResult recordResult = server.stopRecording(); + +List stubMappings = recordResult.getStubMappings(); +if (isDeleteRecordedMappingsOnError()) { +for (StubMapping mapping : stubMappings) { +int status = mapping.getResponse().getStatus(); +if (status >= 300 && mapping.shouldBePersisted()) { +try { +String fileName = mapping.getName() + "-" + mapping.getId() + ".json"; +Path mappingFilePath = Paths.get("./src/test/resources/mappings/", fileName); +Files.deleteIfExists(mappingFilePath); +LOG.infof("Deleted mapping file %s as status code was %d", fileName, status); +} catch (IOException e) { +LOG.errorf("Failed to delete mapping file %s", e, mapping.getName()); +} } } } } +server.stop(); } -server.stop(); +} finally { +servers.remove(getServerKey()); Review comment: > the TestResourceLifecycleManager instance on which start() and stop() are called different? No it's the same. I have tricked myself into thinking that caching was needed. It was something odd in the Geocoder tests that made me go down this path. Let me rework things a little. I can probably drop the first commit entirely... 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 commented on pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek commented on pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#issuecomment-721634291 @davsclaus thanks, the dependency was not required. I'll fix PR in a moment. 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] branch regen_bot updated (d6f0f9d -> d47d974)
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 d6f0f9d camel-jcache - Should init key expression in jcache policy. add d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models No new revisions were added by this update. Summary of changes: .../org/apache/camel/ExtendedCamelContext.java | 7 + .../camel/impl/engine/AbstractCamelContext.java| 6 +- .../org/apache/camel/impl/engine/DefaultRoute.java | 4 - .../camel/impl/engine/SimpleCamelContext.java | 5 + .../org/apache/camel/impl/DefaultCamelContext.java | 323 - .../camel/impl/lw/LightweightCamelContext.java | 24 +- .../impl/lw/LightweightRuntimeCamelContext.java| 5 + 7 files changed, 272 insertions(+), 102 deletions(-)
[camel] branch regen_bot updated (d47d974 -> 3933825)
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 d47d974 CAMEL-15802: camel-core - Optimize lightweight to unref all models add 9d312b3 Add kubernetes custom resource component add 7b1f5af undo some files add 83345d8 review comments add aece422 Fix style error add 3933825 review comments No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components.properties | 1 + ...llers.json => kubernetes-custom-resources.json} | 21 +- .../catalog/components/kubernetes-deployments.json | 5 + .../camel/catalog/components/kubernetes-hpa.json | 5 + .../camel/catalog/components/kubernetes-job.json | 5 + .../catalog/components/kubernetes-namespaces.json | 5 + .../camel/catalog/components/kubernetes-nodes.json | 5 + .../camel/catalog/components/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../catalog/components/kubernetes-services.json| 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../catalog/docs/kubernetes-hpa-component.adoc | 7 +- .../catalog/docs/kubernetes-job-component.adoc | 7 +- .../docs/kubernetes-namespaces-component.adoc | 7 +- .../catalog/docs/kubernetes-nodes-component.adoc | 7 +- .../catalog/docs/kubernetes-pods-component.adoc| 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../docs/kubernetes-services-component.adoc| 7 +- components/camel-kubernetes/pom.xml| 5 +- ...bernetesCustomResourcesComponentConfigurer.java | 69 + ...bernetesCustomResourcesEndpointConfigurer.java} | 35 ++- ...bernetesCustomResourcesEndpointUriFactory.java} | 13 +- .../KubernetesDeploymentsEndpointConfigurer.java | 25 ++ .../KubernetesDeploymentsEndpointUriFactory.java | 7 +- .../hpa/KubernetesHPAEndpointConfigurer.java | 25 ++ .../hpa/KubernetesHPAEndpointUriFactory.java | 7 +- .../job/KubernetesJobEndpointConfigurer.java | 25 ++ .../job/KubernetesJobEndpointUriFactory.java | 7 +- .../KubernetesNamespacesEndpointConfigurer.java| 25 ++ .../KubernetesNamespacesEndpointUriFactory.java| 7 +- .../nodes/KubernetesNodesEndpointConfigurer.java | 25 ++ .../nodes/KubernetesNodesEndpointUriFactory.java | 7 +- .../pods/KubernetesPodsEndpointConfigurer.java | 25 ++ .../pods/KubernetesPodsEndpointUriFactory.java | 7 +- ...esReplicationControllersEndpointConfigurer.java | 25 ++ ...esReplicationControllersEndpointUriFactory.java | 7 +- .../KubernetesServicesEndpointConfigurer.java | 25 ++ .../KubernetesServicesEndpointUriFactory.java | 7 +- .../services/org/apache/camel/component.properties | 2 +- .../camel/component/kubernetes-custom-resources| 2 + .../kubernetes-custom-resources-component | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources-endpoint | 2 + .../kubernetes-custom-resources.json | 21 +- .../deployments/kubernetes-deployments.json| 5 + .../component/kubernetes/hpa/kubernetes-hpa.json | 5 + .../component/kubernetes/job/kubernetes-job.json | 5 + .../namespaces/kubernetes-namespaces.json | 5 + .../kubernetes/nodes/kubernetes-nodes.json | 5 + .../component/kubernetes/pods/kubernetes-pods.json | 5 + .../kubernetes-replication-controllers.json| 5 + .../kubernetes/services/kubernetes-services.json | 5 + .../docs/kubernetes-deployments-component.adoc | 7 +- .../src/main/docs/kubernetes-hpa-component.adoc| 7 +- .../src/main/docs/kubernetes-job-component.adoc| 7 +- .../main/docs/kubernetes-namespaces-component.adoc | 7 +- .../src/main/docs/kubernetes-nodes-component.adoc | 7 +- .../src/main/docs/kubernetes-pods-component.adoc | 7 +- ...bernetes-replication-controllers-component.adoc | 7 +- .../main/docs/kubernetes-services-component.adoc | 7 +- .../kubernetes/KubernetesConfiguration.java| 70 + .../component/kubernetes/KubernetesConstants.java | 10 + .../component/kubernetes/KubernetesOperations.java | 7 + .../KubernetesCustomResourcesComponent.java| 32 ++ .../KubernetesCustomResourcesConsumer.java | 151 + .../KubernetesCustomResourcesEndpoint.java | 51 +++ .../KubernetesCustomResourcesProducer.java | 234 ++ .../KubernetesCustomResourcesConsumerTest.java | 129 .../KubernetesCustomResourcesProducerTest.java | 186 +++ .../component/ComponentsBuilderFactory.java| 12 + ...etesCustomResourcesComponentBuilderFactory.java | 132 .../src/generated/resources/metadata.json | 22 ++ .../builder/endpoint/EndpointBuilderFactory.java | 1
[camel] 02/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 00e591af50679defd96e59bc903a2499a25e5984 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:19:24 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen --- .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 21 +++--- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 1 - .../aws2/sqs/client/Sqs2InternalClient.java| 4 +- .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 7 +- .../sqs/client/impl/Sqs2ClientStandardImpl.java| 6 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 14 files changed, 141 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc index affd4c1..b79bc60 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc @@ -43,7 +43,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are listed below. +The AWS 2 Simple Queue Service (SQS) component supports 41 options, which are listed below. @@ -60,6 +60,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int @@ -119,7 +120,7 @@ with the following path and query parameters: |=== -=== Query Parameters (60 parameters): +=== Query Parameters (61 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -135,6 +136,7 @@ with the following path and query parameters: | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pi
[camel] branch master updated (3933825 -> ba562a7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 3933825 review comments new baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS new 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen new ba562a7 Catalog regen 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: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 31 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 239 insertions(+), 68 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (54%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[camel] 03/03: Catalog regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba562a77698c82583c4d596f5945aa2da65df048 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:30:42 2020 +0100 Catalog regen --- .../resources/org/apache/camel/catalog/components/aws2-sqs.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json index 465eef5..e396361 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json @@ -32,6 +32,7 @@ "queueOwnerAWSAccountId": { "kind": "property", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...] "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, +"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to [...] "attributeNames": { "kind": "property", "displayName": "Attribute Names", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma." }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Allows you to use multiple threads to poll the sqs queue to increase throughput" }, @@ -75,6 +76,7 @@ "queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "co
[camel] 01/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit baed3560c6e7bb263500f2190c7a52cbd02d08f0 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:03:02 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS --- .../component/aws2/sqs/Sqs2Configuration.java | 18 ++- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 5 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 38 ++ .../aws2/sqs/client/Sqs2InternalClient.java| 30 + .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 102 +++ .../sqs/client/impl/Sqs2ClientStandardImpl.java| 138 + 6 files changed, 329 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java index 37d69a0..3d56e14 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java @@ -111,6 +111,9 @@ public class Sqs2Configuration implements Cloneable { // Likely used only for testing @UriParam(defaultValue = "https") private String protocol = "https"; + +@UriParam(defaultValue = "false") +private boolean useIAMCredentials; /** * Whether or not the queue is a FIFO queue @@ -567,12 +570,25 @@ public class Sqs2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + +public boolean isUseIAMCredentials() { + return useIAMCredentials; + } + +/** + * Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to + * be passed in. + */ + public void setUseIAMCredentials(boolean useIAMCredentials) { + this.useIAMCredentials = useIAMCredentials; + } + // * // // * -public Sqs2Configuration copy() { + public Sqs2Configuration copy() { try { return (Sqs2Configuration) super.clone(); } catch (CloneNotSupportedException e) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index a8106c5..1ec1b67 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -28,6 +28,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory; +import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; @@ -152,7 +154,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS @Override protected void doInit() throws Exception { super.doInit(); -client = getConfiguration().getAmazonSQSClient() != null ? getConfiguration().getAmazonSQSClient() : getClient(); +client = configuration.getAmazonSQSClient() != null +? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient(); // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java new file mode 100644 index 000..3f96011 --- /dev/null +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -0,0 +1,38 @@ +/* + * 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://
[camel] 03/03: Catalog regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba562a77698c82583c4d596f5945aa2da65df048 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:30:42 2020 +0100 Catalog regen --- .../resources/org/apache/camel/catalog/components/aws2-sqs.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json index 465eef5..e396361 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json @@ -32,6 +32,7 @@ "queueOwnerAWSAccountId": { "kind": "property", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...] "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, +"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to [...] "attributeNames": { "kind": "property", "displayName": "Attribute Names", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma." }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Allows you to use multiple threads to poll the sqs queue to increase throughput" }, @@ -75,6 +76,7 @@ "queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "co
[camel] 02/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 00e591af50679defd96e59bc903a2499a25e5984 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:19:24 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen --- .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 21 +++--- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 1 - .../aws2/sqs/client/Sqs2InternalClient.java| 4 +- .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 7 +- .../sqs/client/impl/Sqs2ClientStandardImpl.java| 6 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 14 files changed, 141 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc index affd4c1..b79bc60 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc @@ -43,7 +43,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are listed below. +The AWS 2 Simple Queue Service (SQS) component supports 41 options, which are listed below. @@ -60,6 +60,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int @@ -119,7 +120,7 @@ with the following path and query parameters: |=== -=== Query Parameters (60 parameters): +=== Query Parameters (61 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -135,6 +136,7 @@ with the following path and query parameters: | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pi
[camel] branch master updated (3933825 -> ba562a7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 3933825 review comments new baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS new 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen new ba562a7 Catalog regen 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: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 31 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 239 insertions(+), 68 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (54%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[camel] 01/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit baed3560c6e7bb263500f2190c7a52cbd02d08f0 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:03:02 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS --- .../component/aws2/sqs/Sqs2Configuration.java | 18 ++- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 5 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 38 ++ .../aws2/sqs/client/Sqs2InternalClient.java| 30 + .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 102 +++ .../sqs/client/impl/Sqs2ClientStandardImpl.java| 138 + 6 files changed, 329 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java index 37d69a0..3d56e14 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java @@ -111,6 +111,9 @@ public class Sqs2Configuration implements Cloneable { // Likely used only for testing @UriParam(defaultValue = "https") private String protocol = "https"; + +@UriParam(defaultValue = "false") +private boolean useIAMCredentials; /** * Whether or not the queue is a FIFO queue @@ -567,12 +570,25 @@ public class Sqs2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + +public boolean isUseIAMCredentials() { + return useIAMCredentials; + } + +/** + * Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to + * be passed in. + */ + public void setUseIAMCredentials(boolean useIAMCredentials) { + this.useIAMCredentials = useIAMCredentials; + } + // * // // * -public Sqs2Configuration copy() { + public Sqs2Configuration copy() { try { return (Sqs2Configuration) super.clone(); } catch (CloneNotSupportedException e) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index a8106c5..1ec1b67 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -28,6 +28,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory; +import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; @@ -152,7 +154,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS @Override protected void doInit() throws Exception { super.doInit(); -client = getConfiguration().getAmazonSQSClient() != null ? getConfiguration().getAmazonSQSClient() : getClient(); +client = configuration.getAmazonSQSClient() != null +? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient(); // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java new file mode 100644 index 000..3f96011 --- /dev/null +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -0,0 +1,38 @@ +/* + * 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://
[camel] 02/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 00e591af50679defd96e59bc903a2499a25e5984 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:19:24 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen --- .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 21 +++--- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 1 - .../aws2/sqs/client/Sqs2InternalClient.java| 4 +- .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 7 +- .../sqs/client/impl/Sqs2ClientStandardImpl.java| 6 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 14 files changed, 141 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc index affd4c1..b79bc60 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc @@ -43,7 +43,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are listed below. +The AWS 2 Simple Queue Service (SQS) component supports 41 options, which are listed below. @@ -60,6 +60,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int @@ -119,7 +120,7 @@ with the following path and query parameters: |=== -=== Query Parameters (60 parameters): +=== Query Parameters (61 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -135,6 +136,7 @@ with the following path and query parameters: | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pi
[camel] 03/03: Catalog regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba562a77698c82583c4d596f5945aa2da65df048 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:30:42 2020 +0100 Catalog regen --- .../resources/org/apache/camel/catalog/components/aws2-sqs.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json index 465eef5..e396361 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json @@ -32,6 +32,7 @@ "queueOwnerAWSAccountId": { "kind": "property", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...] "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, +"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to [...] "attributeNames": { "kind": "property", "displayName": "Attribute Names", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma." }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Allows you to use multiple threads to poll the sqs queue to increase throughput" }, @@ -75,6 +76,7 @@ "queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "co
[camel] 01/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit baed3560c6e7bb263500f2190c7a52cbd02d08f0 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:03:02 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS --- .../component/aws2/sqs/Sqs2Configuration.java | 18 ++- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 5 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 38 ++ .../aws2/sqs/client/Sqs2InternalClient.java| 30 + .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 102 +++ .../sqs/client/impl/Sqs2ClientStandardImpl.java| 138 + 6 files changed, 329 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java index 37d69a0..3d56e14 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java @@ -111,6 +111,9 @@ public class Sqs2Configuration implements Cloneable { // Likely used only for testing @UriParam(defaultValue = "https") private String protocol = "https"; + +@UriParam(defaultValue = "false") +private boolean useIAMCredentials; /** * Whether or not the queue is a FIFO queue @@ -567,12 +570,25 @@ public class Sqs2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + +public boolean isUseIAMCredentials() { + return useIAMCredentials; + } + +/** + * Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to + * be passed in. + */ + public void setUseIAMCredentials(boolean useIAMCredentials) { + this.useIAMCredentials = useIAMCredentials; + } + // * // // * -public Sqs2Configuration copy() { + public Sqs2Configuration copy() { try { return (Sqs2Configuration) super.clone(); } catch (CloneNotSupportedException e) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index a8106c5..1ec1b67 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -28,6 +28,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory; +import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; @@ -152,7 +154,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS @Override protected void doInit() throws Exception { super.doInit(); -client = getConfiguration().getAmazonSQSClient() != null ? getConfiguration().getAmazonSQSClient() : getClient(); +client = configuration.getAmazonSQSClient() != null +? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient(); // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java new file mode 100644 index 000..3f96011 --- /dev/null +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -0,0 +1,38 @@ +/* + * 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://
[camel] branch master updated (3933825 -> ba562a7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 3933825 review comments new baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS new 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen new ba562a7 Catalog regen 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: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 31 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 239 insertions(+), 68 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (54%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #163: Added an AWS2-IAM Sink connector example for deleting a group
oscerd opened a new pull request #163: URL: https://github.com/apache/camel-kafka-connector-examples/pull/163 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 #163: Added an AWS2-IAM Sink connector example for deleting a group
oscerd merged pull request #163: URL: https://github.com/apache/camel-kafka-connector-examples/pull/163 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] branch master updated (3933825 -> ba562a7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 3933825 review comments new baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS new 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen new ba562a7 Catalog regen 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: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 31 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 239 insertions(+), 68 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (54%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[camel] 03/03: Catalog regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba562a77698c82583c4d596f5945aa2da65df048 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:30:42 2020 +0100 Catalog regen --- .../resources/org/apache/camel/catalog/components/aws2-sqs.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json index 465eef5..e396361 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json @@ -32,6 +32,7 @@ "queueOwnerAWSAccountId": { "kind": "property", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...] "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, +"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to [...] "attributeNames": { "kind": "property", "displayName": "Attribute Names", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma." }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Allows you to use multiple threads to poll the sqs queue to increase throughput" }, @@ -75,6 +76,7 @@ "queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "co
[camel] 02/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 00e591af50679defd96e59bc903a2499a25e5984 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:19:24 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen --- .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 21 +++--- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 1 - .../aws2/sqs/client/Sqs2InternalClient.java| 4 +- .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 7 +- .../sqs/client/impl/Sqs2ClientStandardImpl.java| 6 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 14 files changed, 141 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc index affd4c1..b79bc60 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc @@ -43,7 +43,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are listed below. +The AWS 2 Simple Queue Service (SQS) component supports 41 options, which are listed below. @@ -60,6 +60,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int @@ -119,7 +120,7 @@ with the following path and query parameters: |=== -=== Query Parameters (60 parameters): +=== Query Parameters (61 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -135,6 +136,7 @@ with the following path and query parameters: | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pi
[camel] 01/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit baed3560c6e7bb263500f2190c7a52cbd02d08f0 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:03:02 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS --- .../component/aws2/sqs/Sqs2Configuration.java | 18 ++- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 5 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 38 ++ .../aws2/sqs/client/Sqs2InternalClient.java| 30 + .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 102 +++ .../sqs/client/impl/Sqs2ClientStandardImpl.java| 138 + 6 files changed, 329 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java index 37d69a0..3d56e14 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java @@ -111,6 +111,9 @@ public class Sqs2Configuration implements Cloneable { // Likely used only for testing @UriParam(defaultValue = "https") private String protocol = "https"; + +@UriParam(defaultValue = "false") +private boolean useIAMCredentials; /** * Whether or not the queue is a FIFO queue @@ -567,12 +570,25 @@ public class Sqs2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + +public boolean isUseIAMCredentials() { + return useIAMCredentials; + } + +/** + * Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to + * be passed in. + */ + public void setUseIAMCredentials(boolean useIAMCredentials) { + this.useIAMCredentials = useIAMCredentials; + } + // * // // * -public Sqs2Configuration copy() { + public Sqs2Configuration copy() { try { return (Sqs2Configuration) super.clone(); } catch (CloneNotSupportedException e) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index a8106c5..1ec1b67 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -28,6 +28,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory; +import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; @@ -152,7 +154,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS @Override protected void doInit() throws Exception { super.doInit(); -client = getConfiguration().getAmazonSQSClient() != null ? getConfiguration().getAmazonSQSClient() : getClient(); +client = configuration.getAmazonSQSClient() != null +? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient(); // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java new file mode 100644 index 000..3f96011 --- /dev/null +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -0,0 +1,38 @@ +/* + * 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://
[camel-kafka-connector-examples] branch master updated: Added an AWS2-IAM Sink connector example for deleting a group
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 be75a2b Added an AWS2-IAM Sink connector example for deleting a group be75a2b is described below commit be75a2b9a71b6efda41fceaad7b7f3bffcc78c6e Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:40:02 2020 +0100 Added an AWS2-IAM Sink connector example for deleting a group --- aws2-iam/aws2-iam-sink-delete-group/README.adoc| 85 ++ .../config/CamelAWS2IAMSinkConnector.properties| 31 2 files changed, 116 insertions(+) diff --git a/aws2-iam/aws2-iam-sink-delete-group/README.adoc b/aws2-iam/aws2-iam-sink-delete-group/README.adoc new file mode 100644 index 000..6b62bb3 --- /dev/null +++ b/aws2-iam/aws2-iam-sink-delete-group/README.adoc @@ -0,0 +1,85 @@ += Camel-Kafka-connector AWS2 IAM Sink for deleting a group + +This is an example for Camel-Kafka-connector AWS2-IAM Sink for deleting a group + +== Standalone + +=== What is needed + +- An AWS Account +- An existing group on you AWS IAM account + +=== 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-aws2-iam-kafka-connector/0.6.0/camel-aws2-iam-kafka-connector-0.6.0-package.zip +> unzip camel-aws2-iam-kafka-connector-0.6.0-package.zip + + +=== 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 connectors + +Open the AWS2 IAM configuration file at `$EXAMPLES/aws2-iam/aws2-iam-sink-create-group/config/CamelAWS2IAMSinkConnector.properties` + +[source] + +name=CamelAWS2IAMSinkConnector +connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnector +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.sink.path.label=iam-point + +camel.component.aws2-iam.operation=deleteGroup + +camel.component.aws2-iam.access-key= +camel.component.aws2-iam.secret-key= +camel.component.aws2-iam.region=aws-global + + +and add the correct credentials for AWS. + +=== Running the example + +Run the kafka connect with the IAM Sink connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/aws2-iam/aws2-iam-sink/config/CamelAWS2IAMSinkConnector.properties + + +On a different terminal run the kafkacat producer and send the following message + +[source] + +> echo "Test1" | ./kafkacat -b localhost:9092 -t mytopic -H "CamelHeader.CamelAwsIAMGroupName=Camel" + + +On your AWS IAM console, you should see the group called Camel deleted. diff --git a/aws2-iam/aws2-iam-sink-delete-group/config/CamelAWS2IAMSinkConnector.properties b/aws2-iam/aws2-iam-sink-delete-group/config/CamelAWS2IAMSinkConnector.properties new file mode 100644 index 000..cbdf5b3 --- /dev/null +++ b/aws2-iam/aws2-iam-sink-delete-group/config/CamelAWS2IAMSinkConnector.properties @@ -0,0 +1,31 @@ +# +# 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. +# + +name=CamelAWS2IAMSinkConnector +connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnector +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.sink.path.label
[camel-kafka-connector-examples] branch iam-delete-group created (now 6b8fd8f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch iam-delete-group in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at 6b8fd8f Added an AWS2-IAM Sink connector example for deleting a group No new revisions were added by this update.
[camel] 03/03: Catalog regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba562a77698c82583c4d596f5945aa2da65df048 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:30:42 2020 +0100 Catalog regen --- .../resources/org/apache/camel/catalog/components/aws2-sqs.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json index 465eef5..e396361 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json @@ -32,6 +32,7 @@ "queueOwnerAWSAccountId": { "kind": "property", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...] "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, +"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to [...] "attributeNames": { "kind": "property", "displayName": "Attribute Names", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma." }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Allows you to use multiple threads to poll the sqs queue to increase throughput" }, @@ -75,6 +76,7 @@ "queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue Owner AWSAccount Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the queue owner aws account id when you need to connect the queue with different account owner." }, "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "co
[camel] 02/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 00e591af50679defd96e59bc903a2499a25e5984 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:19:24 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen --- .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 21 +++--- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 1 - .../aws2/sqs/client/Sqs2InternalClient.java| 4 +- .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 7 +- .../sqs/client/impl/Sqs2ClientStandardImpl.java| 6 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 14 files changed, 141 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc index affd4c1..b79bc60 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc @@ -43,7 +43,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are listed below. +The AWS 2 Simple Queue Service (SQS) component supports 41 options, which are listed below. @@ -60,6 +60,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int @@ -119,7 +120,7 @@ with the following path and query parameters: |=== -=== Query Parameters (60 parameters): +=== Query Parameters (61 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -135,6 +136,7 @@ with the following path and query parameters: | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean +| *useIAMCredentials* (common) | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | boolean | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pi
[camel] branch master updated (3933825 -> ba562a7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 3933825 review comments new baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS new 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen new ba562a7 Catalog regen 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: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 31 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 239 insertions(+), 68 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (54%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[camel] 01/03: CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit baed3560c6e7bb263500f2190c7a52cbd02d08f0 Author: Andrea Cosentino AuthorDate: Wed Nov 4 09:03:02 2020 +0100 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS --- .../component/aws2/sqs/Sqs2Configuration.java | 18 ++- .../camel/component/aws2/sqs/Sqs2Endpoint.java | 5 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 38 ++ .../aws2/sqs/client/Sqs2InternalClient.java| 30 + .../sqs/client/impl/Sqs2ClientIAMOptimized.java| 102 +++ .../sqs/client/impl/Sqs2ClientStandardImpl.java| 138 + 6 files changed, 329 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java index 37d69a0..3d56e14 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java @@ -111,6 +111,9 @@ public class Sqs2Configuration implements Cloneable { // Likely used only for testing @UriParam(defaultValue = "https") private String protocol = "https"; + +@UriParam(defaultValue = "false") +private boolean useIAMCredentials; /** * Whether or not the queue is a FIFO queue @@ -567,12 +570,25 @@ public class Sqs2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + +public boolean isUseIAMCredentials() { + return useIAMCredentials; + } + +/** + * Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to + * be passed in. + */ + public void setUseIAMCredentials(boolean useIAMCredentials) { + this.useIAMCredentials = useIAMCredentials; + } + // * // // * -public Sqs2Configuration copy() { + public Sqs2Configuration copy() { try { return (Sqs2Configuration) super.clone(); } catch (CloneNotSupportedException e) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index a8106c5..1ec1b67 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -28,6 +28,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory; +import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; @@ -152,7 +154,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS @Override protected void doInit() throws Exception { super.doInit(); -client = getConfiguration().getAmazonSQSClient() != null ? getConfiguration().getAmazonSQSClient() : getClient(); +client = configuration.getAmazonSQSClient() != null +? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient(); // check the setting the headerFilterStrategy if (headerFilterStrategy == null) { diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java new file mode 100644 index 000..3f96011 --- /dev/null +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -0,0 +1,38 @@ +/* + * 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://
[GitHub] [camel-quarkus] aldettinger opened a new pull request #1991: Added nagios native support #1726
aldettinger opened a new pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991 [ ] 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
[camel] branch master updated: Camel-AWS2-SQS: Fixed CS
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b235fe1 Camel-AWS2-SQS: Fixed CS b235fe1 is described below commit b235fe12f694bb812e2a8f20b4d3a3df25869ef5 Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:53:49 2020 +0100 Camel-AWS2-SQS: Fixed CS --- .../org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java index 3f96011..b7acba3 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java @@ -25,6 +25,9 @@ import org.apache.camel.component.aws2.sqs.client.impl.Sqs2ClientStandardImpl; */ public final class Sqs2ClientFactory { +private Sqs2ClientFactory() { +} + /** * Return the correct aws SQS client (based on remote vs local). *
[camel] 02/02: Camel-AWS2-S3: No need to raise an exception if the factory will be instantiated
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 0310609ed39f1a4c94bee951f5f1d562913a221e Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:56:40 2020 +0100 Camel-AWS2-S3: No need to raise an exception if the factory will be instantiated --- .../apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java| 4 1 file changed, 4 deletions(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java index f65c298..7af9443 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java @@ -26,10 +26,6 @@ import org.apache.camel.component.aws2.s3.client.impl.AWS2S3ClientStandardImpl; public final class AWS2S3ClientFactory { private AWS2S3ClientFactory() { -// Prevent instantiation of this factory class. -throw new RuntimeException( -"Do not instantiate a Factory class! Refer to the class " - + "to learn how to properly use this factory implementation."); } /**
[camel] branch master updated (b235fe1 -> 0310609)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b235fe1 Camel-AWS2-SQS: Fixed CS new 3c82859 Camel-AWS2-S3: Fixed javadoc a bit new 0310609 Camel-AWS2-S3: No need to raise an exception if the factory will be instantiated The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java | 2 +- .../apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java| 4 2 files changed, 1 insertion(+), 5 deletions(-)
[camel] 01/02: Camel-AWS2-S3: Fixed javadoc a bit
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 3c828592ada920481797e076837139306aa4606c Author: Andrea Cosentino AuthorDate: Wed Nov 4 11:56:13 2020 +0100 Camel-AWS2-S3: Fixed javadoc a bit --- .../camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java index feab731..b6e93bf 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java @@ -19,7 +19,7 @@ package org.apache.camel.component.aws2.s3.client; import software.amazon.awssdk.services.s3.S3Client; /** - * Mange the required actions of an s3 client for either local or remote. + * Manage the required actions of an s3 client for either local or remote. */ public interface AWS2CamelS3InternalClient {
[GitHub] [camel-quarkus] jamesnetherton commented on pull request #1988: WireMockTestResourceLifecycleManager improvements
jamesnetherton commented on pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988#issuecomment-721669207 Thanks for the review, it helped to clear my head a bit :+1: I'll close this and make d37e453 part of another PR where I plan port some itests over to WireMock. 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 closed pull request #1988: WireMockTestResourceLifecycleManager improvements
jamesnetherton closed pull request #1988: URL: https://github.com/apache/camel-quarkus/pull/1988 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] ppalaga commented on pull request #1991: Added nagios native support #1726
ppalaga commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721669878 Overall, this looks good, thanks @aldettinger ! I'd like to ask about some details: * Since recently, we try to make tests runnable in two modes: real backend service vs. mocked backend. There is also some log message based auditing convention so that interested parties can make sure that the tests were actually run against real services. IIRC, Twillio is one of the recent examples. The current proposal seems to support only the mock mode. I wonder whether the real mode could be supported too? cc @llowinge * @jamesnetherton recently started to use WireMock for mocking backend services. I wonder whether it would also make sense to use it also here? I have no idea whether WireMock supports raw TCP. 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] ppalaga edited a comment on pull request #1991: Added nagios native support #1726
ppalaga edited a comment on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721669878 Overall, this looks good, thanks @aldettinger ! I'd like to ask about some details: * Since recently, we try to make tests runnable in two modes: real backend service vs. mocked backend. There is also some log message based auditing convention so that interested parties can make sure that the tests were actually run against real services. IIRC, Twillio is one of the recent examples. The current proposal seems to support only the mock mode. I wonder whether the real mode could/should be supported too? cc @llowinge * @jamesnetherton recently started to use WireMock for mocking backend services. I wonder whether it would also make sense to use it also here? I have no idea whether WireMock supports raw TCP. 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] ppalaga edited a comment on pull request #1991: Added nagios native support #1726
ppalaga edited a comment on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721669878 Overall, this looks good, thanks @aldettinger ! I'd like to ask about some details: * Since recently, we try to make tests runnable in two modes: real backend service vs. mocked backend. There is also some log message based auditing convention so that interested parties can make sure that the tests were actually run against real services. IIRC, Twillio is one of the recent examples. The current proposal seems to support only the mock mode. I wonder whether the real mode could/should be supported too? cc @llowinge * @jamesnetherton recently started to use WireMock for mocking backend services. I wonder whether it would also make sense to use it here? I have no idea whether WireMock supports raw TCP. 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 #1991: Added nagios native support #1726
jamesnetherton commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721673717 > * I have no idea whether WireMock supports raw TCP. Its for HTTP only IIRC. 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] aldettinger commented on pull request #1991: Added nagios native support #1726
aldettinger commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721679688 Thanks for paying attention to this one guys. My current understanding is that twilio itests uses wiremock which supports only HTTP based mock server. In the case at hand, I've explored different options to run a test against a real NSCA server to no avail. So, I've ended up simulating the protocol with camel-netty. On top of that, do we see any improvement/alignment for this PR ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (3933825 -> b235fe1)
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 3933825 review comments add baed356 CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS add 00e591a CAMEL-15785 - Camel-AWS2: make possibile to use a client based on DefaultCredentialProvider in all the interested components - AWS2-SQS Regen add ba562a7 Catalog regen add b235fe1 Camel-AWS2-SQS: Fixed CS No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/components/aws2-sqs.json | 2 + .../camel/catalog/docs/aws2-sqs-component.adoc | 6 +- .../aws2/sqs/Sqs2ComponentConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 5 ++ .../component/aws2/sqs/Sqs2EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 + .../src/main/docs/aws2-sqs-component.adoc | 6 +- .../component/aws2/sqs/Sqs2Configuration.java | 15 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 4 +- .../aws2/sqs/client/Sqs2ClientFactory.java | 30 .../aws2/sqs/client/Sqs2InternalClient.java| 16 ++--- .../sqs/client/impl/Sqs2ClientIAMOptimized.java} | 41 ++- .../sqs/client/impl/Sqs2ClientStandardImpl.java} | 68 +- .../dsl/Aws2SqsComponentBuilderFactory.java| 15 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 82 ++ .../modules/ROOT/pages/aws2-sqs-component.adoc | 6 +- 16 files changed, 240 insertions(+), 66 deletions(-) copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2ClientFactory.java (53%) copy core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java => components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/Sqs2InternalClient.java (73%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java} (71%) copy components/{camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java => camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java} (63%)
[GitHub] [camel-quarkus] ppalaga edited a comment on pull request #1991: Added nagios native support #1726
ppalaga edited a comment on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721684207 > Thanks for paying attention to this one guys. > My current understanding is that twilio itests uses wiremock which supports only HTTP based mock server. OK, let's forget about WireMock for raw TCP. > In the case at hand, I've explored different options to run a test against a real NSCA server to no avail. The test does not need to manage the real service. It may well be the responsibility of the testing person to set it up, start it and pass some env vars or similar local config to the test to avoid running against the mock. I guess something like that would be possible with NSCA server? 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] ppalaga commented on pull request #1991: Added nagios native support #1726
ppalaga commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721684207 > Thanks for paying attention to this one guys. > My current understanding is that twilio itests uses wiremock which supports only HTTP based mock server. OK, let's forget about WireMock for raw tC > In the case at hand, I've explored different options to run a test against a real NSCA server to no avail. The test does not need to manage the real service. It may well be the responsibility of the testing person to set it up, start it and pass some env vars or similar local config to the test to avoid running against the mock. I guess something like that would be possible with NSCA server? 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] branch regen_bot updated (b235fe1 -> 0310609)
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 b235fe1 Camel-AWS2-SQS: Fixed CS add 3c82859 Camel-AWS2-S3: Fixed javadoc a bit add 0310609 Camel-AWS2-S3: No need to raise an exception if the factory will be instantiated No new revisions were added by this update. Summary of changes: .../camel/component/aws2/s3/client/AWS2CamelS3InternalClient.java | 2 +- .../apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java| 4 2 files changed, 1 insertion(+), 5 deletions(-)
[GitHub] [camel-quarkus] aldettinger commented on issue #1979: PDF integration tests failing with Camel 3.7.0-SNAPSHOT
aldettinger commented on issue #1979: URL: https://github.com/apache/camel-quarkus/issues/1979#issuecomment-721687943 Ok, I was able to run pdf itests against the last camel SNAPSHOT. 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] aldettinger closed issue #1979: PDF integration tests failing with Camel 3.7.0-SNAPSHOT
aldettinger closed issue #1979: URL: https://github.com/apache/camel-quarkus/issues/1979 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] rmannibucau commented on a change in pull request #4562: [CAMEL-15725] setting up basic OSGi-CDI metadata in the manifest
rmannibucau commented on a change in pull request #4562: URL: https://github.com/apache/camel/pull/4562#discussion_r517294396 ## File path: components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java ## @@ -21,11 +21,13 @@ import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.Vetoed; Review comment: It does not break CDI 1.0 compatibility since it does not add more beans. Will just enable aries-cdi to drop the beans early and does not affect OWB/Weld/Arc. 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] aldettinger commented on pull request #1991: Added nagios native support #1726
aldettinger commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721693378 It should be possible, but I was not able to set it up in reasonable time. I wonder if we should file a follow up issue ? maybe even in camel ? 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] branch master updated: camel-nagios: removed the simple frame test as the expected digest is sensible upon the camel context name
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 458a1b9 camel-nagios: removed the simple frame test as the expected digest is sensible upon the camel context name 458a1b9 is described below commit 458a1b967b59ad8b35043c097d0037851250b123 Author: aldettinger AuthorDate: Wed Nov 4 13:13:07 2020 +0100 camel-nagios: removed the simple frame test as the expected digest is sensible upon the camel context name --- .../apache/camel/component/nagios/MockNscaServerBasedTest.java | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/MockNscaServerBasedTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/MockNscaServerBasedTest.java index 9b93492..cd3e048 100644 --- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/MockNscaServerBasedTest.java +++ b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/MockNscaServerBasedTest.java @@ -45,8 +45,7 @@ public class MockNscaServerBasedTest extends CamelTestSupport { @BindToRegistry("mockNscaServer") protected static MockNscaServerInitializerFactory mockNscaServer = new MockNscaServerInitializerFactory(); -private static final String EXPECTED_NSCA_SIMPLE_FRAME_DIGEST = "2ec8ecf15f363bf507b8e19f0118e3cb"; -private static final String EXPECTED_NSCA_MULTI_HEADERS_FRAME_DIGEST = "315d4b1aed2bb2db79d516f7c651b0d1"; +private static final String EXPECTED_NSCA_FRAME_DIGEST = "315d4b1aed2bb2db79d516f7c651b0d1"; private static final int INIT_VECTOR_PLUS_TIMESTAMP_SIZE_IN_BYTES = 128 + Integer.BYTES; private int nscaPort; @@ -58,16 +57,13 @@ public class MockNscaServerBasedTest extends CamelTestSupport { } @Test -public void sendSimpleThenMultiHeadersNscaFramesShouldSucceed() { -template.sendBody("direct:start", "Hello Nagios"); -mockNscaServer.verifyFrameReceived(EXPECTED_NSCA_SIMPLE_FRAME_DIGEST); - +public void sendFixedNscaFrameShouldReturnExpectedDigest() { Map headers = new HashMap<>(); headers.put(NagiosConstants.LEVEL, "CRITICAL"); headers.put(NagiosConstants.HOST_NAME, "myHost"); headers.put(NagiosConstants.SERVICE_NAME, "myService"); template.sendBodyAndHeaders("direct:start", "Hello Nagios", headers); - mockNscaServer.verifyFrameReceived(EXPECTED_NSCA_MULTI_HEADERS_FRAME_DIGEST); +mockNscaServer.verifyFrameReceived(EXPECTED_NSCA_FRAME_DIGEST); } @Override
[camel-kafka-connector] branch master updated: Decouple the RabbitMQ client from the service to simplify using the test infra from Camel
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-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 2dddbdf Decouple the RabbitMQ client from the service to simplify using the test infra from Camel 2dddbdf is described below commit 2dddbdf2eeb69036538d696fbe76555e8a2f3e64 Author: Otavio Rodolfo Piske AuthorDate: Wed Nov 4 10:20:44 2020 +0100 Decouple the RabbitMQ client from the service to simplify using the test infra from Camel --- .../rabbitmq/services/RabbitMQLocalContainerService.java| 5 ++--- .../kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java | 6 ++ .../camel/kafkaconnector/rabbitmq/services/RabbitMQService.java | 5 ++--- .../camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java | 2 +- .../camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java index ee7a827..d922516 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.RabbitMQContainer; @@ -57,8 +56,8 @@ public class RabbitMQLocalContainerService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return new RabbitMQClient(container.getAmqpUrl()); +public String getAmqpUrl() { +return container.getAmqpUrl(); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java index 74d2a48..b0c524c 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java @@ -17,8 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; - public class RabbitMQRemoteService implements RabbitMQService { @@ -28,8 +26,8 @@ public class RabbitMQRemoteService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return null; +public String getAmqpUrl() { +return System.getProperty("rabbitmq.connection.amqp"); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java index d026ba2..c093bd8 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -32,10 +31,10 @@ public interface RabbitMQService extends BeforeAllCallback, AfterAllCallback { ConnectionProperties connectionProperties(); /** - * Get the appropriate client for the service + * Gets the connection URI * @return */ -RabbitMQClient getClient(); +String getAmqpUrl(); /** * Perform any initialization necessary diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java index 80b1606..60bebba 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java @@ -59,7 +59,7 @@ public class RabbitMQSinkITCase extends AbstractKafkaTest { @Befor
[camel-kafka-connector] branch master updated: Decouple the RabbitMQ client from the service to simplify using the test infra from Camel
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-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 2dddbdf Decouple the RabbitMQ client from the service to simplify using the test infra from Camel 2dddbdf is described below commit 2dddbdf2eeb69036538d696fbe76555e8a2f3e64 Author: Otavio Rodolfo Piske AuthorDate: Wed Nov 4 10:20:44 2020 +0100 Decouple the RabbitMQ client from the service to simplify using the test infra from Camel --- .../rabbitmq/services/RabbitMQLocalContainerService.java| 5 ++--- .../kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java | 6 ++ .../camel/kafkaconnector/rabbitmq/services/RabbitMQService.java | 5 ++--- .../camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java | 2 +- .../camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java index ee7a827..d922516 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.RabbitMQContainer; @@ -57,8 +56,8 @@ public class RabbitMQLocalContainerService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return new RabbitMQClient(container.getAmqpUrl()); +public String getAmqpUrl() { +return container.getAmqpUrl(); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java index 74d2a48..b0c524c 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java @@ -17,8 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; - public class RabbitMQRemoteService implements RabbitMQService { @@ -28,8 +26,8 @@ public class RabbitMQRemoteService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return null; +public String getAmqpUrl() { +return System.getProperty("rabbitmq.connection.amqp"); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java index d026ba2..c093bd8 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -32,10 +31,10 @@ public interface RabbitMQService extends BeforeAllCallback, AfterAllCallback { ConnectionProperties connectionProperties(); /** - * Get the appropriate client for the service + * Gets the connection URI * @return */ -RabbitMQClient getClient(); +String getAmqpUrl(); /** * Perform any initialization necessary diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java index 80b1606..60bebba 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java @@ -59,7 +59,7 @@ public class RabbitMQSinkITCase extends AbstractKafkaTest { @Befor
[camel-kafka-connector] branch master updated: Decouple the RabbitMQ client from the service to simplify using the test infra from Camel
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-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 2dddbdf Decouple the RabbitMQ client from the service to simplify using the test infra from Camel 2dddbdf is described below commit 2dddbdf2eeb69036538d696fbe76555e8a2f3e64 Author: Otavio Rodolfo Piske AuthorDate: Wed Nov 4 10:20:44 2020 +0100 Decouple the RabbitMQ client from the service to simplify using the test infra from Camel --- .../rabbitmq/services/RabbitMQLocalContainerService.java| 5 ++--- .../kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java | 6 ++ .../camel/kafkaconnector/rabbitmq/services/RabbitMQService.java | 5 ++--- .../camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java | 2 +- .../camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java index ee7a827..d922516 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.RabbitMQContainer; @@ -57,8 +56,8 @@ public class RabbitMQLocalContainerService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return new RabbitMQClient(container.getAmqpUrl()); +public String getAmqpUrl() { +return container.getAmqpUrl(); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java index 74d2a48..b0c524c 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java @@ -17,8 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; - public class RabbitMQRemoteService implements RabbitMQService { @@ -28,8 +26,8 @@ public class RabbitMQRemoteService implements RabbitMQService { } @Override -public RabbitMQClient getClient() { -return null; +public String getAmqpUrl() { +return System.getProperty("rabbitmq.connection.amqp"); } @Override diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java index d026ba2..c093bd8 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java @@ -17,7 +17,6 @@ package org.apache.camel.kafkaconnector.rabbitmq.services; -import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -32,10 +31,10 @@ public interface RabbitMQService extends BeforeAllCallback, AfterAllCallback { ConnectionProperties connectionProperties(); /** - * Get the appropriate client for the service + * Gets the connection URI * @return */ -RabbitMQClient getClient(); +String getAmqpUrl(); /** * Perform any initialization necessary diff --git a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java index 80b1606..60bebba 100644 --- a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java +++ b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java @@ -59,7 +59,7 @@ public class RabbitMQSinkITCase extends AbstractKafkaTest { @Befor
[camel] branch regen_bot updated (0310609 -> 458a1b9)
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 0310609 Camel-AWS2-S3: No need to raise an exception if the factory will be instantiated add 458a1b9 camel-nagios: removed the simple frame test as the expected digest is sensible upon the camel context name No new revisions were added by this update. Summary of changes: .../apache/camel/component/nagios/MockNscaServerBasedTest.java | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-)
[camel] branch master updated: Camel-AWS2-S3: Use localstack 0.12.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b18944c Camel-AWS2-S3: Use localstack 0.12.1 b18944c is described below commit b18944ca5599c5cc28aa82efc1849a81855e952d Author: Andrea Cosentino AuthorDate: Wed Nov 4 14:13:48 2020 +0100 Camel-AWS2-S3: Use localstack 0.12.1 --- .../org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java index ae5b4ba..50c195d 100644 --- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java +++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java @@ -32,7 +32,7 @@ import software.amazon.awssdk.services.s3.S3Client; @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class Aws2S3BaseTest extends ContainerAwareTestSupport { -public static final String CONTAINER_IMAGE = "localstack/localstack:0.11.4"; +public static final String CONTAINER_IMAGE = "localstack/localstack:0.12.1"; public static final String CONTAINER_NAME = "s3"; @Override
[GitHub] [camel-quarkus] ppalaga commented on pull request #1991: Added nagios native support #1726
ppalaga commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721737215 +1, let's file a followup and let @llowinge express his opinion. 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] ppalaga merged pull request #1991: Added nagios native support #1726
ppalaga merged pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991 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-quarkus] branch master updated: Added nagios native support #1726
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 63a1bf3 Added nagios native support #1726 63a1bf3 is described below commit 63a1bf390db6feefa748521bc7f4f5db7b4101b5 Author: aldettinger AuthorDate: Wed Oct 28 09:22:08 2020 +0100 Added nagios native support #1726 --- .../ROOT/pages/reference/extensions/nagios.adoc| 8 +- .../ROOT/partials/reference/components/nagios.adoc | 6 +- extensions-jvm/pom.xml | 1 - .../nagios/deployment/pom.xml | 0 .../nagios/deployment/NagiosProcessor.java | 14 --- {extensions-jvm => extensions}/nagios/pom.xml | 1 - .../nagios/runtime/pom.xml | 1 + .../main/resources/META-INF/quarkus-extension.yaml | 3 +- extensions/pom.xml | 1 + .../nagios}/pom.xml| 67 ++- .../component/nagios/it/NagiosResource.java| 34 +++--- .../quarkus/component/nagios/it/NagiosIT.java | 17 +-- .../quarkus/component/nagios/it/NagiosTest.java| 25 +++- .../component/nagios/it/NagiosTestResource.java| 130 + integration-tests/pom.xml | 1 + tooling/scripts/test-categories.yaml | 1 + 16 files changed, 246 insertions(+), 64 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/nagios.adoc b/docs/modules/ROOT/pages/reference/extensions/nagios.adoc index 9cb6ec5..e286907 100644 --- a/docs/modules/ROOT/pages/reference/extensions/nagios.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/nagios.adoc @@ -2,15 +2,15 @@ // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page = Nagios :cq-artifact-id: camel-quarkus-nagios -:cq-native-supported: false -:cq-status: Preview +:cq-native-supported: true +:cq-status: Stable :cq-description: Send passive checks to Nagios using JSendNSCA. :cq-deprecated: false :cq-jvm-since: 1.1.0 -:cq-native-since: n/a +:cq-native-since: 1.4.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.4.0## Send passive checks to Nagios using JSendNSCA. diff --git a/docs/modules/ROOT/partials/reference/components/nagios.adoc b/docs/modules/ROOT/partials/reference/components/nagios.adoc index aac3fc8..74bdc8a 100644 --- a/docs/modules/ROOT/partials/reference/components/nagios.adoc +++ b/docs/modules/ROOT/partials/reference/components/nagios.adoc @@ -2,11 +2,11 @@ // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page :cq-artifact-id: camel-quarkus-nagios :cq-artifact-id-base: nagios -:cq-native-supported: false -:cq-status: Preview +:cq-native-supported: true +:cq-status: Stable :cq-deprecated: false :cq-jvm-since: 1.1.0 -:cq-native-since: n/a +:cq-native-since: 1.4.0 :cq-camel-part-name: nagios :cq-camel-part-title: Nagios :cq-camel-part-description: Send passive checks to Nagios using JSendNSCA. diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index de80a2f..e1bd37a 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -108,7 +108,6 @@ msv mvel mybatis -nagios nitrite ognl openstack diff --git a/extensions-jvm/nagios/deployment/pom.xml b/extensions/nagios/deployment/pom.xml similarity index 100% rename from extensions-jvm/nagios/deployment/pom.xml rename to extensions/nagios/deployment/pom.xml diff --git a/extensions-jvm/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java b/extensions/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java similarity index 68% rename from extensions-jvm/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java rename to extensions/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java index 9e0402d..53f99ef 100644 --- a/extensions-jvm/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java +++ b/extensions/nagios/deployment/src/main/java/org/apache/camel/quarkus/component/nagios/deployment/NagiosProcessor.java @@ -17,11 +17,7 @@ package org.apache.camel.quarkus.component.nagios.deployment; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.pkg.steps.NativeBuild; -impor
[GitHub] [camel-quarkus] JiriOndrusek commented on a change in pull request #1984: Fixing core build because of recent changes in camel master
JiriOndrusek commented on a change in pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#discussion_r517353349 ## File path: extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java ## @@ -344,10 +345,11 @@ protected HeadersMapFactory createHeadersMapFactory() { @Override protected BeanProxyFactory createBeanProxyFactory() { -return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class) -.resolve(getCamelContextReference()) -.orElseThrow(() -> new IllegalArgumentException("Cannot find BeanProxyFactory on classpath. " -+ "Add camel-bean to classpath.")); +return new BaseServiceResolver<>(BeanProxyFactory.FACTORY, BeanProxyFactory.class, +getFactoryFinder(FactoryFinder.DEFAULT_PATH)) Review comment: @davsclaus I've tried to use `getBootstrapFactoryFinder` but it caused failures like: > >Caused by: org.apache.camel.FailedToCreateRouteException: Failed to create route route3 at: >>> Bean[org.apache.camel.quarkus.component.bean.CamelRoute$MyBean] <<< in route: Route(route3)[From[direct:method] -> [Bean[org.apache.camel because of Cannot find BeanProcessorFactory on classpath. Add camel-bean to classpath. at org.apache.camel.reifier.RouteReifier.doCreateRoute(RouteReifier.java:222) at org.apache.camel.reifier.RouteReifier.createRoute(RouteReifier.java:66) at org.apache.camel.quarkus.core.FastCamelContext.startRouteDefinitions(FastCamelContext.java:882) at org.apache.camel.quarkus.core.FastCamelContext.startRouteDefinitions(FastCamelContext.java:619) at org.apache.camel.impl.engine.AbstractCamelContext.doInit(AbstractCamelContext.java:2633) at org.apache.camel.quarkus.core.FastCamelContext.doInit(FastCamelContext.java:505) at org.apache.camel.support.service.BaseService.init(BaseService.java:83) at org.apache.camel.impl.engine.AbstractCamelContext.init(AbstractCamelContext.java:2405) at org.apache.camel.support.service.BaseService.start(BaseService.java:111) at org.apache.camel.impl.engine.AbstractCamelContext.start(AbstractCamelContext.java:2422) at org.apache.camel.quarkus.core.CamelContextRuntime.start(CamelContextRuntime.java:57) at org.apache.camel.quarkus.core.CamelBootstrapRecorder.start(CamelBootstrapRecorder.java:45) ... 9 more Caused by: java.lang.IllegalArgumentException: Cannot find BeanProcessorFactory on classpath. Add camel-bean to classpath. at org.apache.camel.quarkus.core.FastCamelContext.lambda$createBeanProcessorFactory$2(FastCamelContext.java:369) at java.util.Optional.orElseThrow(Optional.java:408) at org.apache.camel.quarkus.core.FastCamelContext.createBeanProcessorFactory(FastCamelContext.java:369) at org.apache.camel.impl.engine.AbstractCamelContext.getBeanProcessorFactory(AbstractCamelContext.java:4290) at org.apache.camel.reifier.BeanReifier.createProcessor(BeanReifier.java:41) at org.apache.camel.reifier.ProcessorReifier.makeProcessor(ProcessorReifier.java:756) at org.apache.camel.reifier.ProcessorReifier.addRoutes(ProcessorReifier.java:494) at org.apache.camel.reifier.RouteReifier.doCreateRoute(RouteReifier.java:220) ... 20 more Original value (` getFactoryFinder(FactoryFinder.DEFAULT_PATH)`) works. So for now I've kept ` getFactoryFinder(FactoryFinder.DEFAULT_PATH)` 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] aldettinger opened a new issue #1992: Complete nagios extension tests
aldettinger opened a new issue #1992: URL: https://github.com/apache/camel-quarkus/issues/1992 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] aldettinger commented on pull request #1991: Added nagios native support #1726
aldettinger commented on pull request #1991: URL: https://github.com/apache/camel-quarkus/pull/1991#issuecomment-721742465 I'm filing #1992 as follow up 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] ppalaga commented on issue #1992: Complete nagios extension tests
ppalaga commented on issue #1992: URL: https://github.com/apache/camel-quarkus/issues/1992#issuecomment-721742331 Esp. we should decide whether it is necessary to make the test configurable to run against a real NSCA server. WDYT @llowinge ? 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 #1993: Migrate ServiceNow, Slack, Geocoder & Telegram tests to WireMock
jamesnetherton opened a new pull request #1993: URL: https://github.com/apache/camel-quarkus/pull/1993 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] davsclaus commented on pull request #1984: Fixing core build because of recent changes in camel master
davsclaus commented on pull request #1984: URL: https://github.com/apache/camel-quarkus/pull/1984#issuecomment-721744893 This is the code in camel 3.7 ``` @Override protected BeanProcessorFactory createBeanProcessorFactory() { return new BaseServiceResolver<>(BeanProcessorFactory.FACTORY, BeanProcessorFactory.class, getBootstrapFactoryFinder()) .resolve(getCamelContextReference()) .orElseThrow(() -> new IllegalArgumentException( "Cannot find BeanProcessorFactory on classpath. " + "Add camel-bean to classpath.")); } ``` 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] aldettinger closed issue #1726: Nagios native support
aldettinger closed issue #1726: URL: https://github.com/apache/camel-quarkus/issues/1726 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] aldettinger commented on issue #1726: Nagios native support
aldettinger commented on issue #1726: URL: https://github.com/apache/camel-quarkus/issues/1726#issuecomment-721745981 Follow up filed for possibly adding real tests in #1992. 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] ppalaga commented on a change in pull request #1993: Migrate ServiceNow, Slack, Geocoder & Telegram tests to WireMock
ppalaga commented on a change in pull request #1993: URL: https://github.com/apache/camel-quarkus/pull/1993#discussion_r517363240 ## File path: extensions/geocoder/deployment/src/main/java/org/apache/camel/quarkus/component/geocoder/deployment/GeocoderProcessor.java ## @@ -50,6 +50,7 @@ ExtensionSslNativeSupportBuildItem activateSslNativeSupport() { items.add(new ReflectiveClassBuildItem(false, true, "com.google.maps.model.Bounds")); items.add(new ReflectiveClassBuildItem(false, true, "com.google.maps.model.LatLng")); items.add(new ReflectiveClassBuildItem(false, true, "com.google.maps.model.LocationType")); +items.add(new ReflectiveClassBuildItem(false, true, "com.google.maps.model.GeolocationPayload")); Review comment: Your effort pays back! ## File path: integration-tests/telegram/pom.xml ## @@ -56,17 +56,18 @@ org.apache.camel.quarkus camel-quarkus-attachments - -org.apache.camel.quarkus - camel-quarkus-integration-test-support-mock-backend - Review comment: The auditing idea was based on the assumption that the number of camel-quarkus-integration-test-support-mock-backend occurrences in poms must be equal to the number of the magic log tokens. Now we are stopping to use camel-quarkus-integration-test-support-mock-backend . Yes, camel-quarkus-integration-wiremock-support is a replacement, but probably not all mock will be HTTP, so the interested parties (cc @llowinge ) will have to add the number of camel-quarkus-integration-wiremock-support occurrences to the number of camel-quarkus-integration-test-support-mock-backend. 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] branch regen_bot updated (458a1b9 -> b18944c)
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 458a1b9 camel-nagios: removed the simple frame test as the expected digest is sensible upon the camel context name add b18944c Camel-AWS2-S3: Use localstack 0.12.1 No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] fizzet opened a new pull request #4563: CAMEL-158080: init predicates added to AssertionClause
fizzet opened a new pull request #4563: URL: https://github.com/apache/camel/pull/4563 - [ ] 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. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] 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. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] 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-quarkus] jamesnetherton commented on a change in pull request #1993: Migrate ServiceNow, Slack, Geocoder & Telegram tests to WireMock
jamesnetherton commented on a change in pull request #1993: URL: https://github.com/apache/camel-quarkus/pull/1993#discussion_r517380135 ## File path: integration-tests/telegram/pom.xml ## @@ -56,17 +56,18 @@ org.apache.camel.quarkus camel-quarkus-attachments - -org.apache.camel.quarkus - camel-quarkus-integration-test-support-mock-backend - Review comment: Let me think about this some more because there are probably other (better) ways of achieving 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