micronaut-projects · sdelamo · Oct 2, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
diff --git a/...o/micronaut/http/server/exceptions/response/DefaultHtmlErrorResponseBodyProviderTest.java b/...o/micronaut/http/server/exceptions/response/DefaultHtmlErrorResponseBodyProviderTest.java
@@ -29,6 +29,7 @@
 
 import java.util.Optional;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -45,11 +46,30 @@ class DefaultHtmlErrorResponseBodyProviderTest extends Specification {
     @Inject
     HttpClient httpClient;
 
+    @Test
+    void ifRequestAcceptsBothJsonAnHtmlJsonIsUsed() {
+        BlockingHttpClient client = httpClient.toBlocking();
+        HttpClientResponseException ex = assertThrows(HttpClientResponseException.class, () ->
+            client.exchange(HttpRequest.POST("/book/save", new Book("Building Microservices", "", 5000))
+                .accept(MediaType.TEXT_HTML, MediaType.APPLICATION_JSON)));
+        assertEquals(HttpStatus.BAD_REQUEST, ex.getStatus());
+        assertTrue(ex.getResponse().getContentType().isPresent());
+        assertEquals(MediaType.APPLICATION_JSON, ex.getResponse().getContentType().get().toString());
+        Optional<String> jsonOptional = ex.getResponse().getBody(String.class);
+        assertTrue(jsonOptional.isPresent());
+        String json = jsonOptional.get();
+        assertFalse(json.contains("<!doctype html>"));
+    }
+
     @Test
     void validationErrorsShowInHtmlErrorPages() {
         BlockingHttpClient client = httpClient.toBlocking();
-        HttpClientResponseException ex = assertThrows(HttpClientResponseException.class, () -> client.exchange(HttpRequest.POST("/book/save", new Book("Building Microservices", "", 5000)).accept(MediaType.TEXT_HTML)));
+        HttpClientResponseException ex = assertThrows(HttpClientResponseException.class, () ->
+            client.exchange(HttpRequest.POST("/book/save", new Book("Building Microservices", "", 5000))
+                .accept(MediaType.TEXT_HTML)));
         assertEquals(HttpStatus.BAD_REQUEST, ex.getStatus());
+        assertTrue(ex.getResponse().getContentType().isPresent());
+        assertEquals(MediaType.TEXT_HTML, ex.getResponse().getContentType().get().toString());
         Optional<String> htmlOptional = ex.getResponse().getBody(String.class);
         assertTrue(htmlOptional.isPresent());
         String html = htmlOptional.get();

diff --git a/...main/java/io/micronaut/http/server/exceptions/response/DefaultErrorResponseProcessor.java b/...main/java/io/micronaut/http/server/exceptions/response/DefaultErrorResponseProcessor.java
@@ -17,10 +17,7 @@
 
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.Internal;
-import io.micronaut.http.HttpMethod;
-import io.micronaut.http.HttpRequest;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.MutableHttpResponse;
+import io.micronaut.http.*;
 import io.micronaut.http.hateoas.JsonError;
 import jakarta.inject.Singleton;
 
@@ -50,7 +47,10 @@ public MutableHttpResponse processResponse(ErrorContext errorContext, MutableHtt
             return (MutableHttpResponse<JsonError>) response;
         }
         final boolean isError = response.status().getCode() >= 400;
-        if (isError && request.accept().stream().anyMatch(mediaType -> mediaType.equals(MediaType.TEXT_HTML_TYPE))) {
+        if (isError
+            && request.accept().stream().anyMatch(mediaType -> mediaType.equals(MediaType.TEXT_HTML_TYPE))
+            && request.accept().stream().noneMatch(MediaTypeUtils::isJson)
+        ) {
             return response.body(htmlBodyErrorResponseProvider.body(errorContext, response))
                     .contentType(htmlBodyErrorResponseProvider.contentType());
         }

diff --git a/http/build.gradle b/http/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     testImplementation project(":runtime")
     testImplementation(libs.logback.classic)
     testImplementation(libs.jazzer.junit)
+    testImplementation(libs.junit.jupiter.params)
 }
 
 tasks.named("compileKotlin") {

diff --git a/http/src/main/java/io/micronaut/http/MediaTypeUtils.java b/http/src/main/java/io/micronaut/http/MediaTypeUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed 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
+ *
+ * https://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 io.micronaut.http;
+
+import io.micronaut.core.annotation.NonNull;
+
+/**
+ * Utility methods for working with {@link MediaType}.
+ * @author Sergio del Amo
+ * @since 4.7.0
+ */
+public final class MediaTypeUtils {
+
+    /**
+     *
+     * @param mediaType Media Type
+     * @return Returns true if the media type is {@link MediaType#APPLICATION_JSON_TYPE}, {@link MediaType#TEXT_JSON_TYPE}, {@link MediaType#APPLICATION_HAL_JSON_TYPE}, {@link MediaType#APPLICATION_JSON_GITHUB_TYPE}, {@link MediaType#APPLICATION_JSON_FEED_TYPE}, {@link {@link MediaType#APPLICATION_JSON_PROBLEM_TYPE}, {@link MediaType#APPLICATION_JSON_PATCH_TYPE}, {@link MediaType#APPLICATION_JSON_MERGE_PATCH_TYPE} or {@link MediaType#APPLICATION_JSON_SCHEMA_TYPE}.
+     */
+    public static boolean isJson(@NonNull MediaType mediaType) {
+        return mediaType.equals(MediaType.APPLICATION_JSON_TYPE)
+            || mediaType.equals(MediaType.TEXT_JSON_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_HAL_JSON_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_GITHUB_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_FEED_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_PROBLEM_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_PATCH_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_MERGE_PATCH_TYPE)
+            || mediaType.equals(MediaType.APPLICATION_JSON_SCHEMA_TYPE);
+
+    }
+}
diff --git a/http/src/test/java/io/micronaut/http/MediaTypeUtilsTest.java b/http/src/test/java/io/micronaut/http/MediaTypeUtilsTest.java
@@ -0,0 +1,85 @@
+package io.micronaut.http;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.List;
+
+import static io.micronaut.http.MediaType.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MediaTypeUtilsTest {
+    @ParameterizedTest
+    @MethodSource
+    void isJsonTrue(MediaType mediaType) {
+        assertTrue(MediaTypeUtils.isJson(mediaType));
+    }
+
+    private static List<MediaType> isJsonTrue() {
+        return List.of(
+            APPLICATION_JSON_TYPE,
+            TEXT_JSON_TYPE,
+            APPLICATION_HAL_JSON_TYPE,
+            APPLICATION_JSON_GITHUB_TYPE,
+            APPLICATION_JSON_FEED_TYPE,
+            APPLICATION_JSON_PROBLEM_TYPE,
+            APPLICATION_JSON_PATCH_TYPE,
+            APPLICATION_JSON_MERGE_PATCH_TYPE,
+            APPLICATION_JSON_SCHEMA_TYPE
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void isJsonFalse(MediaType mediaType) {
+        assertFalse(MediaTypeUtils.isJson(mediaType));
+    }
+
+    private static List<MediaType> isJsonFalse() {
+        return List.of(ALL_TYPE,
+            APPLICATION_FORM_URLENCODED_TYPE,
+            APPLICATION_XHTML_TYPE,
+            APPLICATION_XML_TYPE,
+            APPLICATION_YAML_TYPE,
+            APPLICATION_HAL_XML_TYPE,
+            APPLICATION_ATOM_XML_TYPE,
+            APPLICATION_VND_ERROR_TYPE,
+            APPLICATION_JSON_STREAM_TYPE,
+            APPLICATION_OCTET_STREAM_TYPE,
+            APPLICATION_GRAPHQL_TYPE,
+            APPLICATION_PDF_TYPE,
+            GPX_XML_TYPE,
+            GZIP_TYPE,
+            ZIP_TYPE,
+            MICROSOFT_EXCEL_OPEN_XML_TYPE,
+            MICROSOFT_EXCEL_TYPE,
+            YANG_TYPE,
+            CUE_TYPE,
+            TOML_TYPE,
+            RTF_TYPE,
+            ZLIB_TYPE,
+            ZSTD_TYPE,
+            MULTIPART_FORM_DATA_TYPE,
+            TEXT_HTML_TYPE,
+            TEXT_CSV_TYPE,
+            TEXT_XML_TYPE,
+            TEXT_PLAIN_TYPE,
+            TEXT_EVENT_STREAM_TYPE,
+            TEXT_MARKDOWN_TYPE,
+            TEXT_CSS_TYPE,
+            TEXT_JAVASCRIPT_TYPE,
+            TEXT_ECMASCRIPT_TYPE,
+            IMAGE_APNG_TYPE,
+            IMAGE_BMP_TYPE,
+            IMAGE_X_ICON_TYPE,
+            IMAGE_TIFF_TYPE,
+            IMAGE_AVIF_TYPE,
+            IMAGE_SVG_TYPE,
+            IMAGE_XBM_TYPE,
+            IMAGE_PNG_TYPE,
+            IMAGE_JPEG_TYPE,
+            IMAGE_GIF_TYPE,
+            IMAGE_WEBP_TYPE,
+            IMAGE_WMF_TYPE);
+    }
+}