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/12/16 07:04:58 UTC
[camel-kafka-connector] branch camel-master-sync created (now
6d05e98)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
at 6d05e98 Regen catalog and docs
This branch includes the following new commits:
new eac0b2d Camel-AWS2-S3 connector: Add out of the box specific Aggregation Strategies, added NewlineAggregationStrategy
new f047751 Fixed AWS2-S3 Test
new e940ea4 AWS2-S3 Catalog: Fixed test
new cdf4e32 Enable integration tests on Apache CI
new 6d05e98 Regen catalog and docs
The 5 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] 05/05: Regen catalog and docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 6d05e9864e7999c37fefacb4579b6c154194f112
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 16 07:54:41 2020 +0100
Regen catalog and docs
---
.../src/generated/resources/camel-aws2-s3-sink.json | 3 +++
.../src/generated/resources/camel-aws2-s3-source.json | 3 +++
.../src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++++++++++-
.../src/main/docs/camel-aws2-s3-kafka-source-connector.adoc | 11 ++++++++++-
.../pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++++++++++-
.../connectors/camel-aws2-s3-kafka-source-connector.adoc | 11 ++++++++++-
6 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
index 6584536..1315b3f 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
@@ -427,5 +427,8 @@
],
"transforms": [
"org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms"
+ ],
+ "aggregationStrategies": [
+ "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy"
]
}
\ No newline at end of file
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
index 26ca056..e638764 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
@@ -587,5 +587,8 @@
],
"transforms": [
"org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms"
+ ],
+ "aggregationStrategies": [
+ "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy"
]
}
\ No newline at end of file
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
index 18a7c1a..b0ae90b 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
@@ -119,5 +119,14 @@ org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms
-The camel-aws2-s3 sink connector has no aggregation strategies out of the box.
+The camel-aws2-s3 sink connector supports 1 aggregation strategies out of the box, which are listed below.
+
+
+
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy
+
+----
// kafka-connector options: END
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
index 466b485..c74fffd 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
@@ -143,5 +143,14 @@ org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms
-The camel-aws2-s3 sink connector has no aggregation strategies out of the box.
+The camel-aws2-s3 sink connector supports 1 aggregation strategies out of the box, which are listed below.
+
+
+
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy
+
+----
// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
index 18a7c1a..b0ae90b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
@@ -119,5 +119,14 @@ org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms
-The camel-aws2-s3 sink connector has no aggregation strategies out of the box.
+The camel-aws2-s3 sink connector supports 1 aggregation strategies out of the box, which are listed below.
+
+
+
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy
+
+----
// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
index 466b485..c74fffd 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
@@ -143,5 +143,14 @@ org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms
-The camel-aws2-s3 sink connector has no aggregation strategies out of the box.
+The camel-aws2-s3 sink connector supports 1 aggregation strategies out of the box, which are listed below.
+
+
+
+[source,java]
+----
+
+org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy
+
+----
// kafka-connector options: END
[camel-kafka-connector] 04/05: Enable integration tests on Apache CI
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit cdf4e327914d68ab1638cac0399823dcd60939d3
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue Dec 15 15:17:33 2020 +0100
Enable integration tests on Apache CI
---
Jenkinsfile | 2 +-
Jenkinsfile.jdk11 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 35cacac..bfa1f1d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
stage('Test') {
steps {
- sh "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install"
+ sh "./mvnw $MAVEN_PARAMS -DskipIntegrationTests=false -Denable.slow.tests=true -Dmaven.test.failure.ignore=true clean install"
}
post {
always {
diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11
index 0ed1428..7011e19 100644
--- a/Jenkinsfile.jdk11
+++ b/Jenkinsfile.jdk11
@@ -66,7 +66,7 @@ pipeline {
stage('Test') {
steps {
- sh "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install"
+ sh "./mvnw $MAVEN_PARAMS -DskipIntegrationTests=false -Denable.slow.tests=true -Dmaven.test.failure.ignore=true clean install"
}
post {
always {
[camel-kafka-connector] 03/05: AWS2-S3 Catalog: Fixed test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit e940ea4fd85c8f2350d23f778d434a8f3312801f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 14 13:50:41 2020 +0100
AWS2-S3 Catalog: Fixed test
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 6b3f39d..15a34ea 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
@@ -64,7 +64,7 @@ class CamelKafkaConnectorCatalogTest {
assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
assertEquals(1, model.getConverters().size());
assertEquals(1, model.getTransforms().size());
- assertEquals(1, model.getAggregationStrategies());
+ assertEquals(1, model.getAggregationStrategies().size());
}
@Test
[camel-kafka-connector] 01/05: Camel-AWS2-S3 connector: Add out of
the box specific Aggregation Strategies, added NewlineAggregationStrategy
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit eac0b2d123cc99f3279dee8c1ef39b61cebf67ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 14 11:12:57 2020 +0100
Camel-AWS2-S3 connector: Add out of the box specific Aggregation Strategies, added NewlineAggregationStrategy
---
.../aggregation/NewlineAggregationStrategy.java | 44 ++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java
new file mode 100644
index 0000000..9c61218
--- /dev/null
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java
@@ -0,0 +1,44 @@
+/*
+ * 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.aws2s3.aggregation;
+
+import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+
+public class NewlineAggregationStrategy implements AggregationStrategy {
+
+ @Override
+ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+ // lets append the old body to the new body
+ if (oldExchange == null) {
+ return newExchange;
+ }
+
+ String body = oldExchange.getIn().getBody(String.class);
+ if (body != null) {
+ Message newIn = newExchange.getIn();
+ String newBody = newIn.getBody(String.class);
+ if (newBody != null) {
+ body += System.lineSeparator() + newBody;
+ }
+
+ newIn.setBody(body);
+ }
+ return newExchange;
+ }
+}
[camel-kafka-connector] 02/05: Fixed AWS2-S3 Test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-master-sync
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit f047751ab37ed68cb0a018e67b23b5b264101950
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 14 13:24:52 2020 +0100
Fixed AWS2-S3 Test
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 312837b..6b3f39d 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
@@ -64,7 +64,7 @@ class CamelKafkaConnectorCatalogTest {
assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
assertEquals(1, model.getConverters().size());
assertEquals(1, model.getTransforms().size());
- assertNull(model.getAggregationStrategies());
+ assertEquals(1, model.getAggregationStrategies());
}
@Test