(cxf) branch main updated: CXF-9039: Run Jakarta RESTful Web Services 3.1 TCK. Fixing test failures (#2242)

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
     new 69c1adcd86 CXF-9039: Run Jakarta RESTful Web Services 3.1 TCK. Fixing 
test failures (#2242)
69c1adcd86 is described below

commit 69c1adcd867090399f3d2ac09fa0a94aa6699d8e
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Fri Jan 31 07:59:10 2025 -0500

    CXF-9039: Run Jakarta RESTful Web Services 3.1 TCK. Fixing test failures 
(#2242)
---
 .../cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java  | 18 ++++++++++++++++--
 tck/Jenkinsfile                                        |  7 -------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
index f8be63e7a5..38c1bcf9c4 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
@@ -22,6 +22,8 @@ package org.apache.cxf.jaxrs.provider.jsrjsonb;
 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;
 
@@ -36,6 +38,8 @@ import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Context;
 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;
@@ -77,7 +81,13 @@ public class JsrJsonbProvider implements 
MessageBodyReader<Object>, MessageBodyW
     
     @Override
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
-        return isSupportedMediaType(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);
     }
 
     @Override
@@ -89,7 +99,11 @@ public class JsrJsonbProvider implements 
MessageBodyReader<Object>, MessageBodyW
 
     @Override
     public boolean isReadable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
-        return isSupportedMediaType(mediaType);
+        return isSupportedMediaType(mediaType)
+            && !InputStream.class.isAssignableFrom(type)
+            && !Reader.class.isAssignableFrom(type)
+            && !Response.class.isAssignableFrom(type)
+            && !CharSequence.class.isAssignableFrom(type);
     }
 
     @Override
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index 9da5af9a09..33525f75c0 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -32,13 +32,6 @@ pipeline {
                     echo "WORKSPACE = ${PWD}"
                 '''
             }
-        }
-
-       stage('Build JAX-RS TCK') {
-           steps {
-               echo "Using Apache CXF version: " + params.Version
-               sh "mvn clean install -f rest -DskipTests=true"
-           }
        }
 
       stage('Checkout Apache CXF') {