From 32e818726149a128412c9d12e81327fe1e34d3c6 Mon Sep 17 00:00:00 2001 From: Mike Watters Date: Mon, 11 Dec 2017 17:53:59 -0700 Subject: [PATCH] revert `KinesisClientLibConfiguration` constructor changes just use a `.properties` file or the appropriate `with` method to set `ignoreUnexpectedChildShards` config param. --- .../worker/KinesisClientLibConfiguration.java | 16 +--------------- .../KinesisClientLibConfigurationTest.java | 4 ---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java index 9d319720..04d59574 100644 --- a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java +++ b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfiguration.java @@ -86,11 +86,6 @@ public class KinesisClientLibConfiguration { */ public static final boolean DEFAULT_CLEANUP_LEASES_UPON_SHARDS_COMPLETION = true; - /** - * Ignore child shards with open parents. - */ - public static final boolean DEFAULT_IGNORE_UNEXPECTED_CHILD_SHARDS = false; - /** * Backoff time in milliseconds for Amazon Kinesis Client Library tasks (in the event of failures). */ @@ -295,7 +290,6 @@ public class KinesisClientLibConfiguration { DEFAULT_PARENT_SHARD_POLL_INTERVAL_MILLIS, DEFAULT_SHARD_SYNC_INTERVAL_MILLIS, DEFAULT_CLEANUP_LEASES_UPON_SHARDS_COMPLETION, - DEFAULT_IGNORE_UNEXPECTED_CHILD_SHARDS, new ClientConfiguration(), new ClientConfiguration(), new ClientConfiguration(), @@ -329,7 +323,6 @@ public class KinesisClientLibConfiguration { * @param shardSyncIntervalMillis Time between tasks to sync leases and Kinesis shards * @param cleanupTerminatedShardsBeforeExpiry Clean up shards we've finished processing (don't wait for expiration * in Kinesis) - * @param ignoreUnexpectedChildShards Ignore child shards with open parents * @param kinesisClientConfig Client Configuration used by Kinesis client * @param dynamoDBClientConfig Client Configuration used by DynamoDB client * @param cloudWatchClientConfig Client Configuration used by CloudWatch client @@ -359,7 +352,6 @@ public class KinesisClientLibConfiguration { long parentShardPollIntervalMillis, long shardSyncIntervalMillis, boolean cleanupTerminatedShardsBeforeExpiry, - boolean ignoreUnexpectedChildShards, ClientConfiguration kinesisClientConfig, ClientConfiguration dynamoDBClientConfig, ClientConfiguration cloudWatchClientConfig, @@ -373,7 +365,7 @@ public class KinesisClientLibConfiguration { dynamoDBCredentialsProvider, cloudWatchCredentialsProvider, failoverTimeMillis, workerId, maxRecords, idleTimeBetweenReadsInMillis, callProcessRecordsEvenForEmptyRecordList, parentShardPollIntervalMillis, - shardSyncIntervalMillis, cleanupTerminatedShardsBeforeExpiry, ignoreUnexpectedChildShards, + shardSyncIntervalMillis, cleanupTerminatedShardsBeforeExpiry, kinesisClientConfig, dynamoDBClientConfig, cloudWatchClientConfig, taskBackoffTimeMillis, metricsBufferTimeMillis, metricsMaxQueueSize, validateSequenceNumberBeforeCheckpointing, regionName, shutdownGraceMillis); @@ -402,7 +394,6 @@ public class KinesisClientLibConfiguration { * @param shardSyncIntervalMillis Time between tasks to sync leases and Kinesis shards * @param cleanupTerminatedShardsBeforeExpiry Clean up shards we've finished processing (don't wait for expiration * in Kinesis) - * @param ignoreUnexpectedChildShards Ignore child shards with open parents * @param kinesisClientConfig Client Configuration used by Kinesis client * @param dynamoDBClientConfig Client Configuration used by DynamoDB client * @param cloudWatchClientConfig Client Configuration used by CloudWatch client @@ -432,7 +423,6 @@ public class KinesisClientLibConfiguration { long parentShardPollIntervalMillis, long shardSyncIntervalMillis, boolean cleanupTerminatedShardsBeforeExpiry, - boolean ignoreUnexpectedChildShards, ClientConfiguration kinesisClientConfig, ClientConfiguration dynamoDBClientConfig, ClientConfiguration cloudWatchClientConfig, @@ -469,7 +459,6 @@ public class KinesisClientLibConfiguration { this.parentShardPollIntervalMillis = parentShardPollIntervalMillis; this.shardSyncIntervalMillis = shardSyncIntervalMillis; this.cleanupLeasesUponShardCompletion = cleanupTerminatedShardsBeforeExpiry; - this.ignoreUnexpectedChildShards = ignoreUnexpectedChildShards; this.workerIdentifier = workerId; this.kinesisClientConfig = checkAndAppendKinesisClientLibUserAgent(kinesisClientConfig); this.dynamoDBClientConfig = checkAndAppendKinesisClientLibUserAgent(dynamoDBClientConfig); @@ -515,7 +504,6 @@ public class KinesisClientLibConfiguration { * @param shardSyncIntervalMillis Time between tasks to sync leases and Kinesis shards * @param cleanupTerminatedShardsBeforeExpiry Clean up shards we've finished processing (don't wait for expiration * in Kinesis) - * @param ignoreUnexpectedChildShards Ignore child shards with open parents * @param kinesisClientConfig Client Configuration used by Kinesis client * @param dynamoDBClientConfig Client Configuration used by DynamoDB client * @param cloudWatchClientConfig Client Configuration used by CloudWatch client @@ -545,7 +533,6 @@ public class KinesisClientLibConfiguration { long parentShardPollIntervalMillis, long shardSyncIntervalMillis, boolean cleanupTerminatedShardsBeforeExpiry, - boolean ignoreUnexpectedChildShards, ClientConfiguration kinesisClientConfig, ClientConfiguration dynamoDBClientConfig, ClientConfiguration cloudWatchClientConfig, @@ -581,7 +568,6 @@ public class KinesisClientLibConfiguration { this.parentShardPollIntervalMillis = parentShardPollIntervalMillis; this.shardSyncIntervalMillis = shardSyncIntervalMillis; this.cleanupLeasesUponShardCompletion = cleanupTerminatedShardsBeforeExpiry; - this.ignoreUnexpectedChildShards = ignoreUnexpectedChildShards; this.workerIdentifier = workerId; this.kinesisClientConfig = checkAndAppendKinesisClientLibUserAgent(kinesisClientConfig); this.dynamoDBClientConfig = checkAndAppendKinesisClientLibUserAgent(dynamoDBClientConfig); diff --git a/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java b/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java index 27a2fbed..177546db 100644 --- a/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java +++ b/src/test/java/com/amazonaws/services/kinesis/clientlibrary/lib/worker/KinesisClientLibConfigurationTest.java @@ -77,7 +77,6 @@ public class KinesisClientLibConfigurationTest { TEST_VALUE_LONG, TEST_VALUE_LONG, true, - false, new ClientConfiguration(), new ClientConfiguration(), new ClientConfiguration(), @@ -118,7 +117,6 @@ public class KinesisClientLibConfigurationTest { longValues[2], longValues[3], true, - false, new ClientConfiguration(), new ClientConfiguration(), new ClientConfiguration(), @@ -154,7 +152,6 @@ public class KinesisClientLibConfigurationTest { TEST_VALUE_LONG, TEST_VALUE_LONG, true, - false, new ClientConfiguration(), new ClientConfiguration(), new ClientConfiguration(), @@ -319,7 +316,6 @@ public class KinesisClientLibConfigurationTest { TEST_VALUE_LONG, TEST_VALUE_LONG, true, - false, new ClientConfiguration(), new ClientConfiguration(), new ClientConfiguration(),