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/09/21 16:30:39 UTC
[camel] 06/10: CAMEL-15375 - Camel-AWS2-Eventbridge: Give Priority
to loading from file
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 a71dc7c5d0a189243da4de1c7113344997e90590
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 21 12:23:54 2020 +0200
CAMEL-15375 - Camel-AWS2-Eventbridge: Give Priority to loading from file
---
.../camel/component/aws2/eventbridge/EventbridgeProducer.java | 8 ++++----
.../integration/EventbridgePutRuleIntegrationTest.java | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducer.java b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducer.java
index 6486104..efb947c 100644
--- a/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducer.java
+++ b/components/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeProducer.java
@@ -101,14 +101,14 @@ public class EventbridgeProducer extends DefaultProducer {
String ruleName = exchange.getIn().getHeader(EventbridgeConstants.RULE_NAME, String.class);
builder.name(ruleName);
}
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(EventbridgeConstants.EVENT_PATTERN))) {
- String eventPattern = exchange.getIn().getHeader(EventbridgeConstants.EVENT_PATTERN, String.class);
- builder.eventPattern(eventPattern);
- } else {
+ if (ObjectHelper.isEmpty(exchange.getIn().getHeader(EventbridgeConstants.EVENT_PATTERN))) {
InputStream s = ResourceHelper.resolveMandatoryResourceAsInputStream(this.getEndpoint().getCamelContext(),
getConfiguration().getEventPatternFile());
String eventPattern = IOUtils.toString(s, Charset.defaultCharset());
builder.eventPattern(eventPattern);
+ } else {
+ String eventPattern = exchange.getIn().getHeader(EventbridgeConstants.EVENT_PATTERN, String.class);
+ builder.eventPattern(eventPattern);
}
PutRuleResponse result;
try {
diff --git a/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java b/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
index 7432268..0106440 100644
--- a/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
+++ b/components/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/integration/EventbridgePutRuleIntegrationTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.eventbridge.EventbridgeConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;