This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 9c0b71f93b4fe2b46e2f4e16244c0c413f7c591c
Author: Andrea Tarocchi <[email protected]>
AuthorDate: Mon May 2 12:16:07 2022 +0200

    fix #1360 Upgrade to Camel-Kamelets 0.8.0 and Camel 3.16.
---
 core/pom.xml                                                 |  4 ++++
 .../transforms/SourcePojoToSchemaAndStructTransform.java     | 12 +++++-------
 .../camel/kafkaconnector/utils/CamelKafkaConnectMain.java    |  4 ++--
 parent/pom.xml                                               |  6 +++---
 pom.xml                                                      |  2 +-
 .../aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java   |  2 ++
 tests/itests-parent/pom.xml                                  |  4 ++++
 .../camel/kafkaconnector/maven/model/KameletModel.java       |  9 +++------
 8 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 27525eb8c..817d6a641 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -59,6 +59,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core-languages</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-bean</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-kafka</artifactId>
diff --git 
a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
 
b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
index a8651f2d7..9c47b4659 100644
--- 
a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
+++ 
b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.dataformat.avro.AvroFactory;
@@ -64,14 +63,13 @@ public class SourcePojoToSchemaAndStructTransform<R extends 
ConnectRecord<R>> im
 
                     try {
                         MAPPER.acceptJsonFormatVisitor(r.value().getClass(), 
gen);
-                    } catch (JsonMappingException e) {
+                        AvroSchema schemaWrapper = gen.getGeneratedSchema();
+                        LOG.debug("Generated and cached avro schema: {}", 
schemaWrapper.getAvroSchema().toString(true));
+
+                        return new CacheEntry(schemaWrapper, 
MAPPER.writer(schemaWrapper));
+                    } catch (Exception e) {
                         throw new ConnectException("Error in generating POJO 
schema.", e);
                     }
-
-                    AvroSchema schemaWrapper = gen.getGeneratedSchema();
-                    LOG.debug("Generated and cached avro schema: {}", 
schemaWrapper.getAvroSchema().toString(true));
-
-                    return new CacheEntry(schemaWrapper, 
MAPPER.writer(schemaWrapper));
                 }
             });
 
diff --git 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 2e8d3a857..e6dba38cb 100644
--- 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -323,7 +323,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
                             .templateParameter("aggregationTimeout", 
String.valueOf(Long.MAX_VALUE))
                             .from("kamelet:source")
                             .aggregate(constant(true))
-                                
.aggregationStrategyRef("{{aggregationStrategy}}")
+                                .aggregationStrategy("{{aggregationStrategy}}")
                                 .completionSize("{{aggregationSize}}")
                                 .completionTimeout("{{aggregationTimeout}}")
                                 .to("kamelet:sink")
@@ -334,7 +334,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
                             .templateParameter("idempotentExpression", 
"dummyExpression")
                             .templateParameter("idempotentRepository", 
"ckcIdempotentRepository")
                             .from("kamelet:source")
-                            
.idempotentConsumer(simple("{{idempotentExpression}}")).messageIdRepositoryRef("{{idempotentRepository}}")
+                            
.idempotentConsumer(simple("{{idempotentExpression}}")).idempotentRepository("{{idempotentRepository}}")
                             .to("kamelet:sink");
 
                     //create removeHeader template
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a1d92c78..3374b9d8f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,11 +28,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <kafka.version>2.8.0</kafka.version>
-        <camel.version>3.14.0</camel.version>
-        <camel.kamelet.catalog.version>0.6.0</camel.kamelet.catalog.version>
+        <camel.version>3.16.0</camel.version>
+        <camel.kamelet.catalog.version>0.8.0</camel.kamelet.catalog.version>
         <apicurio.registry.version>1.3.2.Final</apicurio.registry.version>
         <resteasy.version>4.5.6.Final</resteasy.version>
-        <version.java>1.8</version.java>
+        <version.java>11</version.java>
         <version.guava>20.0</version.guava>
         <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
         <version.postgres>42.2.14</version.postgres>
diff --git a/pom.xml b/pom.xml
index c74ae4c0d..305b90ab4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.14.0</version>
+        <version>3.16.0</version>
     </parent>
 
     <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git 
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
 
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
index 8f824e228..d1fead05e 100644
--- 
a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
+++ 
b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
@@ -30,6 +30,7 @@ import 
org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
 import org.apache.camel.test.infra.common.TestUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.Timeout;
@@ -42,6 +43,7 @@ import static 
org.apache.camel.kafkaconnector.aws.v2.kinesis.common.KinesisUtils
 import static 
org.apache.camel.kafkaconnector.aws.v2.kinesis.common.KinesisUtils.putRecords;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Disabled("Until https://github.com/apache/camel-kamelets/issues/908 is 
resolved")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true")
 public class CamelSourceAWSKinesisITCase extends CamelSourceTestSupport {
diff --git a/tests/itests-parent/pom.xml b/tests/itests-parent/pom.xml
index 994cecbad..083d68fe0 100644
--- a/tests/itests-parent/pom.xml
+++ b/tests/itests-parent/pom.xml
@@ -60,6 +60,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-yaml-dsl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-bean</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git 
a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/model/KameletModel.java
 
b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/model/KameletModel.java
index fc081867f..95c31d137 100644
--- 
a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/model/KameletModel.java
+++ 
b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/model/KameletModel.java
@@ -19,9 +19,6 @@ package org.apache.camel.kafkaconnector.maven.model;
 import java.util.List;
 import java.util.Set;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 public class KameletModel {
     private String name;
     private String type;
@@ -47,7 +44,7 @@ public class KameletModel {
     }
 
     public Set<String> getDependencies() {
-        return ImmutableSet.copyOf(dependencies);
+        return Set.copyOf(dependencies);
     }
 
     public void setDependencies(Set<String> dependencies) {
@@ -55,7 +52,7 @@ public class KameletModel {
     }
 
     public List<KameletPropertyModel> getProperties() {
-        return ImmutableList.copyOf(properties);
+        return List.copyOf(properties);
     }
 
     public void setProperties(List<KameletPropertyModel> properties) {
@@ -63,7 +60,7 @@ public class KameletModel {
     }
 
     public Set<String> getRequiredProperties() {
-        return ImmutableSet.copyOf(requiredProperties);
+        return Set.copyOf(requiredProperties);
     }
 
     public void setRequiredProperties(Set<String> requiredProperties) {

Reply via email to