[tomee] branch master updated: Ensure File and Reader are not considered readable by TomEEJsonbProvider TOMEE-3727 TOMEE-3728

[dblevins]

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

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 12619cc  Ensure File and Reader are not considered readable by 
TomEEJsonbProvider TOMEE-3727 TOMEE-3728
12619cc is described below

commit 12619cc1199aac492c03c530e32437cb474c7ab0
Author: David Blevins <david.blev...@gmail.com>
AuthorDate: Fri Apr 23 20:58:02 2021 -0700

    Ensure File and Reader are not considered readable by TomEEJsonbProvider
    TOMEE-3727 TOMEE-3728
---
 .../server/cxf/rs/johnzon/TomEEJsonbProvider.java  | 33 ++++++----------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
index 841cea9..e9c1a26 100644
--- 
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
+++ 
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
@@ -23,12 +23,9 @@ import javax.activation.DataSource;
 import javax.json.bind.JsonbConfig;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.Provider;
 import java.io.File;
-import java.io.OutputStream;
 import java.io.Reader;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -48,21 +45,10 @@ public class TomEEJsonbProvider<T> extends 
JsonbJaxrsProvider<T> {
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
         // let the CXF built-in writer handle this one
         // TODO: add a setting?
-        if (DataSource.class.isAssignableFrom(type)) {
-            return false;
-        }
-
-        if (byte[].class.isAssignableFrom(type)) {
-            return false;
-        }
-
-        if (File.class.isAssignableFrom(type)) {
-            return false;
-        }
-
-        if (Reader.class.isAssignableFrom(type)) {
-            return false;
-        }
+        if (DataSource.class.isAssignableFrom(type)) return false;
+        if (byte[].class.isAssignableFrom(type)) return false;
+        if (File.class.isAssignableFrom(type)) return false;
+        if (Reader.class.isAssignableFrom(type)) return false;
 
         return super.isWriteable(type, genericType, annotations, mediaType);
     }
@@ -71,13 +57,10 @@ public class TomEEJsonbProvider<T> extends 
JsonbJaxrsProvider<T> {
     public boolean isReadable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
         // let the CXF built-in writer handle this one
         // TODO: add a setting?
-        if (DataSource.class.isAssignableFrom(type)) {
-            return false;
-        }
-
-        if (byte[].class.isAssignableFrom(type)) {
-            return false;
-        }
+        if (DataSource.class.isAssignableFrom(type)) return false;
+        if (byte[].class.isAssignableFrom(type)) return false;
+        if (File.class.isAssignableFrom(type)) return false;
+        if (Reader.class.isAssignableFrom(type)) return false;
 
         return super.isReadable(type, genericType, annotations, mediaType);
     }