This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e90dfff5d91dbf6a84646777afc3d4f7d06da72
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 30 10:45:51 2019 +0200
Camel-Kafka: Use BindToRegistry annotation wherever possible
---
.../camel/component/kafka/BaseEmbeddedKafkaTest.java | 10 ++++------
.../camel/component/kafka/KafkaConsumerFullTest.java | 13 +++++--------
.../kafka/KafkaConsumerOffsetRepositoryEmptyTest.java | 9 ++-------
.../kafka/KafkaConsumerOffsetRepositoryResumeTest.java | 9 ++-------
.../kafka/KafkaConsumerRebalancePartitionRevokeTest.java | 9 ++-------
.../component/kafka/KafkaConsumerRebalanceTest.java | 9 ++-------
.../camel/component/kafka/KafkaProducerFullTest.java | 15 +++++++--------
.../kafka/KafkaIdempotentRepositoryEagerTest.java | 14 +++-----------
.../kafka/KafkaIdempotentRepositoryNonEagerTest.java | 16 ++++------------
9 files changed, 31 insertions(+), 73 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
index 769a926..40e9c2c 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/BaseEmbeddedKafkaTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.kafka;
import java.util.Properties;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.kafka.embedded.EmbeddedKafkaBroker;
import org.apache.camel.component.kafka.embedded.EmbeddedZookeeper;
@@ -63,15 +64,12 @@ public class BaseEmbeddedKafkaTest extends CamelTestSupport
{
return props;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
+ @BindToRegistry("prop")
+ public Properties loadProperties() throws Exception {
Properties prop = new Properties();
prop.setProperty("zookeeperPort", "" + getZookeeperPort());
prop.setProperty("kafkaPort", "" + getKafkaPort());
- jndi.bind("prop", prop);
- return jndi;
+ return prop;
}
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
index 964efc4..880955c 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.stream.StreamSupport;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
@@ -35,7 +36,10 @@ import org.junit.Ignore;
import org.junit.Test;
public class KafkaConsumerFullTest extends BaseEmbeddedKafkaTest {
-
+
+ @BindToRegistry("myHeaderDeserializer")
+ private MyKafkaHeaderDeserializer deserializer = new
MyKafkaHeaderDeserializer();
+
public static final String TOPIC = "test";
@EndpointInject("kafka:" + TOPIC
@@ -73,13 +77,6 @@ public class KafkaConsumerFullTest extends
BaseEmbeddedKafkaTest {
};
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myHeaderDeserializer", new MyKafkaHeaderDeserializer());
- return jndi;
- }
-
@Test
public void kafkaMessageIsConsumedByCamel() throws InterruptedException,
IOException {
String propagatedHeaderKey = "PropagatedCustomHeader";
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java
index c0ae082..ede74a8 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.kafka;
import java.util.Properties;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,6 +36,7 @@ public class KafkaConsumerOffsetRepositoryEmptyTest extends
BaseEmbeddedKafkaTes
private org.apache.kafka.clients.producer.KafkaProducer<String, String>
producer;
+ @BindToRegistry("offset")
private MemoryStateRepository stateRepository;
// FIXME lifecycle issue here
@@ -78,13 +80,6 @@ public class KafkaConsumerOffsetRepositoryEmptyTest extends
BaseEmbeddedKafkaTes
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("offset", stateRepository);
- return registry;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java
index 3a05ee7..9b03e1e 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.kafka;
import java.util.Properties;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,6 +36,7 @@ public class KafkaConsumerOffsetRepositoryResumeTest extends
BaseEmbeddedKafkaTe
private org.apache.kafka.clients.producer.KafkaProducer<String, String>
producer;
+ @BindToRegistry("offset")
private MemoryStateRepository stateRepository;
@Override
@@ -78,13 +80,6 @@ public class KafkaConsumerOffsetRepositoryResumeTest extends
BaseEmbeddedKafkaTe
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("offset", stateRepository);
- return registry;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java
index 15ccbba..ef3461b 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java
@@ -20,6 +20,7 @@ import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,6 +36,7 @@ public class KafkaConsumerRebalancePartitionRevokeTest
extends BaseEmbeddedKafka
@EndpointInject("mock:result")
private MockEndpoint result;
+ @BindToRegistry("offset")
private OffsetStateRepository stateRepository;
private CountDownLatch messagesLatch;
@@ -68,13 +70,6 @@ public class KafkaConsumerRebalancePartitionRevokeTest
extends BaseEmbeddedKafka
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("offset", stateRepository);
- return registry;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java
index d1f799c..5baa05a 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.kafka;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -32,6 +33,7 @@ public class KafkaConsumerRebalanceTest extends
BaseEmbeddedKafkaTest {
@EndpointInject("mock:result")
private MockEndpoint result;
+ @BindToRegistry("offset")
private OffsetStateRepository stateRepository;
private CountDownLatch messagesLatch;
@@ -49,13 +51,6 @@ public class KafkaConsumerRebalanceTest extends
BaseEmbeddedKafkaTest {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("offset", stateRepository);
- return registry;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
index 9e11db5..851b99a 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java
@@ -28,6 +28,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.stream.StreamSupport;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -96,14 +97,12 @@ public class KafkaProducerFullTest extends
BaseEmbeddedKafkaTest {
@Produce("direct:propagatedHeaders")
private ProducerTemplate propagatedHeadersTemplate;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myStrategy", new MyHeaderFilterStrategy());
- jndi.bind("myHeaderSerializer", new MyKafkaHeadersSerializer());
- return jndi;
- }
+
+ @BindToRegistry("myStrategy")
+ private MyHeaderFilterStrategy strategy = new MyHeaderFilterStrategy();
+
+ @BindToRegistry("myHeaderSerializer")
+ private MyKafkaHeadersSerializer serializer = new
MyKafkaHeadersSerializer();
@BeforeClass
public static void before() {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java
index 5f73155..b2c6ebf 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.idempotent.kafka;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
@@ -39,7 +40,8 @@ public class KafkaIdempotentRepositoryEagerTest extends
CamelTestSupport {
@Rule
public EmbeddedKafkaBroker kafkaBroker = new EmbeddedKafkaBroker(0,
zookeeper.getConnection());
- private KafkaIdempotentRepository kafkaIdempotentRepository;
+ @BindToRegistry("kafkaIdempotentRepository")
+ private KafkaIdempotentRepository kafkaIdempotentRepository = new
KafkaIdempotentRepository("TEST_IDEM", kafkaBroker.getBrokerList());
@EndpointInject("mock:out")
private MockEndpoint mockOut;
@@ -48,16 +50,6 @@ public class KafkaIdempotentRepositoryEagerTest extends
CamelTestSupport {
private MockEndpoint mockBefore;
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- kafkaIdempotentRepository = new KafkaIdempotentRepository("TEST_IDEM",
kafkaBroker.getBrokerList());
- jndi.bind("kafkaIdempotentRepository", kafkaIdempotentRepository);
-
- return jndi;
- }
-
- @Override
protected RoutesBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java
index 1b78576..4599335 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.idempotent.kafka;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
@@ -38,8 +39,9 @@ public class KafkaIdempotentRepositoryNonEagerTest extends
CamelTestSupport {
@Rule
public EmbeddedKafkaBroker kafkaBroker = new EmbeddedKafkaBroker(0,
zookeeper.getConnection());
-
- private KafkaIdempotentRepository kafkaIdempotentRepository;
+
+ @BindToRegistry("kafkaIdempotentRepository")
+ private KafkaIdempotentRepository kafkaIdempotentRepository = new
KafkaIdempotentRepository("TEST_IDEM", kafkaBroker.getBrokerList());
@EndpointInject("mock:out")
private MockEndpoint mockOut;
@@ -48,16 +50,6 @@ public class KafkaIdempotentRepositoryNonEagerTest extends
CamelTestSupport {
private MockEndpoint mockBefore;
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- kafkaIdempotentRepository = new KafkaIdempotentRepository("TEST_IDEM",
kafkaBroker.getBrokerList());
- jndi.bind("kafkaIdempotentRepository", kafkaIdempotentRepository);
-
- return jndi;
- }
-
- @Override
protected RoutesBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
