Repository: camel Updated Branches: refs/heads/master bad73bee9 -> 9e1c36534
Clean up Remove unneeded lines added labels to uri options Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e1c3653 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e1c3653 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e1c3653 Branch: refs/heads/master Commit: 9e1c3653410e9cf6956825db2e44384ca3bd32a9 Parents: 723e331 Author: Lukasz Mlynik <lukasz.mly...@hotmail.com> Authored: Fri Feb 10 20:12:52 2017 +0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Feb 12 09:30:40 2017 +0100 ---------------------------------------------------------------------- components/camel-kafka/src/main/docs/kafka-component.adoc | 2 +- components/camel-kafka/src/main/docs/kafka.adoc | 4 ---- .../org/apache/camel/component/kafka/KafkaConfiguration.java | 4 ++-- .../java/org/apache/camel/component/kafka/KafkaEndpoint.java | 1 - .../org/apache/camel/component/kafka/KafkaComponentTest.java | 1 - .../java/org/apache/camel/component/kafka/KafkaProducerTest.java | 2 -- 6 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/components/camel-kafka/src/main/docs/kafka-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc index c7293d8..c2516f7 100644 --- a/components/camel-kafka/src/main/docs/kafka-component.adoc +++ b/components/camel-kafka/src/main/docs/kafka-component.adoc @@ -58,7 +58,6 @@ The Kafka component supports 80 endpoint options which are listed below: | brokers | common | | String | *Required* This is for bootstrapping and the producer will only use it for getting metadata (topics partitions and replicas). The socket connections for sending the actual data will be established based on the broker information returned in the metadata. The format is host1:port1host2:port2 and the list can be a subset of brokers or a VIP pointing to a subset of brokers. This option is known as metadata.broker.list in the Kafka documentation. | clientId | common | | String | The client id is a user-specified string sent in each request to help trace calls. It should logically identify the application making the request. | groupId | common | | String | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. -| interceptorClasses | common | | String | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor | partitioner | common | org.apache.kafka.clients.producer.internals.DefaultPartitioner | String | The partitioner class for partitioning messages amongst sub-topics. The default partitioner is based on the hash of the key. | topic | common | | String | *Required* Name of the topic to use. | 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. @@ -112,6 +111,7 @@ The Kafka component supports 80 endpoint options which are listed below: | workerPoolCoreSize | producer | 10 | Integer | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | workerPoolMaxSize | producer | 20 | Integer | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| interceptorClasses | monitoring | | String | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime | kerberosBeforeReloginMinTime | security | 60000 | Integer | Login thread sleep time between refresh attempts. | kerberosInitCmd | security | /usr/bin/kinit | String | Kerberos kinit command path. Default is /usr/bin/kinit | kerberosPrincipalToLocalRules | security | DEFAULT | String | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default principal names of the form username/hostnameREALM are mapped to username. For more details on the format please see security authorization and acls. Multiple values can be separated by comma http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/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 6ffcef5..f81ccfd 100644 --- a/components/camel-kafka/src/main/docs/kafka.adoc +++ b/components/camel-kafka/src/main/docs/kafka.adoc @@ -57,10 +57,6 @@ kafka:server:port[?options] [[Kafka-Options]] Options (Camel 2.16 or older) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - - - // component options: START The Kafka component supports 1 options which are listed below. http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/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 0793908..05476aa 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 @@ -63,7 +63,7 @@ public class KafkaConfiguration { private String clientId; //interceptor.classes - @UriParam + @UriParam(label = "common,monitoring") private String interceptorClasses; //key.deserializer @@ -1375,7 +1375,7 @@ public class KafkaConfiguration { * Sets interceptors for producer or consumers. * Producer interceptors have to be classes implementing {@link org.apache.kafka.clients.producer.ProducerInterceptor} * Consumer interceptors have to be classes implementing {@link org.apache.kafka.clients.consumer.ConsumerInterceptor} - * @return + * Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime */ public void setInterceptorClasses(String interceptorClasses) { this.interceptorClasses = interceptorClasses; http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/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 b4a903f..f93c521 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 @@ -95,7 +95,6 @@ public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS return true; } - private void loadParitionerClass(ClassResolver resolver, Properties props) { replaceWithClass(props, "partitioner.class", resolver, Partitioner.class); } http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java index 2c94f7d..e6edd4b 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java @@ -102,7 +102,6 @@ public class KafkaComponentTest { assertEquals("test", endpoint.getConfiguration().getSslEndpointAlgorithm()); assertEquals("SunX509", endpoint.getConfiguration().getSslKeymanagerAlgorithm()); assertEquals("PKIX", endpoint.getConfiguration().getSslTrustmanagerAlgorithm()); - assertEquals("PKIX", endpoint.getConfiguration().getSslTrustmanagerAlgorithm()); assertEquals("org.apache.camel.component.kafka.MockProducerInterceptor", endpoint.getConfiguration().getInterceptorClasses()); } http://git-wip-us.apache.org/repos/asf/camel/blob/9e1c3653/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java index 4fb20bd..f87b5c2 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java @@ -219,8 +219,6 @@ public class KafkaProducerTest { assertRecordMetadataExists(); } - - @Test public void processSendMessageWithBridgeEndpoint() throws Exception { endpoint.getConfiguration().setTopic("someTopic");
