This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit e3912879c371e3f2450555cb2796a4b3d5648542
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Fri Nov 25 15:27:14 2022 +0100
Remove camel-cloudevents dependency
- Avoid having the additional dependency in favor of using plain String
constants
---
.github/workflows/yaks-tests.yaml | 5 +++++
library/camel-kamelets-utils/pom.xml | 5 -----
.../converter/aws2/s3/AWS2S3CloudEventOutputType.java | 14 +++++++++-----
.../converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java | 7 +++----
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/yaks-tests.yaml
b/.github/workflows/yaks-tests.yaml
index e06d1751..4acd7c8a 100644
--- a/.github/workflows/yaks-tests.yaml
+++ b/.github/workflows/yaks-tests.yaml
@@ -109,7 +109,12 @@ jobs:
run: |
echo "Running tests"
yaks run test/aws-ddb-sink $YAKS_RUN_OPTIONS
+
yaks run test/aws-s3/aws-s3-uri-binding.feature $YAKS_RUN_OPTIONS
+ yaks run test/aws-s3/aws-s3-source-property-conf.feature
$YAKS_RUN_OPTIONS
+ yaks run test/aws-s3/aws-s3-source-secret-conf.feature
$YAKS_RUN_OPTIONS
+ yaks run test/aws-s3/aws-s3-source-uri-conf.feature $YAKS_RUN_OPTIONS
+
yaks run test/extract-field-action $YAKS_RUN_OPTIONS
yaks run test/insert-field-action $YAKS_RUN_OPTIONS
yaks run test/mail-sink $YAKS_RUN_OPTIONS
diff --git a/library/camel-kamelets-utils/pom.xml
b/library/camel-kamelets-utils/pom.xml
index 2aba210d..5b1441f3 100644
--- a/library/camel-kamelets-utils/pom.xml
+++ b/library/camel-kamelets-utils/pom.xml
@@ -82,11 +82,6 @@
<artifactId>camel-aws2-s3</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cloudevents</artifactId>
- <!--<scope>provided</scope>-->
- </dependency>
<!-- Test scoped dependencies -->
<dependency>
diff --git
a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java
b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java
index 2eb5cb04..d1906f24 100644
---
a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java
+++
b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputType.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
-import org.apache.camel.component.cloudevents.CloudEvent;
import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter;
import org.apache.camel.kamelets.utils.format.spi.annotations.DataType;
@@ -36,14 +35,19 @@ import
org.apache.camel.kamelets.utils.format.spi.annotations.DataType;
@DataType(scheme = "aws2-s3", name = "cloudevents", mediaType =
"application/octet-stream")
public class AWS2S3CloudEventOutputType implements DataTypeConverter {
+ static final String CAMEL_CLOUD_EVENT_TYPE = "CamelCloudEventType";
+ static final String CAMEL_CLOUD_EVENT_SOURCE = "CamelCloudEventSource";
+ static final String CAMEL_CLOUD_EVENT_SUBJECT = "CamelCloudEventSubject";
+ static final String CAMEL_CLOUD_EVENT_TIME = "CamelCloudEventTime";
+
@Override
public void convert(Exchange exchange) {
final Map<String, Object> headers = exchange.getMessage().getHeaders();
- headers.put(CloudEvent.CAMEL_CLOUD_EVENT_TYPE,
"kamelet.aws.s3.source");
- headers.put(CloudEvent.CAMEL_CLOUD_EVENT_SOURCE,
exchange.getMessage().getHeader(AWS2S3Constants.BUCKET_NAME, String.class));
- headers.put(CloudEvent.CAMEL_CLOUD_EVENT_SUBJECT,
exchange.getMessage().getHeader(AWS2S3Constants.KEY, String.class));
- headers.put(CloudEvent.CAMEL_CLOUD_EVENT_TIME, getEventTime(exchange));
+ headers.put(CAMEL_CLOUD_EVENT_TYPE, "kamelet.aws.s3.source");
+ headers.put(CAMEL_CLOUD_EVENT_SOURCE,
exchange.getMessage().getHeader(AWS2S3Constants.BUCKET_NAME, String.class));
+ headers.put(CAMEL_CLOUD_EVENT_SUBJECT,
exchange.getMessage().getHeader(AWS2S3Constants.KEY, String.class));
+ headers.put(CAMEL_CLOUD_EVENT_TIME, getEventTime(exchange));
}
private String getEventTime(Exchange exchange) {
diff --git
a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java
b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java
index e139b2b9..f2d41606 100644
---
a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java
+++
b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/format/converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
-import org.apache.camel.component.cloudevents.CloudEvents;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.kamelets.utils.format.DefaultDataTypeRegistry;
import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter;
@@ -53,9 +52,9 @@ class AWS2S3CloudEventOutputTypeTest {
Assertions.assertTrue(exchange.getMessage().hasHeaders());
Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey(AWS2S3Constants.KEY));
- assertEquals("kamelet.aws.s3.source",
exchange.getMessage().getHeader(CloudEvents.CAMEL_CLOUD_EVENT_TYPE));
- assertEquals("test1.txt",
exchange.getMessage().getHeader(CloudEvents.CAMEL_CLOUD_EVENT_SUBJECT));
- assertEquals("myBucket",
exchange.getMessage().getHeader(CloudEvents.CAMEL_CLOUD_EVENT_SOURCE));
+ assertEquals("kamelet.aws.s3.source",
exchange.getMessage().getHeader(AWS2S3CloudEventOutputType.CAMEL_CLOUD_EVENT_TYPE));
+ assertEquals("test1.txt",
exchange.getMessage().getHeader(AWS2S3CloudEventOutputType.CAMEL_CLOUD_EVENT_SUBJECT));
+ assertEquals("myBucket",
exchange.getMessage().getHeader(AWS2S3CloudEventOutputType.CAMEL_CLOUD_EVENT_SOURCE));
}
@Test
