CXF-9039: Run Jakarta RESTful Web Services 3.1 TCK. Fixing test failures

apache · Feb 2, 2025 · 5612e13 · 5612e13
1 parent 9b2ad3e
commit 5612e13
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/...ions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java b/...ions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Reader;
 import java.io.Writer;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -39,13 +38,13 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.StreamingOutput;
 import jakarta.ws.rs.ext.ContextResolver;
 import jakarta.ws.rs.ext.MessageBodyReader;
 import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.Provider;
 import jakarta.ws.rs.ext.Providers;
 import org.apache.cxf.jaxrs.utils.ExceptionUtils;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 
 /**
  * 11.2.7 Java API for JSON Binding (JSR-370)
@@ -82,12 +81,11 @@ public JsrJsonbProvider(Jsonb jsonb) {
     @Override
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
         return isSupportedMediaType(mediaType) 
-            && !InputStream.class.isAssignableFrom(type)
             && !OutputStream.class.isAssignableFrom(type)
             && !Writer.class.isAssignableFrom(type)
-            && !StreamingOutput.class.isAssignableFrom(type)
             && !CharSequence.class.isAssignableFrom(type)
-            && !Response.class.isAssignableFrom(type);
+            && !Response.class.isAssignableFrom(type)
+            && !JAXRSUtils.isStreamingLikeOutType(type, genericType);
     }
 
     @Override
@@ -100,10 +98,9 @@ public void writeTo(Object t, Class<?> type, Type genericType, Annotation[] anno
     @Override
     public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
         return isSupportedMediaType(mediaType)
-            && !InputStream.class.isAssignableFrom(type)
-            && !Reader.class.isAssignableFrom(type)
             && !Response.class.isAssignableFrom(type)
-            && !CharSequence.class.isAssignableFrom(type);
+            && !CharSequence.class.isAssignableFrom(type)
+            && !JAXRSUtils.isStreamingLikeOutType(type, genericType);
     }
 
     @Override