From 67ebab7c9f5f09fcc347781ebbccc55f30ebda03 Mon Sep 17 00:00:00 2001
From: Meher Mankikar <mmankika@amazon.com>
Date: Wed, 14 Jun 2023 14:18:01 -0700
Subject: [PATCH] Bug fixes to testing architecture

---
 .../amazon/kinesis/config/KCLAppConfig.java    | 18 +++++++++++++-----
 .../amazon/kinesis/utils/TestConsumer.java     |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/config/KCLAppConfig.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/config/KCLAppConfig.java
index a78508ff..c3cf2e5b 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/config/KCLAppConfig.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/config/KCLAppConfig.java
@@ -140,11 +140,8 @@ public interface KCLAppConfig {
     }
 
     default ConfigsBuilder getConfigsBuilder() throws IOException, URISyntaxException {
-        return getConfigsBuilder("");
-    }
-
-    default ConfigsBuilder getConfigsBuilder(String workerIdSuffix) throws IOException, URISyntaxException {
-        final String workerId = getWorkerId() + workerIdSuffix;
+//        return getConfigsBuilder("");
+        final String workerId = getWorkerId();
         if (getStreamArn() == null) {
             return new ConfigsBuilder(getStreamName(), getApplicationName(), buildConsumerClient(), buildAsyncDynamoDbClient(),
                     buildAsyncCloudWatchClient(), workerId, getShardRecordProcessorFactory());
@@ -154,6 +151,17 @@ public interface KCLAppConfig {
         }
     }
 
+//    default ConfigsBuilder getConfigsBuilder(String workerIdSuffix) throws IOException, URISyntaxException {
+//        final String workerId = getWorkerId() + workerIdSuffix;
+//        if (getStreamArn() == null) {
+//            return new ConfigsBuilder(getStreamName(), getApplicationName(), buildConsumerClient(), buildAsyncDynamoDbClient(),
+//                    buildAsyncCloudWatchClient(), workerId, getShardRecordProcessorFactory());
+//        } else {
+//            return new ConfigsBuilder(Arn.fromString(getStreamArn()), getApplicationName(), buildConsumerClient(), buildAsyncDynamoDbClient(),
+//                    buildAsyncCloudWatchClient(), workerId, getShardRecordProcessorFactory());
+//        }
+//    }
+
     RetrievalConfig getRetrievalConfig() throws IOException, URISyntaxException;
 
     /**
diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestConsumer.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestConsumer.java
index 7b4cb9c0..888c3ba7 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestConsumer.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/TestConsumer.java
@@ -124,7 +124,7 @@ public class TestConsumer {
          * Stops sending dummy data.
          */
         log.info("Cancelling producer and shutting down executor.");
-        producerFuture.cancel(true);
+        producerFuture.cancel(false);
         producerExecutor.shutdownNow();
 
         /**