From ace4055ed9ea5cace2af48b09b5c4ace94a9e941 Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Wed, 25 Jan 2017 09:46:57 -0500 Subject: [PATCH] Remove `amazon-kinesis-client` * Remove the `amazon-kinesis-client` dependency * Use `CustomizableThreadFactory` instead of `NamedThreadFactory` --- build.gradle | 2 -- .../inbound/kinesis/KinesisMessageDrivenChannelAdapter.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 43021b0..f0ce2fd 100644 --- a/build.gradle +++ b/build.gradle @@ -91,8 +91,6 @@ dependencies { compile("com.amazonaws:aws-java-sdk-kinesis:$awsSdkVersion", optional) - compile("com.amazonaws:amazon-kinesis-client:1.7.0", optional) - compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided) testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" diff --git a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java index fbb97a3..16e5e40 100644 --- a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java +++ b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java @@ -47,11 +47,11 @@ import org.springframework.integration.support.management.IntegrationManagedReso import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.scheduling.SchedulingAwareRunnable; +import org.springframework.scheduling.concurrent.CustomizableThreadFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import com.amazonaws.services.kinesis.AmazonKinesis; -import com.amazonaws.services.kinesis.clientlibrary.utils.NamedThreadFactory; import com.amazonaws.services.kinesis.model.DescribeStreamRequest; import com.amazonaws.services.kinesis.model.DescribeStreamResult; import com.amazonaws.services.kinesis.model.GetRecordsRequest; @@ -231,7 +231,7 @@ public class KinesisMessageDrivenChannelAdapter extends MessageProducerSupport i if (this.consumerExecutor == null) { this.consumerExecutor = Executors.newCachedThreadPool( - new NamedThreadFactory((getComponentName() == null + new CustomizableThreadFactory((getComponentName() == null ? "" : getComponentName()) + "-kinesis-consumer-")); @@ -239,7 +239,7 @@ public class KinesisMessageDrivenChannelAdapter extends MessageProducerSupport i if (this.dispatcherExecutor == null) { this.dispatcherExecutor = Executors.newCachedThreadPool( - new NamedThreadFactory((getComponentName() == null + new CustomizableThreadFactory((getComponentName() == null ? "" : getComponentName()) + "-kinesis-dispatcher-"));