addressing proposed changes

Signed-off-by: Niyati Aggarwal <[email protected]>

Author: niyatiagg

server/src/main/java/org/opensearch/transport/TransportChannel.java

@@ -82,7 +82,7 @@ static void sendErrorResponse(TransportChannel channel, String actionName, Trans
 
     /**
      * Returns the contextual property associated with this specific transport channel (the
-     * implementation of how such properties are managed depends on the the particular
+     * implementation of how such properties are managed depends on the particular
      * transport engine).
      *
      * @param name the name of the property

server/src/test/java/org/opensearch/cluster/coordination/FollowersCheckerTests.java

@@ -796,10 +796,9 @@ public TransportResponse.Empty read(StreamInput in) {
 
     }
 
-    public void testFollowerCheckTimeoutValue() {
+    public void testFollowerCheckTimeoutValueUpdate() {
         Setting<TimeValue> setting1 = FOLLOWER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "60s").build();
-
         try {
             ClusterUpdateSettingsResponse response = client().admin()
                 .cluster()
@@ -821,21 +820,17 @@ public void testFollowerCheckTimeoutMaxValue() {
         Setting<TimeValue> setting1 = FOLLOWER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "61s").build();
 
-        try {
+        assertThrows( "failed to parse value [61s] for setting [" + setting1.getKey() + "], must be <= [60000ms]", IllegalArgumentException.class, () -> {
             client().admin().cluster().prepareUpdateSettings().setPersistentSettings(timeSettings1).execute().actionGet();
-        } catch (IllegalArgumentException ex) {
-            assertEquals(ex.getMessage(), "failed to parse value [61s] for setting [" + setting1.getKey() + "], must be <= [60000ms]");
-        }
+        });
     }
 
     public void testFollowerCheckTimeoutMinValue() {
         Setting<TimeValue> setting1 = FOLLOWER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "0s").build();
 
-        try {
+        assertThrows("failed to parse value [0s] for setting [" + setting1.getKey() + "], must be >= [1ms]", IllegalArgumentException.class, () -> {
             client().admin().cluster().prepareUpdateSettings().setPersistentSettings(timeSettings1).execute().actionGet();
-        } catch (IllegalArgumentException ex) {
-            assertEquals(ex.getMessage(), "failed to parse value [0s] for setting [" + setting1.getKey() + "], must be >= [1ms]");
-        }
+        });
     }
 }

server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java

@@ -34,7 +34,13 @@
 
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
+import org.opensearch.action.admin.cluster.settings.ClusterGetSettingsRequest;
+import org.opensearch.action.admin.cluster.settings.ClusterGetSettingsResponse;
 import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
+import org.opensearch.action.admin.indices.settings.get.GetSettingsAction;
+import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest;
+import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
+import org.opensearch.client.RequestOptions;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.coordination.LeaderChecker.LeaderCheckRequest;
 import org.opensearch.cluster.node.DiscoveryNode;
@@ -64,6 +70,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static java.util.Collections.checkedList;
 import static java.util.Collections.emptySet;
 import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_ACTION_NAME;
 import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_INTERVAL_SETTING;
@@ -568,18 +575,16 @@ public void testLeaderCheckRequestEqualsHashcodeSerialization() {
         );
     }
 
-    public void testLeaderCheckTimeoutValue() {
+    public void testLeaderCheckTimeoutValueUpdate() {
         Setting<TimeValue> setting1 = LEADER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "60s").build();
-
         try {
             ClusterUpdateSettingsResponse response = client().admin()
                 .cluster()
                 .prepareUpdateSettings()
                 .setPersistentSettings(timeSettings1)
                 .execute()
                 .actionGet();
-
             assertAcked(response);
             assertEquals(timeValueSeconds(60), setting1.get(response.getPersistentSettings()));
         } finally {
@@ -593,21 +598,17 @@ public void testLeaderCheckTimeoutMaxValue() {
         Setting<TimeValue> setting1 = LEADER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "61s").build();
 
-        try {
+        assertThrows( "failed to parse value [61s] for setting [" + setting1.getKey() + "], must be <= [60000ms]", IllegalArgumentException.class, () -> {
             client().admin().cluster().prepareUpdateSettings().setPersistentSettings(timeSettings1).execute().actionGet();
-        } catch (IllegalArgumentException ex) {
-            assertEquals(ex.getMessage(), "failed to parse value [61s] for setting [" + setting1.getKey() + "], must be <= [60000ms]");
-        }
+        });
     }
 
     public void testLeaderCheckTimeoutMinValue() {
         Setting<TimeValue> setting1 = LEADER_CHECK_TIMEOUT_SETTING;
         Settings timeSettings1 = Settings.builder().put(setting1.getKey(), "0s").build();
 
-        try {
+        assertThrows("failed to parse value [0s] for setting [" + setting1.getKey() + "], must be >= [1ms]", IllegalArgumentException.class, () -> {
             client().admin().cluster().prepareUpdateSettings().setPersistentSettings(timeSettings1).execute().actionGet();
-        } catch (IllegalArgumentException ex) {
-            assertEquals(ex.getMessage(), "failed to parse value [0s] for setting [" + setting1.getKey() + "], must be >= [1ms]");
-        }
+        });
     }
 }