From 60ddac5560825af88447b977805d99b37bbf5967 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 27 Sep 2022 17:03:15 +0200 Subject: [PATCH] Polish Kinesis binder following previous commit --- .../binder/kinesis/KinesisMessageChannelBinder.java | 5 +++++ .../stream/binder/kinesis/KinesisBinderTests.java | 4 +++- .../binder/kinesis/LocalstackContainerTest.java | 3 --- .../cloud/stream/binder/rabbit/RabbitBinderTests.java | 1 - buildKinesisBinder.sh | 11 +++++++++++ 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100755 buildKinesisBinder.sh diff --git a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/main/java/org/springframework/cloud/stream/binder/kinesis/KinesisMessageChannelBinder.java b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/main/java/org/springframework/cloud/stream/binder/kinesis/KinesisMessageChannelBinder.java index 3c51d0dd3..f6e7425ef 100644 --- a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/main/java/org/springframework/cloud/stream/binder/kinesis/KinesisMessageChannelBinder.java +++ b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/main/java/org/springframework/cloud/stream/binder/kinesis/KinesisMessageChannelBinder.java @@ -215,6 +215,11 @@ public class KinesisMessageChannelBinder extends this.evaluationContext = ExpressionUtils.createStandardEvaluationContext(getBeanFactory()); } + @Override + public String getBinderIdentity() { + return "kinesis-" + super.getBinderIdentity(); + } + @Override protected MessageHandler createProducerMessageHandler(ProducerDestination destination, ExtendedProducerProperties producerProperties, diff --git a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/KinesisBinderTests.java b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/KinesisBinderTests.java index b6fbbb6b8..34087fede 100644 --- a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/KinesisBinderTests.java +++ b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/KinesisBinderTests.java @@ -264,6 +264,7 @@ public class KinesisBinderTests extends ExtendedProducerProperties producerProps = createProducerProperties(); producerProps.setErrorChannelEnabled(true); + producerProps.populateBindingName("foobar"); DirectChannel moduleOutputChannel = createBindableChannel("output", createProducerBindingProperties(producerProps)); Binding producerBinding = binder.bindProducer("ec.0", @@ -271,7 +272,8 @@ public class KinesisBinderTests extends ApplicationContext applicationContext = TestUtils.getPropertyValue( binder.getBinder(), "applicationContext", ApplicationContext.class); - SubscribableChannel ec = applicationContext.getBean("ec.0.errors", + String s = testBinder.getBinder().getBinderIdentity() + "." + producerProps.getBindingName() + ".errors"; + SubscribableChannel ec = applicationContext.getBean(s, SubscribableChannel.class); final AtomicReference> errorMessage = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch(1); diff --git a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/LocalstackContainerTest.java b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/LocalstackContainerTest.java index 8514dc49b..2cdb9502d 100644 --- a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/LocalstackContainerTest.java +++ b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/src/test/java/org/springframework/cloud/stream/binder/kinesis/LocalstackContainerTest.java @@ -24,8 +24,6 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDBAsyncClientBuilder; import com.amazonaws.services.kinesis.AmazonKinesisAsync; import com.amazonaws.services.kinesis.AmazonKinesisAsyncClientBuilder; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.testcontainers.containers.localstack.LocalStackContainer; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; @@ -37,7 +35,6 @@ import org.testcontainers.utility.DockerImageName; * @since 4.0 */ @Testcontainers(disabledWithoutDocker = true) -@DisabledOnOs(OS.MAC) public interface LocalstackContainerTest { LocalStackContainer LOCAL_STACK_CONTAINER = diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java index 7c9577ba6..2cffc1cd9 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java @@ -266,7 +266,6 @@ public class RabbitBinderTests extends final Message message = MessageBuilder.withPayload("bad".getBytes()) .setHeader(MessageHeaders.CONTENT_TYPE, "foo/bar").build(); String s = testBinder.getBinder().getBinderIdentity() + ".output.errors"; - //return this.getBinderIdentity() + "-" + this.hashCode() + "." + bindingName + ".errors"; SubscribableChannel ec = binder.getApplicationContext().getBean(s, SubscribableChannel.class); final AtomicReference> errorMessage = new AtomicReference<>(); diff --git a/buildKinesisBinder.sh b/buildKinesisBinder.sh new file mode 100755 index 000000000..ab15d538f --- /dev/null +++ b/buildKinesisBinder.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ "$#" -eq 1 ]; then + ARGVALUE=$1 + if [[ $ARGVALUE == *"skipTest"* ]]; then + echo "Skippping Tests" + ./mvnw clean install -f binders/kinesis-binder/pom.xml -DskipTests + fi +else + ./mvnw clean install -f binders/kinesis-binder/pom.xml +fi