/*
 * Licensed to Elasticsearch under one or more contributor
 * license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright
 * ownership. Elasticsearch licenses this file to you under
 * the Apache License, Version 2.0 (the "License"); you may
 * not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

package org.elasticsearch.http;

import org.apache.http.util.EntityUtils;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException;
import org.elasticsearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.elasticsearch.test.ESIntegTestCase.Scope;

import java.io.IOException;
import java.util.Collections;

import static org.hamcrest.Matchers.is;

/**
 * Tests that when disabling detailed errors, a request with the error_trace parameter returns a HTTP 400
 */
@ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numDataNodes = 1)
public class DetailedErrorsDisabledIT extends HttpSmokeTestCase {
    // Build our cluster settings
    @Override
    protected Settings nodeSettings(int nodeOrdinal) {
        return Settings.builder()
                .put(super.nodeSettings(nodeOrdinal))
                .put(NetworkModule.HTTP_ENABLED.getKey(), true)
                .put(HttpTransportSettings.SETTING_HTTP_DETAILED_ERRORS_ENABLED.getKey(), false)
                .build();
    }

    @Override
    protected boolean ignoreExternalCluster() {
        return true;
    }

    public void testThatErrorTraceParamReturns400() throws IOException {
        try {
            getRestClient().performRequest("DELETE", "/", Collections.singletonMap("error_trace", "true"));
            fail("request should have failed");
        } catch(ResponseException e) {
            Response response = e.getResponse();
            assertThat(response.getHeader("Content-Type"), is("application/json"));
            assertThat(EntityUtils.toString(e.getResponse().getEntity()), is("{\"error\":\"error traces in responses are disabled.\"}"));
            assertThat(response.getStatusLine().getStatusCode(), is(400));
        }
    }
}

@@ -816,16 +816,75 @@
 .http;%0A%0A
+import java.io.IOException;%0Aimport java.util.Collections;%0A%0A
 import o
@@ -916,16 +916,16 @@
 yUtils;%0A
-
 import o
@@ -1287,60 +1287,53 @@
 ort 
-java.io.IOException;%0Aimport java.util.Collections
+static org.hamcrest.Matchers.containsString
 ;%0A
-%0A
 impo
@@ -2195,13 +2195,73 @@
     
-try %7B
+ResponseException e = expectThrows(ResponseException.class, () -%3E
 %0A   
@@ -2367,101 +2367,12 @@
 e%22))
-;%0A            fail(%22request should have failed%22);%0A        %7D catch(ResponseException e) %7B%0A    
+);%0A%0A
     
@@ -2412,36 +2412,32 @@
 onse();%0A        
- 
-   
 assertThat(respo
@@ -2492,36 +2492,32 @@
 son%22));%0A        
-    
 assertThat(Entit
@@ -2566,13 +2566,24 @@
 )), 
-is
+containsString
 (%22
-%7B
 %5C%22er
@@ -2631,17 +2631,16 @@
 abled.%5C%22
-%7D
 %22));%0A   
@@ -2640,28 +2640,24 @@
 ));%0A        
-   
- 
 assertThat(r
@@ -2711,18 +2711,8 @@
 ));%0A
-        %7D%0A
     

Fix client test to not care about complete error response message