Repository: camel Updated Branches: refs/heads/master 8b6ff3f77 -> 4003fc7f4
CAMEL-9467: remove deprecated config-items Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c2f89b9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c2f89b9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c2f89b9 Branch: refs/heads/master Commit: 5c2f89b90d94e21ac336bc2dd22b03292634a7a3 Parents: 8b6ff3f Author: Arno Noordover <anoordo...@users.noreply.github.com> Authored: Sat Jul 2 17:25:47 2016 +0200 Committer: Arno Noordover <anoordo...@users.noreply.github.com> Committed: Sat Jul 2 17:25:47 2016 +0200 ---------------------------------------------------------------------- .../component/kafka/KafkaConfiguration.java | 26 -------------------- .../camel/component/kafka/KafkaEndpoint.java | 16 ------------ .../kafka/KafkaConsumerBatchSizeTest.java | 2 -- 3 files changed, 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5c2f89b9/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java index 7a7f9d4..35ebd36 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java @@ -48,10 +48,6 @@ public class KafkaConfiguration { private int consumerStreams = 10; @UriParam(label = "consumer", defaultValue = "1") private int consumersCount = 1; - @UriParam(label = "consumer", defaultValue = "100") - private int batchSize = 100; - @UriParam(label = "consumer", defaultValue = "10000") - private int barrierAwaitTimeoutMs = 10000; //Common configuration properties @UriParam @@ -407,28 +403,6 @@ public class KafkaConfiguration { this.consumerStreams = consumerStreams; } - public int getBatchSize() { - return batchSize; - } - - /** - * The batchSize that the BatchingConsumerTask processes once. - */ - public void setBatchSize(int batchSize) { - this.batchSize = batchSize; - } - - public int getBarrierAwaitTimeoutMs() { - return barrierAwaitTimeoutMs; - } - - /** - * If the BatchingConsumerTask processes exchange exceed the batchSize, it will wait for barrierAwaitTimeoutMs. - */ - public void setBarrierAwaitTimeoutMs(int barrierAwaitTimeoutMs) { - this.barrierAwaitTimeoutMs = barrierAwaitTimeoutMs; - } - public int getConsumersCount() { return consumersCount; } http://git-wip-us.apache.org/repos/asf/camel/blob/5c2f89b9/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java index 74aa883..e918bfd 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java @@ -374,10 +374,6 @@ public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS return configuration.getSslTruststoreLocation(); } - public void setBarrierAwaitTimeoutMs(int barrierAwaitTimeoutMs) { - configuration.setBarrierAwaitTimeoutMs(barrierAwaitTimeoutMs); - } - public String getSslProvider() { return configuration.getSslProvider(); } @@ -398,10 +394,6 @@ public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS return configuration.getTopic(); } - public int getBarrierAwaitTimeoutMs() { - return configuration.getBarrierAwaitTimeoutMs(); - } - public Integer getFetchMinBytes() { return configuration.getFetchMinBytes(); } @@ -462,10 +454,6 @@ public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS configuration.setConsumersCount(consumersCount); } - public int getBatchSize() { - return configuration.getBatchSize(); - } - public void setAutoCommitIntervalMs(Integer autoCommitIntervalMs) { configuration.setAutoCommitIntervalMs(autoCommitIntervalMs); } @@ -626,10 +614,6 @@ public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS return configuration.getSaslKerberosServiceName(); } - public void setBatchSize(int batchSize) { - configuration.setBatchSize(batchSize); - } - public Integer getLingerMs() { return configuration.getLingerMs(); } http://git-wip-us.apache.org/repos/asf/camel/blob/5c2f89b9/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java index 9128c62..8d5e678 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java @@ -36,9 +36,7 @@ public class KafkaConsumerBatchSizeTest extends BaseEmbeddedKafkaTest { + "&groupId=group1" + "&autoOffsetReset=earliest" + "&autoCommitEnable=false" - + "&batchSize=3" + "&consumerStreams=10" - + "&barrierAwaitTimeoutMs=1000" ) private Endpoint from;