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 15:48:00 UTC

[camel-kafka-connector] branch master updated (061e066 -> 92a0c0b)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


    from 061e066  Rename all transformers, converters, aggregationStrategies to reflect the maning convention we have - Fixed catalog test
     new 9e04d87  Slack Connector: Add the slack transformer from itest to the slack connector ootb
     new 29c3954  Slack Connector: Add the slack transformer from itest to the slack connector ootb - aligned it test
     new 92a0c0b  Slack Connector: Add the slack transformer from itest to the slack connector ootb - regen catalog

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/generated/resources/connectors/camel-slack-sink.json     | 5 ++++-
 .../src/generated/resources/connectors/camel-slack-source.json   | 5 ++++-
 .../src/generated/resources/camel-slack-sink.json                | 5 ++++-
 .../src/generated/resources/camel-slack-source.json              | 5 ++++-
 .../src/main/docs/camel-slack-kafka-sink-connector.adoc          | 9 ++++++++-
 .../src/main/docs/camel-slack-kafka-source-connector.adoc        | 9 ++++++++-
 .../camel/kafkaconnector/slack/transformers/SlackTransforms.java | 6 +++---
 .../ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc  | 9 ++++++++-
 .../pages/connectors/camel-slack-kafka-source-connector.adoc     | 9 ++++++++-
 .../kafkaconnector/slack/source/CamelSourceSlackITCase.java      | 4 ++--
 10 files changed, 53 insertions(+), 13 deletions(-)
 rename tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/SlackTransformer.java => connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java (93%)


[camel-kafka-connector] 03/03: Slack Connector: Add the slack transformer from itest to the slack connector ootb - regen catalog

Posted by ac...@apache.org.
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-kafka-connector.git

commit 92a0c0baf0ce10a44ccf3ca0096499ca76c9bf62
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 14 16:09:30 2020 +0200

    Slack Connector: Add the slack transformer from itest to the slack connector ootb - regen catalog
---
 .../src/generated/resources/connectors/camel-slack-sink.json     | 5 ++++-
 .../src/generated/resources/connectors/camel-slack-source.json   | 5 ++++-
 .../src/generated/resources/camel-slack-sink.json                | 5 ++++-
 .../src/generated/resources/camel-slack-source.json              | 5 ++++-
 .../src/main/docs/camel-slack-kafka-sink-connector.adoc          | 9 ++++++++-
 .../src/main/docs/camel-slack-kafka-source-connector.adoc        | 9 ++++++++-
 .../ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc  | 9 ++++++++-
 .../pages/connectors/camel-slack-kafka-source-connector.adoc     | 9 ++++++++-
 8 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
index 4d9795f..4bd4e40 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
@@ -68,5 +68,8 @@
 			"description": "The incoming webhook URL",
 			"priority": "MEDIUM"
 		}
-	}
+	},
+	"transforms": [
+		"org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms"
+	]
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
index a8ed087..620208d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
@@ -165,5 +165,8 @@
 			"description": "The incoming webhook URL",
 			"priority": "MEDIUM"
 		}
-	}
+	},
+	"transforms": [
+		"org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms"
+	]
 }
\ No newline at end of file
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
index 4d9795f..4bd4e40 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
@@ -68,5 +68,8 @@
 			"description": "The incoming webhook URL",
 			"priority": "MEDIUM"
 		}
-	}
+	},
+	"transforms": [
+		"org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms"
+	]
 }
\ No newline at end of file
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
index a8ed087..620208d 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
@@ -165,5 +165,8 @@
 			"description": "The incoming webhook URL",
 			"priority": "MEDIUM"
 		}
-	}
+	},
+	"transforms": [
+		"org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms"
+	]
 }
\ No newline at end of file
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
index 86364d4..84d66d3 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
@@ -50,10 +50,17 @@ The camel-slack sink connector has no converters out of the box.
 
 
 
-The camel-slack sink connector has no transforms out of the box.
+The camel-slack sink connector supports 0 transforms out of the box, which are listed below.
 
 
 
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms
+
+----
+
 
 
 The camel-slack sink connector has no aggregation strategies out of the box.
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
index 5c74d83..9887b3b 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
@@ -67,10 +67,17 @@ The camel-slack sink connector has no converters out of the box.
 
 
 
-The camel-slack sink connector has no transforms out of the box.
+The camel-slack sink connector supports 0 transforms out of the box, which are listed below.
 
 
 
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms
+
+----
+
 
 
 The camel-slack sink connector has no aggregation strategies out of the box.
diff --git a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
index 86364d4..84d66d3 100644
--- a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
@@ -50,10 +50,17 @@ The camel-slack sink connector has no converters out of the box.
 
 
 
-The camel-slack sink connector has no transforms out of the box.
+The camel-slack sink connector supports 0 transforms out of the box, which are listed below.
 
 
 
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms
+
+----
+
 
 
 The camel-slack sink connector has no aggregation strategies out of the box.
diff --git a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
index 5c74d83..9887b3b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
@@ -67,10 +67,17 @@ The camel-slack sink connector has no converters out of the box.
 
 
 
-The camel-slack sink connector has no transforms out of the box.
+The camel-slack sink connector supports 0 transforms out of the box, which are listed below.
 
 
 
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms
+
+----
+
 
 
 The camel-slack sink connector has no aggregation strategies out of the box.


[camel-kafka-connector] 02/03: Slack Connector: Add the slack transformer from itest to the slack connector ootb - aligned it test

Posted by ac...@apache.org.
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-kafka-connector.git

commit 29c3954ac3fae9e7b3d4132772004bd57b584698
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 14 14:55:38 2020 +0200

    Slack Connector: Add the slack transformer from itest to the slack connector ootb - aligned it test
---
 .../slack/source/CamelSourceSlackITCase.java       |  4 +-
 .../slack/source/SlackTransformer.java             | 72 ----------------------
 2 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/CamelSourceSlackITCase.java b/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/CamelSourceSlackITCase.java
index 14ee2c8..8a24c7b 100644
--- a/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/CamelSourceSlackITCase.java
+++ b/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/CamelSourceSlackITCase.java
@@ -86,8 +86,8 @@ public class CamelSourceSlackITCase extends AbstractKafkaTest {
                 .withChannel(slackChannel)
                 .withMaxResults(1)
                 .withToken(token)
-                .withTransformsConfig("SlackTransformer")
-                    .withEntry("type", "org.apache.camel.kafkaconnector.slack.source.SlackTransformer")
+                .withTransformsConfig("SlackTransforms")
+                    .withEntry("type", "org.apache.camel.kafkaconnector.slack.transformers.SlackTransforms")
                     .end();
 
         factory.log();
diff --git a/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/SlackTransformer.java b/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/SlackTransformer.java
deleted file mode 100644
index cc144bd..0000000
--- a/tests/itests-slack/src/test/java/org/apache/camel/kafkaconnector/slack/source/SlackTransformer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.slack.source;
-
-import java.util.Map;
-
-import org.apache.camel.component.slack.helper.SlackMessage;
-import org.apache.camel.kafkaconnector.utils.SchemaHelper;
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.ConnectRecord;
-import org.apache.kafka.connect.transforms.Transformation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SlackTransformer <R extends ConnectRecord<R>> implements Transformation<R> {
-    public static final String FIELD_KEY_CONFIG = "key";
-    public static final ConfigDef CONFIG_DEF = new ConfigDef()
-            .define(FIELD_KEY_CONFIG, ConfigDef.Type.STRING, null, ConfigDef.Importance.MEDIUM,
-                    "Transforms String-based content from Kafka into a map");
-
-    private static final Logger LOG = LoggerFactory.getLogger(SlackTransformer.class);
-
-    @Override
-    public R apply(R r) {
-        Object value = r.value();
-
-        if (r.value() instanceof SlackMessage) {
-            LOG.debug("Converting record from SlackMessage to text");
-            SlackMessage message = (SlackMessage) r.value();
-
-            LOG.debug("Received text: {}", message.getText());
-
-            return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(),
-                    SchemaHelper.buildSchemaBuilderForType(message.getText()), message.getText(), r.timestamp());
-
-        } else {
-            LOG.debug("Unexpected message type: {}", r.value().getClass());
-
-            return r;
-        }
-    }
-
-    @Override
-    public ConfigDef config() {
-        return CONFIG_DEF;
-    }
-
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void configure(Map<String, ?> map) {
-
-    }
-}


[camel-kafka-connector] 01/03: Slack Connector: Add the slack transformer from itest to the slack connector ootb

Posted by ac...@apache.org.
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-kafka-connector.git

commit 9e04d87fa83b5e4d0cb1e343e09c4c4ea73f200c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 14 14:54:17 2020 +0200

    Slack Connector: Add the slack transformer from itest to the slack connector ootb
---
 .../slack/transformers/SlackTransforms.java        | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
new file mode 100644
index 0000000..a0de8d2
--- /dev/null
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.kafkaconnector.slack.transformers;
+
+import java.util.Map;
+
+import org.apache.camel.component.slack.helper.SlackMessage;
+import org.apache.camel.kafkaconnector.utils.SchemaHelper;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.ConnectRecord;
+import org.apache.kafka.connect.transforms.Transformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SlackTransforms <R extends ConnectRecord<R>> implements Transformation<R> {
+    public static final String FIELD_KEY_CONFIG = "key";
+    public static final ConfigDef CONFIG_DEF = new ConfigDef()
+            .define(FIELD_KEY_CONFIG, ConfigDef.Type.STRING, null, ConfigDef.Importance.MEDIUM,
+                    "Transforms String-based content from Kafka into a map");
+
+    private static final Logger LOG = LoggerFactory.getLogger(SlackTransforms.class);
+
+    @Override
+    public R apply(R r) {
+        Object value = r.value();
+
+        if (r.value() instanceof SlackMessage) {
+            LOG.debug("Converting record from SlackMessage to text");
+            SlackMessage message = (SlackMessage) r.value();
+
+            LOG.debug("Received text: {}", message.getText());
+
+            return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(),
+                    SchemaHelper.buildSchemaBuilderForType(message.getText()), message.getText(), r.timestamp());
+
+        } else {
+            LOG.debug("Unexpected message type: {}", r.value().getClass());
+
+            return r;
+        }
+    }
+
+    @Override
+    public ConfigDef config() {
+        return CONFIG_DEF;
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public void configure(Map<String, ?> map) {
+
+    }
+}