fix for not encoding json as default (#194)

FasterXML · Aug 23, 2024 · b05a52e · b05a52e
1 parent fa60342
commit b05a52e
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 8 deletions.
diff --git a/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/JacksonCBORProvider.java b/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/JacksonCBORProvider.java
@@ -44,7 +44,8 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+// https://datatracker.ietf.org/doc/html/rfc8949
+@Produces({ "application/cbor", MediaType.WILDCARD })
 public class JacksonCBORProvider
 extends ProviderBase<JacksonCBORProvider,
     ObjectMapper,

diff --git a/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java b/cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java
@@ -24,7 +24,8 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+//https://datatracker.ietf.org/doc/html/rfc8949
+@Produces({ "application/cbor", MediaType.WILDCARD })
 public class JacksonJaxbCBORProvider extends JacksonCBORProvider {
     /**
      * Default annotation sets to use, if not explicitly defined during

diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java
@@ -24,7 +24,7 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD) // NOTE: required to support "non-standard" JSON variants
-@Produces(MediaType.WILDCARD)
+@Produces({MediaType.APPLICATION_JSON, "text/json", MediaType.WILDCARD})
 public class JacksonJaxbJsonProvider extends JacksonJsonProvider {
     /**
      * Default annotation sets to use, if not explicitly defined during

diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
@@ -44,7 +44,7 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD) // NOTE: required to support "non-standard" JSON variants
-@Produces(MediaType.WILDCARD)
+@Produces({MediaType.APPLICATION_JSON, "text/json", MediaType.WILDCARD})
 public class JacksonJsonProvider
     extends ProviderBase<JacksonJsonProvider,
         ObjectMapper,

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -100,3 +100,9 @@ Steven Schlansker (@stevenschlansker)
 
 * Contributed #170: Add `JaxRsFeature.READ_FULL_STREAM` to consume all content
  (2.15.0)
+
+Yura (@sdyura)
+
+* Contributed #193: `JacksonJaxbJsonProvider` has @Produces(MediaType.WILDCARD) and yet
+  hasMatchingMediaType(MediaType.WILDCARD) return false
+ (2.18.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,9 @@ Sub-modules:
 
 #192: Bring back code to support JAXRS v1 (revert #134 for 2.18)
  (contributed by @pjfanning)
+#193: `JacksonJaxbJsonProvider` has @Produces(MediaType.WILDCARD) and yet
+  hasMatchingMediaType(MediaType.WILDCARD) return false
+ (contributed by Yura)
 * Woodstox dependency now 7.0.0
 
 2.17.2 (05-Jul-2024)

diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java
@@ -24,7 +24,7 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+@Produces({ MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.WILDCARD })
 public class JacksonJaxbXMLProvider extends JacksonXMLProvider {
     /**
      * Default annotation sets to use, if not explicitly defined during

diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
@@ -46,7 +46,7 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+@Produces({ MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.WILDCARD })
 public class JacksonXMLProvider
     extends ProviderBase<JacksonXMLProvider,
         XmlMapper,

diff --git a/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/JacksonJaxbYAMLProvider.java b/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/JacksonJaxbYAMLProvider.java
@@ -24,7 +24,8 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+// As per https://www.rfc-editor.org/rfc/rfc9512.html
+@Produces({ "application/yaml", MediaType.WILDCARD })
 public class JacksonJaxbYAMLProvider extends JacksonYAMLProvider {
     /**
      * Default annotation sets to use, if not explicitly defined during

diff --git a/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/JacksonYAMLProvider.java b/yaml/src/main/java/com/fasterxml/jackson/jaxrs/yaml/JacksonYAMLProvider.java
@@ -52,7 +52,8 @@
  */
 @Provider
 @Consumes(MediaType.WILDCARD)
-@Produces(MediaType.WILDCARD)
+//As per https://www.rfc-editor.org/rfc/rfc9512.html
+@Produces({ "application/yaml", MediaType.WILDCARD })
 public class JacksonYAMLProvider
         extends ProviderBase<JacksonYAMLProvider,
         YAMLMapper,