This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 69a97c77b00fa7563f278d48aa4d371b8f6f4db2 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Oct 9 12:10:31 2020 +0200 Aggregation Support: Changed option name from camel.beans.aggregation to camel.aggregation --- .../java/org/apache/camel/kafkaconnector/CamelConnectorConfig.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/CamelConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java index fd62052..ae67309 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java @@ -28,11 +28,11 @@ public abstract class CamelConnectorConfig extends AbstractConfig { public static final String CAMEL_CONNECTOR_AGGREGATE_DOC = "A reference to an aggregate bean, in the form of #class:"; public static final Integer CAMEL_CONNECTOR_AGGREGATE_SIZE_DEFAULT = 10; - public static final String CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF = "camel.beans.aggregation.size"; + public static final String CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF = "camel.aggregation.size"; public static final String CAMEL_CONNECTOR_AGGREGATE_SIZE_DOC = "The size of the aggregation, to be used in combination with camel.beans.aggregate"; public static final Long CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DEFAULT = 500L; - public static final String CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF = "camel.beans.aggregation.timeout"; + public static final String CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF = "camel.aggregation.timeout"; public static final String CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DOC = "The timeout of the aggregation, to be used in combination with camel.beans.aggregate"; protected CamelConnectorConfig(ConfigDef definition, Map<?, ?> originals, Map<String, ?> configProviderProps, boolean doLog) { 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; }