You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/16 08:28:01 UTC
[camel] 01/06: CAMEL-15836 - Camel-AWS2-Eventbridge: enable
autowire on the Eventbridge client
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 36778704773b7a8673b9cbd70435a18e338648af
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 09:11:51 2020 +0100
CAMEL-15836 - Camel-AWS2-Eventbridge: enable autowire on the Eventbridge client
---
.../aws2/eventbridge/EventbridgeComponent.java | 18 ------------------
.../aws2/eventbridge/EventbridgeConfiguration.java | 13 +------------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
index 1547925..5c66f1a 100644
--- a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
+++ b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponent.java
@@ -60,9 +60,6 @@ public class EventbridgeComponent extends DefaultComponent {
configuration.setEventbusName(remaining);
EventbridgeEndpoint endpoint = new EventbridgeEndpoint(uri, this, configuration);
setProperties(endpoint, parameters);
- if (endpoint.getConfiguration().isAutoDiscoverClient()) {
- checkAndSetRegistryClient(configuration, endpoint);
- }
if (configuration.getEventbridgeClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("Amazon Eventbridge client or accessKey and secretKey must be specified");
@@ -81,19 +78,4 @@ public class EventbridgeComponent extends DefaultComponent {
public void setConfiguration(EventbridgeConfiguration configuration) {
this.configuration = configuration;
}
-
- private void checkAndSetRegistryClient(EventbridgeConfiguration configuration, EventbridgeEndpoint endpoint) {
- if (ObjectHelper.isEmpty(endpoint.getConfiguration().getEventbridgeClient())) {
- LOG.debug("Looking for an EventBridgeClient instance in the registry");
- Set<EventBridgeClient> clients = getCamelContext().getRegistry().findByType(EventBridgeClient.class);
- if (clients.size() == 1) {
- LOG.debug("Found exactly one EventBridgeClient instance in the registry");
- configuration.setEventbridgeClient(clients.stream().findFirst().get());
- } else {
- LOG.debug("No EventbridgeClient instance in the registry");
- }
- } else {
- LOG.debug("EventbridgeClient instance is already set at endpoint level: skipping the check in the registry");
- }
- }
}
diff --git a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeConfiguration.java b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeConfiguration.java
index 2666ee3..f456db4 100644
--- a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeConfiguration.java
+++ b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeConfiguration.java
@@ -28,6 +28,7 @@ public class EventbridgeConfiguration implements Cloneable {
private String eventbusName = "default";
@UriParam
+ @Metadata(autowired = true)
private EventBridgeClient eventbridgeClient;
@UriParam(label = "security", secret = true)
private String accessKey;
@@ -164,18 +165,6 @@ public class EventbridgeConfiguration implements Cloneable {
this.trustAllCertificates = trustAllCertificates;
}
- public boolean isAutoDiscoverClient() {
- return autoDiscoverClient;
- }
-
- /**
- * Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry
- * automatically otherwise it will skip that checking.
- */
- public void setAutoDiscoverClient(boolean autoDiscoverClient) {
- this.autoDiscoverClient = autoDiscoverClient;
- }
-
public String getEventPatternFile() {
return eventPatternFile;
}