Support for application/json-patch+json media type (#9684)

helidon-io · Jan 27, 2025 · 22b13b8 · 22b13b8
1 parent c7c8dd8
commit 22b13b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/common/media-type/src/main/java/io/helidon/common/media/type/MediaTypeEnum.java b/common/media-type/src/main/java/io/helidon/common/media/type/MediaTypeEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 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.
@@ -26,6 +26,7 @@ enum MediaTypeEnum implements MediaType {
     APPLICATION_XHTML_XML("application", "xhtml+xml"),
     APPLICATION_SVG_XML("application", "svg+xml"),
     APPLICATION_JSON("application", "json"),
+    APPLICATION_JSON_PATCH_JSON("application", "json-patch+json"),
     APPLICATION_STREAM_JSON("application", "stream+json"),
     APPLICATION_FORM_URLENCODED("application", "x-www-form-urlencoded"),
     MULTIPART_FORM_DATA("multipart", "form-data"),

diff --git a/common/media-type/src/main/java/io/helidon/common/media/type/MediaTypes.java b/common/media-type/src/main/java/io/helidon/common/media/type/MediaTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2025 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.
@@ -54,6 +54,10 @@ public final class MediaTypes {
      * {@code application/json} media type.
      */
     public static final MediaType APPLICATION_JSON = MediaTypeEnum.APPLICATION_JSON;
+    /**
+     * {@code application/json-patch+json} media type.
+     */
+    public static final MediaType APPLICATION_JSON_PATCH_JSON = MediaTypeEnum.APPLICATION_JSON_PATCH_JSON;
     /**
      * {@code application/stream+json} media type.
      */

diff --git a/http/media/jsonp/src/main/java/io/helidon/http/media/jsonp/JsonpSupport.java b/http/media/jsonp/src/main/java/io/helidon/http/media/jsonp/JsonpSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 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.
@@ -128,7 +128,7 @@ public String type() {
     public <T> ReaderResponse<T> reader(GenericType<T> type, Headers requestHeaders) {
         if (isSupportedType(type)) {
             if (requestHeaders.contentType()
-                    .map(it -> it.test(MediaTypes.APPLICATION_JSON))
+                    .map(this::isMediaTypeSupported)
                     .orElse(true)) {
                 return new ReaderResponse<>(SupportLevel.SUPPORTED, this::reader);
             }
@@ -159,7 +159,7 @@ public <T> ReaderResponse<T> reader(GenericType<T> type,
                 return new ReaderResponse<>(SupportLevel.SUPPORTED, this::reader);
             }
             for (HttpMediaType acceptedType : acceptedTypes) {
-                if (acceptedType.test(MediaTypes.APPLICATION_JSON)) {
+                if (isMediaTypeSupported(acceptedType)) {
                     return new ReaderResponse<>(SupportLevel.SUPPORTED, this::reader);
                 }
             }
@@ -182,6 +182,11 @@ boolean isSupportedType(GenericType<?> type) {
         return JsonStructure.class.isAssignableFrom(type.rawType());
     }
 
+    boolean isMediaTypeSupported(HttpMediaType mediaType) {
+        return mediaType.test(MediaTypes.APPLICATION_JSON)
+                || mediaType.test(MediaTypes.APPLICATION_JSON_PATCH_JSON);
+    }
+
     <T> EntityReader<T> reader() {
         return reader;
     }