From 97652cc04c4bbd99c072a64430586a51db47f72c Mon Sep 17 00:00:00 2001 From: Alessio Soldano Date: Wed, 5 Aug 2020 12:32:11 +0200 Subject: [PATCH] [RESTEASY-2669] Dealt with a few warnings --- .../resteasy/plugins/providers/DataSourceProvider.java | 1 + .../jboss/resteasy/plugins/providers/DefaultTextPlain.java | 2 +- .../resteasy/plugins/providers/FileRangeException.java | 2 ++ .../providers/JaxrsServerFormUrlEncodedProvider.java | 2 +- .../jboss/resteasy/plugins/providers/RegisterBuiltin.java | 6 +++--- .../plugins/providers/sse/OutboundSseEventImpl.java | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java index ac051184325..bc61cc44942 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java @@ -72,6 +72,7 @@ public InputStream getInputStream() throws IOException InputStream bis = new ByteArrayInputStream(byteBuffer, byteBufferOffset, byteBufferLength); if (tempFile == null) return bis; + @SuppressWarnings("resource") InputStream fis = new FileInputStream(tempFile); return new SequenceInputStream(bis, fis); } diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DefaultTextPlain.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DefaultTextPlain.java index 183de116157..cd8ef95d417 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DefaultTextPlain.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/DefaultTextPlain.java @@ -25,7 +25,7 @@ * @author Bill Burke * @version $Revision: 1 $ */ -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "rawtypes"}) @Provider @Produces("text/plain") @Consumes("text/plain") diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/FileRangeException.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/FileRangeException.java index 9ca6f5074ba..1e67b34d090 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/FileRangeException.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/FileRangeException.java @@ -11,6 +11,8 @@ */ public class FileRangeException extends WebApplicationException { + private static final long serialVersionUID = -5615796352743435769L; + public FileRangeException(final MediaType mediaType, final File file, final long begin, final long end) { super(Response.status(206).entity(new FileRange(file, begin, end)).type(mediaType).build()); diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/JaxrsServerFormUrlEncodedProvider.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/JaxrsServerFormUrlEncodedProvider.java index d9348c4d3cd..7484a096a4e 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/JaxrsServerFormUrlEncodedProvider.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/JaxrsServerFormUrlEncodedProvider.java @@ -43,11 +43,11 @@ public boolean isReadable(Class type, Type genericType, Annotation[] annotati @Context HttpRequest request; + @SuppressWarnings("unchecked") @Override public Form readFrom(Class
type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, InputStream entityStream) throws IOException, WebApplicationException { LogMessages.LOGGER.debugf("Provider : %s, Method : readFrom", getClass().getName()); - @SuppressWarnings(value = "unchecked") MultivaluedMap map = null; if (useContainerParams) { boolean encoded = FindAnnotation.findAnnotation(annotations, Encoded.class) != null; diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/RegisterBuiltin.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/RegisterBuiltin.java index 9bdc9b90ae4..9af4190f661 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/RegisterBuiltin.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/RegisterBuiltin.java @@ -89,17 +89,17 @@ public static void registerProviders(ResteasyProviderFactory factory) throws Exc final String line = entry.getKey(); try { - Class clazz; + Class clazz; if (System.getSecurityManager() == null) { clazz = Thread.currentThread().getContextClassLoader().loadClass(line); } else { - clazz = AccessController.doPrivileged(new PrivilegedExceptionAction() + clazz = AccessController.doPrivileged(new PrivilegedExceptionAction>() { @Override - public Class run() throws ClassNotFoundException + public Class run() throws ClassNotFoundException { return Thread.currentThread().getContextClassLoader().loadClass(line); } diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/OutboundSseEventImpl.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/OutboundSseEventImpl.java index ba54e663a7f..72d8dda1be3 100644 --- a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/OutboundSseEventImpl.java +++ b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/OutboundSseEventImpl.java @@ -88,7 +88,7 @@ public Builder comment(String comment) return this; } - public Builder data(Class type, Object data) + public Builder data(@SuppressWarnings("rawtypes") Class type, Object data) { if (type == null) { @@ -105,7 +105,7 @@ public Builder data(Class type, Object data) return this; } - public Builder data(GenericType type, Object data) + public Builder data(@SuppressWarnings("rawtypes") GenericType type, Object data) { if (type == null) {