[camel-kamelets] 14/28: Fix cloud event type and do not set data content type

[acosentino]

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 49cbe909ae5bb15537ecdcd851ef16c23e2a65ad
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Mon Nov 21 22:01:09 2022 +0100

    Fix cloud event type and do not set data content type
    
    Setting the data content type breaks the Camel Knative producer
---
 .../format/converter/aws2/s3/AWS2S3CloudEventOutputType.java      | 8 +-------
 .../format/converter/aws2/s3/AWS2S3CloudEventOutputTypeTest.java  | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

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 13579054..399e0111 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
@@ -40,16 +40,10 @@ public class AWS2S3CloudEventOutputType implements 
DataTypeConverter {
     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_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(CloudEvent.CAMEL_CLOUD_EVENT_DATA_CONTENT_TYPE, 
exchange.getMessage().getHeader(AWS2S3Constants.CONTENT_TYPE, String.class));
-
-        String encoding = 
exchange.getMessage().getHeader(AWS2S3Constants.CONTENT_ENCODING, String.class);
-        if (encoding != null) {
-            headers.put(CloudEvent.CAMEL_CLOUD_EVENT_DATA_CONTENT_ENCODING, 
encoding);
-        }
     }
 
     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 0a71f90d..e139b2b9 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
@@ -53,7 +53,7 @@ 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("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));
     }