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
The following commit(s) were added to refs/heads/master by this push:
new f5d4dc6 First step to make dependencies as minimal as possible
f5d4dc6 is described below
commit f5d4dc6f148790456b7a096a0bd54ee6a54d765c
Author: Andrea Tarocchi <[email protected]>
AuthorDate: Wed Apr 22 02:32:13 2020 +0200
First step to make dependencies as minimal as possible
---
.../awss3}/converters/S3ObjectConverter.java | 3 +-
.../awss3/serializers}/S3ObjectSerializer.java | 2 +-
.../awss3/transforms/S3ObjectTransforms.java | 5 +-
core/pom.xml | 53 ----------------------
.../camel/kafkaconnector/CamelSinkTaskTest.java | 23 +++++-----
.../camel/kafkaconnector/CamelSourceTaskTest.java | 13 ++----
.../camel/kafkaconnector/DataFormatTest.java | 5 +-
.../camel/kafkaconnector/PropertiesOrderTest.java | 5 +-
.../kafkaconnector/utils/SchemaHelperTest.java | 10 ++--
tests/pom.xml | 10 ++--
.../source/aws/s3/CamelAWSS3PropertyFactory.java | 4 +-
11 files changed, 39 insertions(+), 94 deletions(-)
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/converters/S3ObjectConverter.java
similarity index 91%
rename from
core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java
rename to
connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/converters/S3ObjectConverter.java
index b1ad0ac..7ee4802 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectConverter.java
+++
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/converters/S3ObjectConverter.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.kafkaconnector.converters;
+package org.apache.camel.kafkaconnector.awss3.converters;
import java.util.Map;
import com.amazonaws.services.s3.model.S3ObjectInputStream;
+import org.apache.camel.kafkaconnector.awss3.serializers.S3ObjectSerializer;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaAndValue;
import org.apache.kafka.connect.storage.Converter;
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/serializers/S3ObjectSerializer.java
similarity index 97%
rename from
core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java
rename to
connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/serializers/S3ObjectSerializer.java
index e50e68b..29ea41b 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectSerializer.java
+++
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/serializers/S3ObjectSerializer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.kafkaconnector.converters;
+package org.apache.camel.kafkaconnector.awss3.serializers;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectTransformer.java
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/transforms/S3ObjectTransforms.java
similarity index 89%
rename from
core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectTransformer.java
rename to
connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/transforms/S3ObjectTransforms.java
index dc9e427..a40dacc 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/converters/S3ObjectTransformer.java
+++
b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/transforms/S3ObjectTransforms.java
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.kafkaconnector.converters;
+package org.apache.camel.kafkaconnector.awss3.transforms;
import java.util.Map;
import com.amazonaws.services.s3.model.S3ObjectInputStream;
+import org.apache.camel.kafkaconnector.awss3.serializers.S3ObjectSerializer;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.connect.connector.ConnectRecord;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.transforms.Transformation;
-public class S3ObjectTransformer<R extends ConnectRecord<R>> implements
Transformation<R> {
+public class S3ObjectTransforms<R extends ConnectRecord<R>> implements
Transformation<R> {
public static final ConfigDef CONFIG_DEF = new ConfigDef()
.define("test", ConfigDef.Type.STRING, "test",
ConfigDef.Importance.MEDIUM, "Transform the content of a bucket into a string
");
diff --git a/core/pom.xml b/core/pom.xml
index ac4e2cd..4218d0c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,59 +44,6 @@
<artifactId>camel-main</artifactId>
</dependency>
- <!-- Camel components -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cassandraql</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-telegram</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-sqs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-s3</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-sns</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-kinesis</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-syslog</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-elasticsearch-rest</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Kafka -->
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
index a169744..3003afa 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.kafka.connect.data.Schema;
@@ -36,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelSinkTaskTest {
@Test
- public void testOnlyBody() throws JsonProcessingException,
InterruptedException {
+ public void testOnlyBody() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -60,7 +59,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndHeaders() throws JsonProcessingException,
InterruptedException {
+ public void testBodyAndHeaders() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -104,7 +103,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndProperties() throws JsonProcessingException,
InterruptedException {
+ public void testBodyAndProperties() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -148,7 +147,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndPropertiesHeadersMixed() throws
JsonProcessingException, InterruptedException {
+ public void testBodyAndPropertiesHeadersMixed() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -206,7 +205,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndHeadersMap() throws JsonProcessingException,
InterruptedException {
+ public void testBodyAndHeadersMap() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -261,7 +260,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndPropertiesHeadersMapMixed() throws
JsonProcessingException, InterruptedException {
+ public void testBodyAndPropertiesHeadersMapMixed() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -337,7 +336,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndHeadersList() throws JsonProcessingException,
InterruptedException {
+ public void testBodyAndHeadersList() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -388,7 +387,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testBodyAndPropertiesHeadersListMixed() throws
JsonProcessingException, InterruptedException {
+ public void testBodyAndPropertiesHeadersListMixed() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -458,7 +457,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testUrlPrecedenceOnComponentProperty() throws
JsonProcessingException, InterruptedException {
+ public void testUrlPrecedenceOnComponentProperty() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "seda:test");
props.put("topics", "mytopic");
@@ -485,7 +484,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testOnlyBodyUsingComponentProperty() throws
JsonProcessingException, InterruptedException {
+ public void testOnlyBodyUsingComponentProperty() {
Map<String, String> props = new HashMap<>();
props.put("topics", "mytopic");
props.put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "seda");
@@ -513,7 +512,7 @@ public class CamelSinkTaskTest {
}
@Test
- public void testOnlyBodyUsingMultipleComponentProperties() throws
JsonProcessingException, InterruptedException {
+ public void testOnlyBodyUsingMultipleComponentProperties() {
Map<String, String> props = new HashMap<>();
props.put("topics", "mytopic");
props.put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "seda");
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index 934b78d..4c4b630 100644
---
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -16,20 +16,15 @@
*/
package org.apache.camel.kafkaconnector;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.camel.ConsumerTemplate;
-import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.header.Header;
import org.apache.kafka.connect.header.Headers;
-import org.apache.kafka.connect.sink.SinkRecord;
import org.apache.kafka.connect.source.SourceRecord;
import org.junit.jupiter.api.Test;
@@ -222,7 +217,7 @@ public class CamelSourceTaskTest {
}
@Test
- public void testSourcePollingConsumerOptions() throws InterruptedException
{
+ public void testSourcePollingConsumerOptions() {
Map<String, String> props = new HashMap<>();
props.put("camel.source.url", "timer:kafkaconnector");
props.put("camel.source.kafka.topic", "mytopic");
@@ -243,7 +238,7 @@ public class CamelSourceTaskTest {
}
@Test
- public void testUrlPrecedenceOnComponentProperty() throws
JsonProcessingException, InterruptedException {
+ public void testUrlPrecedenceOnComponentProperty() throws
InterruptedException {
Map<String, String> props = new HashMap<>();
props.put("camel.source.url", "timer:kafkaconnector");
props.put("camel.source.kafka.topic", "mytopic");
@@ -273,7 +268,7 @@ public class CamelSourceTaskTest {
}
@Test
- public void testSourcePollingUsingComponentProperty() throws
JsonProcessingException, InterruptedException {
+ public void testSourcePollingUsingComponentProperty() throws
InterruptedException {
Map<String, String> props = new HashMap<>();
props.put("camel.source.kafka.topic", "mytopic");
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF,
"timer");
@@ -304,7 +299,7 @@ public class CamelSourceTaskTest {
}
@Test
- public void testSourcePollingUsingMultipleComponentProperties() throws
JsonProcessingException, InterruptedException {
+ public void testSourcePollingUsingMultipleComponentProperties() throws
InterruptedException {
Map<String, String> props = new HashMap<>();
props.put("camel.source.kafka.topic", "mytopic");
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF,
"timer");
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java
index cf237ae..bd07866 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/DataFormatTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.kafkaconnector;
import java.util.HashMap;
import java.util.Map;
-import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.camel.component.hl7.HL7DataFormat;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.kafkaconnector.utils.CamelMainSupport;
@@ -32,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class DataFormatTest {
@Test
- public void testDataFormatSource() throws JsonProcessingException,
InterruptedException {
+ public void testDataFormatSource() {
Map<String, String> props = new HashMap<>();
props.put("camel.source.url", "direct://test");
props.put("camel.source.kafka.topic", "mytopic");
@@ -44,7 +43,7 @@ public class DataFormatTest {
}
@Test
- public void testDataFormatSink() throws JsonProcessingException,
InterruptedException {
+ public void testDataFormatSink() {
Map<String, String> props = new HashMap<>();
props.put("camel.sink.url", "direct://test");
props.put("camel.sink.kafka.topic", "mytopic");
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java
index d1cb7b2..5402589 100644
---
a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java
+++
b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java
@@ -19,13 +19,12 @@ package org.apache.camel.kafkaconnector;
import java.util.HashMap;
import java.util.Map;
-import com.fasterxml.jackson.core.JsonProcessingException;
import org.junit.jupiter.api.Test;
public class PropertiesOrderTest {
@Test
- public void testOneOrder() throws JsonProcessingException,
InterruptedException {
+ public void testOneOrder() {
Map<String, String> props = new HashMap<>();
props.put("camel.source.url", "seda://test");
props.put("camel.source.kafka.topic", "mytopic");
@@ -38,7 +37,7 @@ public class PropertiesOrderTest {
}
@Test
- public void testOppositOrder() throws JsonProcessingException,
InterruptedException {
+ public void testOppositOrder() {
Map<String, String> props = new HashMap<>();
props.put("camel.source.url", "seda://test");
props.put("camel.source.kafka.topic", "mytopic");
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/utils/SchemaHelperTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/utils/SchemaHelperTest.java
index e37feff..a43f76b 100644
---
a/core/src/test/java/org/apache/camel/kafkaconnector/utils/SchemaHelperTest.java
+++
b/core/src/test/java/org/apache/camel/kafkaconnector/utils/SchemaHelperTest.java
@@ -23,8 +23,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import com.amazonaws.services.s3.model.S3ObjectInputStream;
-import org.apache.http.client.methods.HttpDelete;
import org.apache.kafka.connect.data.Decimal;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.data.SchemaBuilder;
@@ -78,7 +76,11 @@ public class SchemaHelperTest {
assertEquals(Schema.Type.STRUCT,
SchemaHelper.buildSchemaBuilderForType(structValue).type());
// finally how to handle if we have no idea about the value
- final S3ObjectInputStream s3ObjectInputStream = new
S3ObjectInputStream(System.in, new HttpDelete());
- assertEquals(Schema.Type.BYTES,
SchemaHelper.buildSchemaBuilderForType(s3ObjectInputStream).type());
+ final CustomType customType = new CustomType();
+ assertEquals(Schema.Type.BYTES,
SchemaHelper.buildSchemaBuilderForType(customType).type());
+ }
+
+ private class CustomType {
+
}
}
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index 1eaa9eb..9f144cb 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -57,6 +57,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel.kafkaconnector</groupId>
+ <artifactId>camel-aws-s3-kafka-connector</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-telegram</artifactId>
</dependency>
@@ -80,10 +86,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-aws-sns</artifactId>
</dependency>
<dependency>
diff --git
a/tests/src/test/java/org/apache/camel/kafkaconnector/source/aws/s3/CamelAWSS3PropertyFactory.java
b/tests/src/test/java/org/apache/camel/kafkaconnector/source/aws/s3/CamelAWSS3PropertyFactory.java
index c1ecc67..13f1c6d 100644
---
a/tests/src/test/java/org/apache/camel/kafkaconnector/source/aws/s3/CamelAWSS3PropertyFactory.java
+++
b/tests/src/test/java/org/apache/camel/kafkaconnector/source/aws/s3/CamelAWSS3PropertyFactory.java
@@ -46,9 +46,9 @@ class CamelAWSS3PropertyFactory implements
ConnectorPropertyFactory {
Properties connectorProps = new Properties();
connectorProps.put(ConnectorConfig.NAME_CONFIG,
"CamelAWSS3SSourceConnector");
- connectorProps.put(ConnectorConfig.CONNECTOR_CLASS_CONFIG,
"org.apache.camel.kafkaconnector.CamelSourceConnector");
+ connectorProps.put(ConnectorConfig.CONNECTOR_CLASS_CONFIG,
"org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector");
connectorProps.put(ConnectorConfig.KEY_CONVERTER_CLASS_CONFIG,
"org.apache.kafka.connect.storage.StringConverter");
- connectorProps.put(ConnectorConfig.VALUE_CONVERTER_CLASS_CONFIG,
"org.apache.camel.kafkaconnector.converters.S3ObjectConverter");
+ connectorProps.put(ConnectorConfig.VALUE_CONVERTER_CLASS_CONFIG,
"org.apache.camel.kafkaconnector.awss3.converters.S3ObjectConverter");
connectorProps.put("camel.source.kafka.topic", topic);
