You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by an...@apache.org on 2016/07/02 15:26:37 UTC
[1/2] camel git commit: CAMEL-9467: remove deprecated config-items
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 <an...@users.noreply.github.com>
Authored: Sat Jul 2 17:25:47 2016 +0200
Committer: Arno Noordover <an...@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;
[2/2] camel git commit: CAMEL-9467: remove deprecated config-items
Posted by an...@apache.org.
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/4003fc7f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4003fc7f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4003fc7f
Branch: refs/heads/master
Commit: 4003fc7f4f4d09fb8b91a5ee2e78c562487b6aad
Parents: 5c2f89b
Author: Arno Noordover <an...@users.noreply.github.com>
Authored: Sat Jul 2 17:26:16 2016 +0200
Committer: Arno Noordover <an...@users.noreply.github.com>
Committed: Sat Jul 2 17:26:16 2016 +0200
----------------------------------------------------------------------
components/camel-kafka/src/main/docs/kafka.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4003fc7f/components/camel-kafka/src/main/docs/kafka.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/docs/kafka.adoc b/components/camel-kafka/src/main/docs/kafka.adoc
index 8a07a13..557eec2 100644
--- a/components/camel-kafka/src/main/docs/kafka.adoc
+++ b/components/camel-kafka/src/main/docs/kafka.adoc
@@ -86,8 +86,9 @@ The Kafka component supports 1 options which are listed below.
+
// endpoint options: START
-The Kafka component supports 75 endpoint options which are listed below:
+The Kafka component supports 73 endpoint options which are listed below:
{% raw %}
[width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -102,8 +103,6 @@ The Kafka component supports 75 endpoint options which are listed below:
| autoCommitEnable | consumer | true | Boolean | If true periodically commit to ZooKeeper the offset of messages already fetched by the consumer. This committed offset will be used when the process fails as the position from which the new consumer will begin.
| autoCommitIntervalMs | consumer | 5000 | Integer | The frequency in ms that the consumer offsets are committed to zookeeper.
| autoOffsetReset | consumer | latest | String | What to do when there is no initial offset in ZooKeeper or if an offset is out of range: smallest : automatically reset the offset to the smallest offset largest : automatically reset the offset to the largest offset fail: throw exception to the consumer
-| barrierAwaitTimeoutMs | consumer | 10000 | int | If the BatchingConsumerTask processes exchange exceed the batchSize it will wait for barrierAwaitTimeoutMs.
-| batchSize | consumer | 100 | int | The batchSize that the BatchingConsumerTask processes once.
| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored.
| checkCrcs | consumer | true | Boolean | Automatically check the CRC32 of the records consumed. This ensures no on-the-wire or on-disk corruption to the messages occurred. This check adds some overhead so it may be disabled in cases seeking extreme performance.
| consumerId | consumer | | String | Generated automatically if not set.
@@ -180,6 +179,7 @@ The Kafka component supports 75 endpoint options which are listed below:
+
For more information about Producer/Consumer configuration:
http://kafka.apache.org/documentation.html#newconsumerconfigs[http://kafka.apache.org/documentation.html#newconsumerconfigs]