Set Accept header for UrlConnectionHttpClient

.changes/next-release/bugfix-URLConnectionClient-98f14e7.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "URL Connection Client",
+    "contributor": "",
+    "description": "Set the `Accept` header for `UrlConnectionHttpClient` because the default one does not comply with RFC 7231. See https://bugs.openjdk.org/browse/JDK-8163921"
+}

http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java

@@ -39,6 +39,8 @@ public final class Header {
 
     public static final String KEEP_ALIVE_VALUE = "keep-alive";
 
+    public static final String ACCEPT = "Accept";
+
     private Header() {
     }
 

http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.http.urlconnection;
 
+import static software.amazon.awssdk.http.Header.ACCEPT;
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 import static software.amazon.awssdk.http.HttpStatusFamily.CLIENT_ERROR;
 import static software.amazon.awssdk.http.HttpStatusFamily.SERVER_ERROR;
@@ -60,6 +61,7 @@
 import software.amazon.awssdk.http.HttpStatusFamily;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
+import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.http.TlsKeyManagersProvider;
 import software.amazon.awssdk.http.TlsTrustManagersProvider;
@@ -148,10 +150,17 @@ public String clientName() {
     }
 
     private HttpURLConnection createAndConfigureConnection(HttpExecuteRequest request) {
-        HttpURLConnection connection = connectionFactory.createConnection(request.httpRequest().getUri());
-        request.httpRequest()
-               .forEachHeader((key, values) -> values.forEach(value -> connection.setRequestProperty(key, value)));
-        invokeSafely(() -> connection.setRequestMethod(request.httpRequest().method().name()));
+        SdkHttpRequest sdkHttpRequest = request.httpRequest();
+        HttpURLConnection connection = connectionFactory.createConnection(sdkHttpRequest.getUri());
+        sdkHttpRequest.forEachHeader((key, values) -> values.forEach(value -> connection.setRequestProperty(key, value)));
+
+        if (!sdkHttpRequest.firstMatchingHeader(ACCEPT).isPresent()) {
+            // Override Accept header because the default one in JDK does not comply with RFC 7231
+            // See: https://bugs.openjdk.org/browse/JDK-8163921
+            connection.setRequestProperty(ACCEPT, "*/*");
+        }
+
+        invokeSafely(() -> connection.setRequestMethod(sdkHttpRequest.method().name()));
         if (request.contentStreamProvider().isPresent()) {
             connection.setDoOutput(true);
         }
@@ -160,8 +169,8 @@ private HttpURLConnection createAndConfigureConnection(HttpExecuteRequest reques
         // See: https://github.com/aws/aws-sdk-java-v2/issues/975
         connection.setInstanceFollowRedirects(false);
 
-        request.httpRequest().firstMatchingHeader(CONTENT_LENGTH).map(Long::parseLong)
-               .ifPresent(connection::setFixedLengthStreamingMode);
+        sdkHttpRequest.firstMatchingHeader(CONTENT_LENGTH).map(Long::parseLong)
+                      .ifPresent(connection::setFixedLengthStreamingMode);
 
         return connection;
     }

http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java

@@ -14,17 +14,23 @@
  */
 package software.amazon.awssdk.http.urlconnection;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static software.amazon.awssdk.http.Header.ACCEPT;
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
 
+import java.io.IOException;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 import org.junit.After;
 import org.junit.Test;
+import software.amazon.awssdk.http.HttpExecuteRequest;
+import software.amazon.awssdk.http.HttpExecuteResponse;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpClientTestSuite;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.utils.AttributeMap;
 
 public final class UrlConnectionHttpClientWireMockTest extends SdkHttpClientTestSuite {
@@ -50,6 +56,43 @@ public void connectionsAreNotReusedOn5xxErrors() {
         // We cannot support this because the URL connection client doesn't allow us to disable connection reuse
     }
 
+    // https://bugs.openjdk.org/browse/JDK-8163921
+    @Test
+    public void noAcceptHeader_shouldSet() throws IOException {
+        SdkHttpClient client = createSdkHttpClient();
+
+        stubForMockRequest(200);
+
+        SdkHttpFullRequest req = mockSdkRequest("http://localhost:" + mockServer.port(), SdkHttpMethod.POST);
+        HttpExecuteResponse rsp = client.prepareRequest(HttpExecuteRequest.builder()
+                                                                          .request(req)
+                                                                          .contentStreamProvider(req.contentStreamProvider()
+                                                                                                    .orElse(null))
+                                                                          .build())
+                                        .call();
+
+        mockServer.verify(postRequestedFor(urlPathEqualTo("/")).withHeader(ACCEPT, equalTo("*/*")));
+    }
+
+    @Test
+    public void hasAcceptHeader_shouldNotOverride() throws IOException {
+        SdkHttpClient client = createSdkHttpClient();
+
+        stubForMockRequest(200);
+
+        SdkHttpFullRequest req = mockSdkRequest("http://localhost:" + mockServer.port(), SdkHttpMethod.POST);
+        req = req.toBuilder().putHeader(ACCEPT, "text/html").build();
+        HttpExecuteResponse rsp = client.prepareRequest(HttpExecuteRequest.builder()
+                                                                          .request(req)
+                                                                          .contentStreamProvider(req.contentStreamProvider()
+                                                                                                    .orElse(null))
+                                                                          .build())
+                                        .call();
+
+        mockServer.verify(postRequestedFor(urlPathEqualTo("/")).withHeader(ACCEPT, equalTo("text/html")));
+    }
+
+
     @After
     public void reset() {
         HttpsURLConnection.setDefaultSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault());

test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java

@@ -239,7 +239,7 @@ protected void testForResponseCodeUsingHttps(SdkHttpClient client, int returnCod
         validateResponse(rsp, returnCode, sdkHttpMethod);
     }
 
-    private void stubForMockRequest(int returnCode) {
+    protected void stubForMockRequest(int returnCode) {
         ResponseDefinitionBuilder responseBuilder = aResponse().withStatus(returnCode)
                                                                .withHeader("Some-Header", "With Value")
                                                                .withBody("hello");
@@ -277,7 +277,7 @@ private void validateResponse(HttpExecuteResponse response, int returnCode, SdkH
         mockServer.resetMappings();
     }
 
-    private SdkHttpFullRequest mockSdkRequest(String uriString, SdkHttpMethod method) {
+    protected SdkHttpFullRequest mockSdkRequest(String uriString, SdkHttpMethod method) {
         URI uri = URI.create(uriString);
         SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder()
                                                             .uri(uri)