From 00664fe2295a5172bb6ef21feb36d011fdc52a6c Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Mon, 6 Mar 2017 22:35:01 -0500 Subject: [PATCH] Update dependency versions --- .../multibinder/TwoKafkaBindersApplicationTest.java | 12 ++++++------ .../RabbitAndKafkaBinderApplicationTests.java | 9 +++++---- pom.xml | 2 +- reactive-processor-kafka/pom.xml | 2 +- rxjava-processor/pom.xml | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java index 1b98d48..2245619 100644 --- a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java +++ b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java @@ -74,11 +74,11 @@ public class TwoKafkaBindersApplicationTest { } @Autowired - private BinderFactory binderFactory; + private BinderFactory binderFactory; @Test public void contextLoads() { - Binder binder1 = binderFactory.getBinder("kafka1"); + Binder binder1 = binderFactory.getBinder("kafka1", MessageChannel.class); KafkaMessageChannelBinder kafka1 = (KafkaMessageChannelBinder) binder1; DirectFieldAccessor directFieldAccessor1 = new DirectFieldAccessor(kafka1); KafkaBinderConfigurationProperties configuration1 = @@ -86,7 +86,7 @@ public class TwoKafkaBindersApplicationTest { Assert.assertThat(configuration1.getBrokers(), arrayWithSize(1)); Assert.assertThat(configuration1.getBrokers()[0], equalTo(kafkaTestSupport1.getBrokersAsString())); - Binder binder2 = binderFactory.getBinder("kafka2"); + Binder binder2 = binderFactory.getBinder("kafka2", MessageChannel.class); KafkaMessageChannelBinder kafka2 = (KafkaMessageChannelBinder) binder2; DirectFieldAccessor directFieldAccessor2 = new DirectFieldAccessor(kafka2); KafkaBinderConfigurationProperties configuration2 = @@ -98,17 +98,17 @@ public class TwoKafkaBindersApplicationTest { @Test public void messagingWorks() { DirectChannel dataProducer = new DirectChannel(); - ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka1")) + ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka1", MessageChannel.class)) .bindProducer("dataIn", dataProducer, new ExtendedProducerProperties<>(new KafkaProducerProperties())); QueueChannel dataConsumer = new QueueChannel(); - ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka2")).bindConsumer("dataOut", UUID.randomUUID().toString(), + ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka2", MessageChannel.class)).bindConsumer("dataOut", UUID.randomUUID().toString(), dataConsumer, new ExtendedConsumerProperties<>(new KafkaConsumerProperties())); String testPayload = "testFoo" + UUID.randomUUID().toString(); dataProducer.send(MessageBuilder.withPayload(testPayload).build()); - Message receive = dataConsumer.receive(5000); + Message receive = dataConsumer.receive(60_000); Assert.assertThat(receive, Matchers.notNullValue()); Assert.assertThat(receive.getPayload(), CoreMatchers.equalTo(testPayload)); } diff --git a/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java b/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java index 112bf83..f45e01a 100644 --- a/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java +++ b/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java @@ -40,6 +40,7 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.kafka.test.rule.KafkaEmbedded; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; @@ -83,20 +84,20 @@ public class RabbitAndKafkaBinderApplicationTests { "--spring.cloud.stream.kafka.binder.zkNodes=" + kafkaEmbedded.getZookeeperConnectionString(), "--spring.cloud.stream.bindings.output.producer.requiredGroups=" + this.randomGroup); DirectChannel dataProducer = new DirectChannel(); - BinderFactory binderFactory = context.getBean(BinderFactory.class); + BinderFactory binderFactory = context.getBean(BinderFactory.class); QueueChannel dataConsumer = new QueueChannel(); - ((RabbitMessageChannelBinder) binderFactory.getBinder("rabbit")).bindConsumer("dataOut", this.randomGroup, + ((RabbitMessageChannelBinder) binderFactory.getBinder("rabbit", MessageChannel.class)).bindConsumer("dataOut", this.randomGroup, dataConsumer, new ExtendedConsumerProperties<>(new RabbitConsumerProperties())); - ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka")) + ((KafkaMessageChannelBinder) binderFactory.getBinder("kafka", MessageChannel.class)) .bindProducer("dataIn", dataProducer, new ExtendedProducerProperties<>(new KafkaProducerProperties())); String testPayload = "testFoo" + this.randomGroup; dataProducer.send(MessageBuilder.withPayload(testPayload).build()); - Message receive = dataConsumer.receive(10000); + Message receive = dataConsumer.receive(60_000); Assert.assertThat(receive, Matchers.notNullValue()); Assert.assertThat(receive.getPayload(), CoreMatchers.equalTo(testPayload)); context.close(); diff --git a/pom.xml b/pom.xml index 17972ca..52289fd 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 - Brooklyn.BUILD-SNAPSHOT + Brooklyn.SR3 1.8 diff --git a/reactive-processor-kafka/pom.xml b/reactive-processor-kafka/pom.xml index 4dfaa69..a1118f5 100644 --- a/reactive-processor-kafka/pom.xml +++ b/reactive-processor-kafka/pom.xml @@ -32,7 +32,7 @@ io.projectreactor reactor-core - 3.0.1.BUILD-SNAPSHOT + 3.0.5.RELEASE org.springframework.boot diff --git a/rxjava-processor/pom.xml b/rxjava-processor/pom.xml index bfa7131..f879c2d 100644 --- a/rxjava-processor/pom.xml +++ b/rxjava-processor/pom.xml @@ -36,7 +36,7 @@ io.projectreactor reactor-core - 3.0.1.BUILD-SNAPSHOT + 3.0.5.RELEASE io.reactivex