2.x: Fix bug with empty Accept header (helidon-io#7536)

Captain1653 · Apr 23, 2024 · f5e42cf · f5e42cf
1 parent 5d50cf6
commit f5e42cf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/openapi/src/main/java/io/helidon/openapi/OpenAPISupport.java b/openapi/src/main/java/io/helidon/openapi/OpenAPISupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -520,7 +520,7 @@ private Optional<MediaType> chooseResponseMediaType(ServerRequest req) {
          */
         RequestHeaders headers = req.headers();
         if (headers.acceptedTypes().isEmpty()) {
-            headers.add(Http.Header.ACCEPT, DEFAULT_RESPONSE_MEDIA_TYPE.toString());
+            return Optional.of(DEFAULT_RESPONSE_MEDIA_TYPE);
         }
         return headers
                 .bestAccepted(preferredMediaTypeOrdering);

diff --git a/openapi/src/test/java/io/helidon/openapi/ServerTest.java b/openapi/src/test/java/io/helidon/openapi/ServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 package io.helidon.openapi;
 
+import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -78,6 +80,22 @@ public static void shutdown() {
         TestUtil.shutdownServer(timeWebServer);
     }
 
+    @Test
+    void testWithEmptyAccept() throws IOException {
+        URL url = new URL("http://localhost:" + greetingWebServer.port() + GREETING_PATH);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+        conn.setRequestProperty("Accept", ""); // Yes, to test a bug fix specify Accept with nothing.
+        Map<String, Object> openAPIDocument = TestUtil.yamlFromResponse(conn);
+
+        // Check one simple value.
+        ArrayList<Map<String, Object>> servers = TestUtil.as(
+                ArrayList.class, openAPIDocument.get("servers"));
+        Map<String, Object> server = servers.get(0);
+        assertThat("unexpected URL", server.get("url"), is("http://localhost:8000"));
+        assertThat("unexpected description", server.get("description"), is("Local test server"));
+    }
+
 
     /**
      * Accesses the OpenAPI endpoint, requesting a YAML response payload, and