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/11/26 12:59:54 UTC
[camel-kafka-connector] branch ssh-transforms created (now 0c1d096)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch ssh-transforms
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
at 0c1d096 Itest SSH: Commons-io is needed in it test
This branch includes the following new commits:
new 2c8b8cc Move SshTransforms from example/it test class directly in the camel-ssh-kafka-connector
new c119916 Move SshTransforms from example/it test class directly in the camel-ssh-kafka-connector, removed the transforms from itest
new 0c1d096 Itest SSH: Commons-io is needed in it test
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.
[camel-kafka-connector] 03/03: Itest SSH: Commons-io is needed in
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 ssh-transforms
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 0c1d09698c86e6a004b1f64e1035d09f222b46c0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 26 13:56:32 2020 +0100
Itest SSH: Commons-io is needed in it test
---
.../src/generated/resources/connectors/camel-ssh-sink.json | 5 ++++-
.../src/generated/resources/connectors/camel-ssh-source.json | 5 ++++-
connectors/camel-ssh-kafka-connector/pom.xml | 10 +++++-----
.../src/generated/resources/camel-ssh-sink.json | 5 ++++-
.../src/generated/resources/camel-ssh-source.json | 5 ++++-
.../src/main/docs/camel-ssh-kafka-sink-connector.adoc | 9 ++++++++-
.../src/main/docs/camel-ssh-kafka-source-connector.adoc | 9 ++++++++-
docs/modules/ROOT/pages/connectors.adoc | 4 +++-
.../ROOT/pages/connectors/camel-ssh-kafka-sink-connector.adoc | 9 ++++++++-
.../pages/connectors/camel-ssh-kafka-source-connector.adoc | 9 ++++++++-
tests/itests-ssh/pom.xml | 7 +++++++
11 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
index 6218719..116322d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
@@ -215,5 +215,8 @@
"priority": "MEDIUM",
"required": "false"
}
- }
+ },
+ "transforms": [
+ "org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms"
+ ]
}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
index 1d3514b..524b915 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
@@ -345,5 +345,8 @@
"priority": "MEDIUM",
"required": "false"
}
- }
+ },
+ "transforms": [
+ "org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms"
+ ]
}
\ No newline at end of file
diff --git a/connectors/camel-ssh-kafka-connector/pom.xml b/connectors/camel-ssh-kafka-connector/pom.xml
index fb2a4b3..b6820bd 100644
--- a/connectors/camel-ssh-kafka-connector/pom.xml
+++ b/connectors/camel-ssh-kafka-connector/pom.xml
@@ -44,17 +44,17 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-ssh</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io-version}</version>
+ </dependency>
<!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>camel-kafka-connector</artifactId>
</dependency>
<!--END OF GENERATED CODE-->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io-version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-sink.json b/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-sink.json
index 6218719..116322d 100644
--- a/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-sink.json
+++ b/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-sink.json
@@ -215,5 +215,8 @@
"priority": "MEDIUM",
"required": "false"
}
- }
+ },
+ "transforms": [
+ "org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms"
+ ]
}
\ No newline at end of file
diff --git a/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-source.json b/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-source.json
index 1d3514b..524b915 100644
--- a/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-source.json
+++ b/connectors/camel-ssh-kafka-connector/src/generated/resources/camel-ssh-source.json
@@ -345,5 +345,8 @@
"priority": "MEDIUM",
"required": "false"
}
- }
+ },
+ "transforms": [
+ "org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms"
+ ]
}
\ No newline at end of file
diff --git a/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-sink-connector.adoc b/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-sink-connector.adoc
index 0640f65..fa09f31 100644
--- a/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-sink-connector.adoc
+++ b/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-sink-connector.adoc
@@ -71,10 +71,17 @@ The camel-ssh sink connector has no converters out of the box.
-The camel-ssh sink connector has no transforms out of the box.
+The camel-ssh sink connector supports 0 transforms out of the box, which are listed below.
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms
+
+----
+
The camel-ssh sink connector has no aggregation strategies out of the box.
diff --git a/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-source-connector.adoc b/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-source-connector.adoc
index aaf2c85..6350a15 100644
--- a/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-source-connector.adoc
+++ b/connectors/camel-ssh-kafka-connector/src/main/docs/camel-ssh-kafka-source-connector.adoc
@@ -91,10 +91,17 @@ The camel-ssh sink connector has no converters out of the box.
-The camel-ssh sink connector has no transforms out of the box.
+The camel-ssh sink connector supports 0 transforms out of the box, which are listed below.
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms
+
+----
+
The camel-ssh sink connector has no aggregation strategies out of the box.
diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc
index 7a88ca6..31a88fc 100644
--- a/docs/modules/ROOT/pages/connectors.adoc
+++ b/docs/modules/ROOT/pages/connectors.adoc
@@ -2,7 +2,7 @@
= Supported connectors and documentation
// kafka-connectors list: START
-Number of Camel Kafka connectors: 346
+Number of Camel Kafka connectors: 348
[width="100%",cols="4,1,1,1,1,1,1",options="header"]
|===
@@ -16,6 +16,7 @@ Number of Camel Kafka connectors: 346
| *camel-arangodb-kafka-connector* | true | false | xref:connectors/camel-arangodb-kafka-sink-connector.adoc[Sink Docs] | | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-arangodb-kafka-connector/0.6.0/camel-arangodb-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-arangodb-kafka-connector/0.6.0/camel-arangodb-kafka-connector-0.6.0-package.tar.gz[Download Tar.gz]
| *camel-as2-kafka-connector* | true | true | xref:connectors/camel-as2-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-as2-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-as2-kafka-connector/0.6.0/camel-as2-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-as2-kafka-connector/0.6.0/camel-as2-kafka-connector-0.6.0-package.tar.gz[Dow [...]
| *camel-asterisk-kafka-connector* | true | true | xref:connectors/camel-asterisk-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-asterisk-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-asterisk-kafka-connector/0.6.0/camel-asterisk-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-asterisk-kafka-connector/0.6.0/camel-asterisk-kafka [...]
+| *camel-atlasmap-kafka-connector* | true | false | xref:connectors/camel-atlasmap-kafka-sink-connector.adoc[Sink Docs] | | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atlasmap-kafka-connector/0.6.0/camel-atlasmap-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atlasmap-kafka-connector/0.6.0/camel-atlasmap-kafka-connector-0.6.0-package.tar.gz[Download Tar.gz]
| *camel-atmos-kafka-connector* | true | true | xref:connectors/camel-atmos-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atmos-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atmos-kafka-connector/0.6.0/camel-atmos-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atmos-kafka-connector/0.6.0/camel-atmos-kafka-connector-0.6.0-pack [...]
| *camel-atmosphere-websocket-kafka-connector* | true | true | xref:connectors/camel-atmosphere-websocket-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atmosphere-websocket-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atmosphere-websocket-kafka-connector/0.6.0/camel-atmosphere-websocket-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnect [...]
| *camel-atom-kafka-connector* | false | true | | xref:connectors/camel-atom-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atom-kafka-connector/0.6.0/camel-atom-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atom-kafka-connector/0.6.0/camel-atom-kafka-connector-0.6.0-package.tar.gz[Download Tar.gz]
@@ -200,6 +201,7 @@ Number of Camel Kafka connectors: 346
| *camel-jt400-kafka-connector* | true | true | xref:connectors/camel-jt400-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-jt400-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-jt400-kafka-connector/0.6.0/camel-jt400-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-jt400-kafka-connector/0.6.0/camel-jt400-kafka-connector-0.6.0-pack [...]
| *camel-kafka-kafka-connector* | true | true | xref:connectors/camel-kafka-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-kafka-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kafka-kafka-connector/0.6.0/camel-kafka-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kafka-kafka-connector/0.6.0/camel-kafka-kafka-connector-0.6.0-pack [...]
| *camel-kubernetes-config-maps-kafka-connector* | true | false | xref:connectors/camel-kubernetes-config-maps-kafka-sink-connector.adoc[Sink Docs] | | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-config-maps-kafka-connector/0.6.0/camel-kubernetes-config-maps-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-config-maps-kafka-connector/0.6.0/camel-kubernetes-con [...]
+| *camel-kubernetes-custom-resources-kafka-connector* | true | true | xref:connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-custom-resources-kafka-connector/0.6.0/camel-kubernetes-custom-resources-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/m [...]
| *camel-kubernetes-deployments-kafka-connector* | true | true | xref:connectors/camel-kubernetes-deployments-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-kubernetes-deployments-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-deployments-kafka-connector/0.6.0/camel-kubernetes-deployments-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/ka [...]
| *camel-kubernetes-hpa-kafka-connector* | true | true | xref:connectors/camel-kubernetes-hpa-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-kubernetes-hpa-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-hpa-kafka-connector/0.6.0/camel-kubernetes-hpa-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-hpa-kafka- [...]
| *camel-kubernetes-job-kafka-connector* | true | true | xref:connectors/camel-kubernetes-job-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-kubernetes-job-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-job-kafka-connector/0.6.0/camel-kubernetes-job-kafka-connector-0.6.0-package.zip[Download Zip] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-kubernetes-job-kafka- [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-sink-connector.adoc
index 0640f65..fa09f31 100644
--- a/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-sink-connector.adoc
@@ -71,10 +71,17 @@ The camel-ssh sink connector has no converters out of the box.
-The camel-ssh sink connector has no transforms out of the box.
+The camel-ssh sink connector supports 0 transforms out of the box, which are listed below.
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms
+
+----
+
The camel-ssh sink connector has no aggregation strategies out of the box.
diff --git a/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-source-connector.adoc
index aaf2c85..6350a15 100644
--- a/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-ssh-kafka-source-connector.adoc
@@ -91,10 +91,17 @@ The camel-ssh sink connector has no converters out of the box.
-The camel-ssh sink connector has no transforms out of the box.
+The camel-ssh sink connector supports 0 transforms out of the box, which are listed below.
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms
+
+----
+
The camel-ssh sink connector has no aggregation strategies out of the box.
diff --git a/tests/itests-ssh/pom.xml b/tests/itests-ssh/pom.xml
index b2d2388..9ae4379 100644
--- a/tests/itests-ssh/pom.xml
+++ b/tests/itests-ssh/pom.xml
@@ -41,6 +41,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-ssh</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[camel-kafka-connector] 01/03: Move SshTransforms from example/it
test class directly in the camel-ssh-kafka-connector
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch ssh-transforms
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 2c8b8cc8f58be6140e9a987a5e1efb08951068c0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 26 13:39:24 2020 +0100
Move SshTransforms from example/it test class directly in the camel-ssh-kafka-connector
---
connectors/camel-ssh-kafka-connector/pom.xml | 5 ++
.../ssh/transformers/SshTransforms.java | 76 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/connectors/camel-ssh-kafka-connector/pom.xml b/connectors/camel-ssh-kafka-connector/pom.xml
index d88559e..fb2a4b3 100644
--- a/connectors/camel-ssh-kafka-connector/pom.xml
+++ b/connectors/camel-ssh-kafka-connector/pom.xml
@@ -50,6 +50,11 @@
<artifactId>camel-kafka-connector</artifactId>
</dependency>
<!--END OF GENERATED CODE-->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io-version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/connectors/camel-ssh-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ssh/transformers/SshTransforms.java b/connectors/camel-ssh-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ssh/transformers/SshTransforms.java
new file mode 100644
index 0000000..8f14538
--- /dev/null
+++ b/connectors/camel-ssh-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ssh/transformers/SshTransforms.java
@@ -0,0 +1,76 @@
+/*
+ * 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.ssh.transformers;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Map;
+
+import org.apache.camel.kafkaconnector.utils.SchemaHelper;
+import org.apache.commons.io.IOUtils;
+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 SshTransforms<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(SshTransforms.class);
+
+ @Override
+ public R apply(R r) {
+ Object value = r.value();
+
+ if (r.value() instanceof ByteArrayInputStream) {
+ LOG.debug("Converting record from Ssh Body Result to text");
+ ByteArrayInputStream message = (ByteArrayInputStream)r.value();
+ String m = null;
+ try {
+ m = IOUtils.toString(message, Charset.defaultCharset());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(), SchemaHelper.buildSchemaBuilderForType(m), m, 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] 02/03: Move SshTransforms from example/it
test class directly in the camel-ssh-kafka-connector,
removed the transforms from itest
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch ssh-transforms
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit c119916712d52e69fe21f35a5239ba3b0864daac
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 26 13:40:36 2020 +0100
Move SshTransforms from example/it test class directly in the camel-ssh-kafka-connector, removed the transforms from itest
---
tests/itests-ssh/pom.xml | 6 --
.../ssh/source/CamelSourceSshITCase.java | 2 +-
.../kafkaconnector/ssh/source/SshTransforms.java | 76 ----------------------
3 files changed, 1 insertion(+), 83 deletions(-)
diff --git a/tests/itests-ssh/pom.xml b/tests/itests-ssh/pom.xml
index 087df1a..b2d2388 100644
--- a/tests/itests-ssh/pom.xml
+++ b/tests/itests-ssh/pom.xml
@@ -41,12 +41,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-ssh</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io-version}</version>
- </dependency>
</dependencies>
<build>
diff --git a/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/CamelSourceSshITCase.java b/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/CamelSourceSshITCase.java
index 8cd9abf..6316e01 100644
--- a/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/CamelSourceSshITCase.java
+++ b/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/CamelSourceSshITCase.java
@@ -76,7 +76,7 @@ public class CamelSourceSshITCase extends AbstractKafkaTest {
ConnectorPropertyFactory connectorPropertyFactory = CamelSshPropertyFactory.basic().withKafkaTopic(topic).withHost(sshService.getSshHost())
.withPort(Integer.toString(sshService.getSshPort())).withDelay(Integer.toString(10000)).withUsername("root").withPassword("root").withPollcommand("date")
- .withTransformsConfig("SshTransforms").withEntry("type", "org.apache.camel.kafkaconnector.ssh.source.SshTransforms").end();
+ .withTransformsConfig("SshTransforms").withEntry("type", "org.apache.camel.kafkaconnector.ssh.transformers.SshTransforms").end();
runTest(connectorPropertyFactory);
}
diff --git a/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/SshTransforms.java b/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/SshTransforms.java
deleted file mode 100644
index 6097d75..0000000
--- a/tests/itests-ssh/src/test/java/org/apache/camel/kafkaconnector/ssh/source/SshTransforms.java
+++ /dev/null
@@ -1,76 +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.ssh.source;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Map;
-
-import org.apache.camel.kafkaconnector.utils.SchemaHelper;
-import org.apache.commons.io.IOUtils;
-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 SshTransforms<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(SshTransforms.class);
-
- @Override
- public R apply(R r) {
- Object value = r.value();
-
- if (r.value() instanceof ByteArrayInputStream) {
- LOG.debug("Converting record from Ssh Body Result to text");
- ByteArrayInputStream message = (ByteArrayInputStream)r.value();
- String m = null;
- try {
- m = IOUtils.toString(message, Charset.defaultCharset());
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(), SchemaHelper.buildSchemaBuilderForType(m), m, 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) {
-
- }
-}