Revert ClusterClientIT changes

Author: arteam

client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java

@@ -49,6 +49,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 
 import static java.util.Collections.emptyMap;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@@ -73,11 +74,13 @@ public void testClusterPutSettings() throws IOException {
         ClusterUpdateSettingsRequest setRequest = new ClusterUpdateSettingsRequest();
         setRequest.transientSettings(transientSettings);
         setRequest.persistentSettings(map);
+        RequestOptions options = RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE).build();
 
         ClusterUpdateSettingsResponse setResponse = execute(
             setRequest,
             highLevelClient().cluster()::putSettings,
-            highLevelClient().cluster()::putSettingsAsync
+            highLevelClient().cluster()::putSettingsAsync,
+            options
         );
 
         assertAcked(setResponse);
@@ -104,7 +107,8 @@ public void testClusterPutSettings() throws IOException {
         ClusterUpdateSettingsResponse resetResponse = execute(
             resetRequest,
             highLevelClient().cluster()::putSettings,
-            highLevelClient().cluster()::putSettingsAsync
+            highLevelClient().cluster()::putSettingsAsync,
+            options
         );
 
         assertThat(resetResponse.getTransientSettings().get(transientSettingKey), equalTo(null));
@@ -119,11 +123,22 @@ public void testClusterPutSettings() throws IOException {
         assertThat(persistentResetValue, equalTo(null));
     }
 
-    public void testClusterUpdateSettingNonExistent() {
+    public void testClusterUpdateTransientSettingNonExistent() {
+        testClusterUpdateSettingNonExistent((settings, request) -> request.transientSettings(settings), "transient");
+    }
+
+    public void testClusterUpdatePersistentSettingNonExistent() {
+        testClusterUpdateSettingNonExistent((settings, request) -> request.persistentSettings(settings), "persistent");
+    }
+
+    private void testClusterUpdateSettingNonExistent(
+        final BiConsumer<Settings.Builder, ClusterUpdateSettingsRequest> consumer,
+        String label
+    ) {
         String setting = "no_idea_what_you_are_talking_about";
         int value = 10;
         ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
-        clusterUpdateSettingsRequest.transientSettings(Settings.builder().put(setting, value).build());
+        consumer.accept(Settings.builder().put(setting, value), clusterUpdateSettingsRequest);
 
         ElasticsearchException exception = expectThrows(
             ElasticsearchException.class,
@@ -136,7 +151,9 @@ public void testClusterUpdateSettingNonExistent() {
         assertThat(exception.status(), equalTo(RestStatus.BAD_REQUEST));
         assertThat(
             exception.getMessage(),
-            equalTo("Elasticsearch exception [type=illegal_argument_exception, reason=transient setting [" + setting + "], not recognized]")
+            equalTo(
+                "Elasticsearch exception [type=illegal_argument_exception, reason=" + label + " setting [" + setting + "], not recognized]"
+            )
         );
     }
 
@@ -331,13 +348,13 @@ public void testRemoteInfo() throws Exception {
         ClusterGetSettingsResponse settingsResponse = highLevelClient().cluster().getSettings(settingsRequest, RequestOptions.DEFAULT);
 
         List<String> seeds = SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace(clusterAlias)
-            .get(settingsResponse.getTransientSettings());
-        int connectionsPerCluster = SniffConnectionStrategy.REMOTE_CONNECTIONS_PER_CLUSTER.get(settingsResponse.getTransientSettings());
+            .get(settingsResponse.getPersistentSettings());
+        int connectionsPerCluster = SniffConnectionStrategy.REMOTE_CONNECTIONS_PER_CLUSTER.get(settingsResponse.getPersistentSettings());
         TimeValue initialConnectionTimeout = RemoteClusterService.REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING.get(
-            settingsResponse.getTransientSettings()
+            settingsResponse.getPersistentSettings()
         );
         boolean skipUnavailable = RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE.getConcreteSettingForNamespace(clusterAlias)
-            .get(settingsResponse.getTransientSettings());
+            .get(settingsResponse.getPersistentSettings());
 
         RemoteInfoRequest request = new RemoteInfoRequest();
         RemoteInfoResponse response = execute(