Ensure that providers in RESTEasy Reactive common module aren't disco…

…verable These providers are registered manually, but previously because they were annotated with @Provider, they could be inadvertently be registered as application classes in some test cases (essentially if an actual application class extended them)
quarkusio · Oct 10, 2022 · a37bb40 · a37bb40
1 parent abb0616
commit a37bb40
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 26 deletions.
diff --git a/...jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java b/...jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java
@@ -5,14 +5,12 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.BooleanMessageBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerBooleanMessageBodyHandler extends BooleanMessageBodyHandler
         implements ServerMessageBodyReader<Boolean> {
 

diff --git a/...oss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java b/...oss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java
@@ -5,7 +5,6 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.ByteArrayMessageBodyHandler;
 import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
@@ -14,7 +13,6 @@
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerByteArrayMessageBodyHandler extends ByteArrayMessageBodyHandler
         implements ServerMessageBodyWriter<byte[]>, ServerMessageBodyReader<byte[]> {
 

diff --git a/...oss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java b/...oss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java
@@ -5,7 +5,6 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.CharArrayMessageBodyHandler;
 import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
@@ -14,7 +13,6 @@
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerCharArrayMessageBodyHandler extends CharArrayMessageBodyHandler
         implements ServerMessageBodyWriter<char[]>, ServerMessageBodyReader<char[]> {
 

diff --git a/...oss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java b/...oss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java
@@ -5,14 +5,12 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.CharacterMessageBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerCharacterMessageBodyHandler extends CharacterMessageBodyHandler
         implements ServerMessageBodyReader<Character> {
 

diff --git a/...oss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java b/...oss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java
@@ -9,14 +9,12 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 @Consumes("text/plain")
 public class ServerDefaultTextPlainBodyHandler extends DefaultTextPlainBodyHandler implements ServerMessageBodyReader<Object> {
 

diff --git a/.../java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java b/.../java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java
@@ -8,14 +8,12 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.FileBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 @Produces("*/*")
 @Consumes("*/*")
 public class ServerFileBodyHandler extends FileBodyHandler implements ServerMessageBodyWriter<File> {

diff --git a/...a/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java b/...a/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java
@@ -7,7 +7,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.FilePart;
 import org.jboss.resteasy.reactive.common.providers.serialisers.FilePartBodyHandler;
@@ -18,7 +17,6 @@
 
 // TODO: this is very simplistic at the moment
 
-@Provider
 @Produces("*/*")
 @Consumes("*/*")
 public class ServerFilePartBodyHandler extends FilePartBodyHandler implements ServerMessageBodyWriter<FilePart> {

diff --git a/...rg/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java b/...rg/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java
@@ -11,7 +11,6 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.MapAsFormUrlEncodedProvider;
 import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
@@ -25,7 +24,6 @@
  * @version $Revision: 1 $
  */
 @SuppressWarnings("rawtypes")
-@Provider
 @Produces("application/x-www-form-urlencoded")
 @Consumes("application/x-www-form-urlencoded")
 @ConstrainedTo(RuntimeType.CLIENT)

diff --git a/...s/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java b/...s/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java
@@ -7,15 +7,13 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.InputStreamMessageBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerInputStreamMessageBodyHandler extends InputStreamMessageBodyHandler
         implements ServerMessageBodyReader<InputStream>, ServerMessageBodyWriter<InputStream> {
 

diff --git a/.../jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java b/.../jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java
@@ -5,14 +5,12 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.NumberMessageBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerNumberMessageBodyHandler extends NumberMessageBodyHandler
         implements ServerMessageBodyReader<Number> {
 

diff --git a/.../java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java b/.../java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java
@@ -9,15 +9,13 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.PathBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 @Produces("*/*")
 public class ServerPathBodyHandler extends PathBodyHandler implements ServerMessageBodyWriter<java.nio.file.Path> {
 

diff --git a/...a/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java b/...a/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java
@@ -9,7 +9,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.PathPart;
 import org.jboss.resteasy.reactive.common.providers.serialisers.PathPartBodyHandler;
@@ -18,7 +17,6 @@
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 @Produces("*/*")
 public class ServerPathPartBodyHandler extends PathPartBodyHandler implements ServerMessageBodyWriter<PathPart> {
 

diff --git a/.../jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java b/.../jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java
@@ -5,15 +5,13 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 
 import org.jboss.resteasy.reactive.common.providers.serialisers.StringMessageBodyHandler;
 import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
 import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
 import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
 
-@Provider
 public class ServerStringMessageBodyHandler extends StringMessageBodyHandler
         implements ServerMessageBodyWriter<Object>, ServerMessageBodyReader<String> {