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/10/14 09:18:43 UTC
[camel-kafka-connector] 03/03: Add converters,
transforms and aggregationStrategies to catalog, fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch aggr-conv-transf
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ba561d3f55ddb77999b11b18db543a27c11fecf1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 14 10:36:38 2020 +0200
Add converters, transforms and aggregationStrategies to catalog, fixed CS
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java | 9 +++++++++
.../kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java | 3 +++
.../kafkaconnector/maven/utils/JsonMapperKafkaConnector.java | 6 +++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
index dd6a867..02c8bea 100644
--- a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
+++ b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
@@ -111,6 +111,15 @@ public class CamelKafkaConnectorCatalog {
model.setType((String)wrapper.get("type"));
model.setVersion((String)wrapper.get("version"));
model.setOptions(getConnectorOptionModel(obj));
+ if (obj.get("aggregationStrategies") != null) {
+ model.setAggregationStrategies((List<String>) obj.get("aggregationStrategies"));
+ }
+ if (obj.get("converters") != null) {
+ model.setConverters((List<String>) obj.get("converters"));
+ }
+ if (obj.get("transforms") != null) {
+ model.setTransforms((List<String>) obj.get("transforms"));
+ }
return model;
}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index e33c720..81a67eb 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -57,6 +57,9 @@ class CamelKafkaConnectorCatalogTest {
assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
+ assertEquals(model.getConverters().size(), 1);
+ assertNull(model.getTransforms());
+ assertNull(model.getAggregationStrategies());
}
@Test
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
index 992c24d..08af47e 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
@@ -43,13 +43,13 @@ public final class JsonMapperKafkaConnector {
wrapper.put("connector", obj);
wrapper.put("properties", asJsonObject(model.getOptions()));
if (model.getConverters().size() > 0) {
- wrapper.put("converters", new JsonArray(model.getConverters()));
+ wrapper.put("converters", new JsonArray(model.getConverters()));
}
if (model.getTransforms().size() > 0) {
- wrapper.put("transforms", new JsonArray(model.getTransforms()));
+ wrapper.put("transforms", new JsonArray(model.getTransforms()));
}
if (model.getAggregationStrategies().size() > 0) {
- wrapper.put("aggregationStrategies", new JsonArray(model.getAggregationStrategies()));
+ wrapper.put("aggregationStrategies", new JsonArray(model.getAggregationStrategies()));
}
return wrapper;
}