From cfbb55b2b7c43fe62f9039597111c3906fd0e9aa Mon Sep 17 00:00:00 2001
From: Meher Mankikar <mmankika@amazon.com>
Date: Wed, 21 Jun 2023 13:39:50 -0700
Subject: [PATCH] Updating name of few functions

---
 .../amazon/kinesis/utils/AWSResourceManager.java     | 12 ++++++------
 .../amazon/kinesis/utils/LeaseTableManager.java      |  6 +++---
 .../amazon/kinesis/utils/StreamExistenceManager.java | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/AWSResourceManager.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/AWSResourceManager.java
index f88f7406..3314f922 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/AWSResourceManager.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/AWSResourceManager.java
@@ -19,19 +19,19 @@ public abstract class AWSResourceManager {
     /**
      * Make delete resource API call for specific resource type
      */
-    public abstract void _deleteResource(String resourceName) throws Exception;
+    public abstract void deleteResourceCall(String resourceName) throws Exception;
 
     /**
      * Check if resource with given name is in active state
      */
-    public abstract boolean _isResourceActive(String name);
+    public abstract boolean isResourceActive(String name);
 
     /**
      * Get a list of all the names of resources of a specified type
      * @return
      * @throws Exception
      */
-    public abstract List<String> _getAllResourceNames() throws Exception;
+    public abstract List<String> getAllResourceNames() throws Exception;
 
     /**
      * Delete resource with specified resource name
@@ -39,7 +39,7 @@ public abstract class AWSResourceManager {
     public void deleteResource(String resourceName) throws Exception {
 
         try {
-            _deleteResource(resourceName);
+            deleteResourceCall(resourceName);
         } catch (Exception e) {
             throw new Exception("Could not delete resource: {}", e);
         }
@@ -52,7 +52,7 @@ public abstract class AWSResourceManager {
                 throw new RuntimeException("Failed resource deletion");
             }
             try {
-                if (!_isResourceActive(resourceName)) {
+                if (!isResourceActive(resourceName)) {
                     log.info("Successfully deleted the resource {}", resourceName);
                     return;
                 }
@@ -69,7 +69,7 @@ public abstract class AWSResourceManager {
      * Delete all instances of a particular resource type
      */
     public void deleteAllResource() throws Exception {
-        final List<String> resourceNames = _getAllResourceNames();
+        final List<String> resourceNames = getAllResourceNames();
         for (String resourceName : resourceNames) {
             deleteResource(resourceName);
         }
diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/LeaseTableManager.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/LeaseTableManager.java
index 69bf619b..e8d1cb05 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/LeaseTableManager.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/LeaseTableManager.java
@@ -27,7 +27,7 @@ public class LeaseTableManager extends AWSResourceManager {
 
     private final DynamoDbAsyncClient dynamoClient;
 
-    public boolean _isResourceActive(String tableName) {
+    public boolean isResourceActive(String tableName) {
         final DescribeTableRequest request = DescribeTableRequest.builder().tableName(tableName).build();
         final CompletableFuture<DescribeTableResponse> describeTableResponseCompletableFuture = dynamoClient.describeTable(request);
 
@@ -49,12 +49,12 @@ public class LeaseTableManager extends AWSResourceManager {
         }
     }
 
-    public void _deleteResource(String tableName) throws Exception {
+    public void deleteResourceCall(String tableName) throws Exception {
         final DeleteTableRequest request = DeleteTableRequest.builder().tableName(tableName).build();
         FutureUtils.resolveOrCancelFuture(dynamoClient.deleteTable(request), Duration.ofSeconds(60));
     }
 
-    public List<String> _getAllResourceNames() throws Exception {
+    public List<String> getAllResourceNames() throws Exception {
         ListTablesRequest listTableRequest = ListTablesRequest.builder().build();
         List<String> allTableNames = new ArrayList<>();
         ListTablesResponse result = null;
diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/StreamExistenceManager.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/StreamExistenceManager.java
index bf5b634c..eeffb36b 100644
--- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/StreamExistenceManager.java
+++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/utils/StreamExistenceManager.java
@@ -36,7 +36,7 @@ public class StreamExistenceManager extends AWSResourceManager {
         this.client = config.buildAsyncKinesisClient();
     }
 
-    public boolean _isResourceActive(String streamName) {
+    public boolean isResourceActive(String streamName) {
         final DescribeStreamSummaryRequest request = DescribeStreamSummaryRequest.builder().streamName(streamName).build();
         final CompletableFuture<DescribeStreamSummaryResponse> describeStreamSummaryResponseCompletableFuture = client.describeStreamSummary(request);
 
@@ -58,12 +58,12 @@ public class StreamExistenceManager extends AWSResourceManager {
         }
     }
 
-    public void _deleteResource(String streamName) throws Exception {
+    public void deleteResourceCall(String streamName) throws Exception {
         final DeleteStreamRequest request = DeleteStreamRequest.builder().streamName(streamName).enforceConsumerDeletion(true).build();
         client.deleteStream(request).get(30, TimeUnit.SECONDS);
     }
 
-    public List<String> _getAllResourceNames() throws Exception {
+    public List<String> getAllResourceNames() throws Exception {
         ListStreamsRequest listStreamRequest = ListStreamsRequest.builder().build();
         List<String> allStreamNames = new ArrayList<>();
         ListStreamsResponse result = null;
@@ -77,7 +77,7 @@ public class StreamExistenceManager extends AWSResourceManager {
 
     public void checkStreamAndCreateIfNecessary(String streamName) {
 
-        if (!_isResourceActive(streamName)) {
+        if (!isResourceActive(streamName)) {
             createStream(streamName, testConfig.getShardCount());
         }
         log.info("Using stream {} with region {}", streamName, testConfig.getRegion());
@@ -98,7 +98,7 @@ public class StreamExistenceManager extends AWSResourceManager {
                 throw new RuntimeException("Failed stream creation, did not transition into active");
             }
             try {
-                boolean isActive = _isResourceActive(streamName);
+                boolean isActive = isResourceActive(streamName);
                 if (isActive) {
                     log.info("Succesfully created the stream {}", streamName);
                     return;