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/09/30 12:21:42 UTC

[camel-kafka-connector] branch camel-master updated: Aggregation Support: Changed option name from camel.beans.aggregation to camel.aggregation

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

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


The following commit(s) were added to refs/heads/camel-master by this push:
     new a6bbbb3  Aggregation Support: Changed option name from camel.beans.aggregation to camel.aggregation
a6bbbb3 is described below

commit a6bbbb332b73512c8b03761820160f76a7c6e11d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Sep 30 12:04:01 2020 +0200

    Aggregation Support: Changed option name from camel.beans.aggregation to camel.aggregation
---
 .../org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java     | 4 ++--
 docs/modules/ROOT/pages/aggregation.adoc                              | 4 ++--
 .../camel/kafkaconnector/common/SourceConnectorPropertyFactory.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
index 9b4b2df..2308a1f 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
@@ -52,11 +52,11 @@ public class CamelSinkConnectorConfig extends AbstractConfig {
     public static final String CAMEL_SINK_AGGREGATE_DOC = "A reference to an aggregate bean, in the form of #class:";    
 
     public static final Integer CAMEL_SINK_AGGREGATE_SIZE_DEFAULT = 10;
-    public static final String CAMEL_SINK_AGGREGATE_SIZE_CONF = "camel.beans.aggregation.size";
+    public static final String CAMEL_SINK_AGGREGATE_SIZE_CONF = "camel.aggregation.size";
     public static final String CAMEL_SINK_AGGREGATE_SIZE_DOC = "The size of the aggregation, to be used in combination with camel.beans.aggregate";
     
     public static final Long CAMEL_SINK_AGGREGATE_TIMEOUT_DEFAULT = 500L;
-    public static final String CAMEL_SINK_AGGREGATE_TIMEOUT_CONF = "camel.beans.aggregation.timeout";
+    public static final String CAMEL_SINK_AGGREGATE_TIMEOUT_CONF = "camel.aggregation.timeout";
     public static final String CAMEL_SINK_AGGREGATE_TIMEOUT_DOC = "The timeout of the aggregation, to be used in combination with camel.beans.aggregate";    
 
     private static final ConfigDef CONFIG_DEF = new ConfigDef()
diff --git a/docs/modules/ROOT/pages/aggregation.adoc b/docs/modules/ROOT/pages/aggregation.adoc
index 5a0327a..0949895 100644
--- a/docs/modules/ROOT/pages/aggregation.adoc
+++ b/docs/modules/ROOT/pages/aggregation.adoc
@@ -11,8 +11,8 @@ We introduced then the following options in the Sink Connector Configuration:
 [source,bash]
 ----
 camel.beans.aggregate=#class:org.apache.camel.kafkaconnector.aggregator.StringAggregator
-camel.beans.aggregation.size=10
-camel.beans.aggregation.timeout=5000
+camel.aggregation.size=10
+camel.aggregation.timeout=5000
 ----
 
 So you'll be able to define your own AggregationStrategy by writing it through extending the AggregationStrategy Camel class or you can use one of the Aggregator provided by Camel.
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/SourceConnectorPropertyFactory.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/SourceConnectorPropertyFactory.java
index b1d5cb9..684459c 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/SourceConnectorPropertyFactory.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/SourceConnectorPropertyFactory.java
@@ -33,8 +33,8 @@ public abstract class SourceConnectorPropertyFactory<T extends SourceConnectorPr
 
     public T withAggregate(String aggregate, int size, int timeout) {
         withBeans("aggregate", classRef(aggregate));
-        getProperties().put("camel.beans.aggregation.size", size);
-        getProperties().put("camel.beans.aggregation.timeout", timeout);
+        getProperties().put("camel.aggregation.size", size);
+        getProperties().put("camel.aggregation.timeout", timeout);
 
         return (T) this;
     }