Misc lgtm reported fixes

providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonJAXBContextFinder.java

@@ -70,15 +70,15 @@ public JAXBContext findCacheXmlTypeContext(MediaType mediaType, Annotation[] ann
          JAXBContext ctx = badgerXmlTypeCollectionCache.get(key);
          if (ctx != null) return ctx;
          ctx = createXmlTypeContext(annotations, classes);
-         badgerCollectionCache.put(key, ctx);
+         badgerXmlTypeCollectionCache.put(key, ctx);
          return ctx;
       }
       else
       {
          JAXBContext ctx = mappedXmlTypeCollectionCache.get(key);
          if (ctx != null) return ctx;
          ctx = createXmlTypeContext(annotations, classes);
-         mappedCollectionCache.put(key, ctx);
+         mappedXmlTypeCollectionCache.put(key, ctx);
          return ctx;
       }
    }

providers/jettison/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/json/JsonParsing.java

@@ -60,7 +60,7 @@ public static String extractJsonMapString(Reader reader) throws IOException
                }
             }
          }
-      } while (openBrace > 0 && i != -1);
+      } while (openBrace > 0);
       return buffer.toString();
    }
 
@@ -104,7 +104,7 @@ public static String getJsonString(Reader reader) throws IOException
 
             }
          }
-      } while (quote && i != -1);
+      } while (quote);
       return buffer.toString();
    }
 

providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java

@@ -615,8 +615,8 @@ public void delete()
 
                for (Iterator<File> iterator = filesToDelete.iterator(); iterator.hasNext();)
                {
-                  File file = iterator.next();
-                  if (file.delete())
+                  File f = iterator.next();
+                  if (f.delete())
                   {
                      iterator.remove();
                   }

resteasy-cache/resteasy-cache-core/src/main/java/org/jboss/resteasy/plugins/cache/server/InfinispanCache.java

@@ -187,6 +187,10 @@ public void clear()
             {
                outList.add(new HeaderHolder(HeaderHolder.Type.CACHE_CONTROL, CacheControl.class.cast(o).toString()));
             }
+            else if (o instanceof NewCookie)
+            {
+               outList.add(new HeaderHolder(HeaderHolder.Type.NEW_COOKIE, NewCookie.class.cast(o).toString()));
+            }
             else if (o instanceof Cookie)
             {
                outList.add(new HeaderHolder(HeaderHolder.Type.COOKIE, Cookie.class.cast(o).toString()));     
@@ -195,10 +199,6 @@ else if (o instanceof EntityTag)
             {
                outList.add(new HeaderHolder(HeaderHolder.Type.ENTITY_TAG, EntityTag.class.cast(o).toString()));
             }
-            else if (o instanceof NewCookie)
-            {
-               outList.add(new HeaderHolder(HeaderHolder.Type.NEW_COOKIE, NewCookie.class.cast(o).toString()));
-            }
             else
             {
                outList.add(new HeaderHolder(HeaderHolder.Type.OTHER, o.toString()));

resteasy-cache/resteasy-cache-core/src/main/java/org/jboss/resteasy/plugins/cache/server/ServerCacheFeature.java

@@ -61,10 +61,10 @@ protected String getConfigProperty(String name)
    protected ServerCache getCache(Configurable configurable)
    {
       if (this.cache != null) return this.cache;
-      ServerCache cache = (ServerCache)configurable.getConfiguration().getProperty(ServerCache.class.getName());
-      if (cache != null) return cache;
-      cache = getXmlCache(configurable);
-      if (cache != null) return cache;
+      ServerCache c = (ServerCache)configurable.getConfiguration().getProperty(ServerCache.class.getName());
+      if (c != null) return c;
+      c = getXmlCache(configurable);
+      if (c != null) return c;
       return getDefaultCache();
    }
 

resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/proxy/processors/AbstractCollectionProcessor.java

@@ -22,7 +22,7 @@ public T buildIt(T target, Object object)
       if (object == null) return target;
       if (object instanceof Collection)
       {
-         for (Object obj : (Collection) object)
+         for (Object obj : (Collection<?>) object)
          {
             target = apply(target, obj);
          }
@@ -31,34 +31,34 @@ else if (object.getClass().isArray())
       {
          if (object.getClass().getComponentType().isPrimitive())
          {
-            Class componentType = object.getClass().getComponentType();
+            Class<?> componentType = object.getClass().getComponentType();
             if (componentType.equals(boolean.class))
             {
-               for (Boolean bool : (boolean[]) object) target = apply(target, bool.toString());
+               for (boolean bool : (boolean[]) object) target = apply(target, bool);
             }
             else if (componentType.equals(byte.class))
             {
-               for (Byte val : (byte[]) object) target = apply(target, val.toString());
+               for (byte val : (byte[]) object) target = apply(target, val);
             }
             else if (componentType.equals(short.class))
             {
-               for (Short val : (short[]) object) target = apply(target, val.toString());
+               for (short val : (short[]) object) target = apply(target, val);
             }
             else if (componentType.equals(int.class))
             {
-               for (Integer val : (int[]) object) target = apply(target, val.toString());
+               for (int val : (int[]) object) target = apply(target, val);
             }
             else if (componentType.equals(long.class))
             {
-               for (Long val : (long[]) object) target = apply(target, val.toString());
+               for (long val : (long[]) object) target = apply(target, val);
             }
             else if (componentType.equals(float.class))
             {
-               for (Float val : (float[]) object) target = apply(target, val.toString());
+               for (float val : (float[]) object) target = apply(target, val);
             }
             else if (componentType.equals(double.class))
             {
-               for (Double val : (double[]) object) target = apply(target, val.toString());
+               for (double val : (double[]) object) target = apply(target, val);
             }
          }
          else

resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/AcceptParameterHttpPreprocessor.java

@@ -1,22 +1,17 @@
 package org.jboss.resteasy.core;
 
 import org.jboss.resteasy.resteasy_jaxrs.i18n.Messages;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.jboss.resteasy.spi.HttpRequestPreprocessor;
-import org.jboss.resteasy.util.MediaTypeHelper;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.PreMatching;
 import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -67,8 +62,6 @@ public void filter(ContainerRequestContext request) throws IOException
 
          if (accepts != null && !accepts.isEmpty())
          {
-            List<MediaType> mediaTypes = new ArrayList<MediaType>();
-
             for (String accept : accepts)
             {
                try
@@ -80,7 +73,6 @@ public void filter(ContainerRequestContext request) throws IOException
                {
                   throw new RuntimeException(e);
                }
-               mediaTypes.addAll(MediaTypeHelper.parseHeader(accept));
             }
 
          }

resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResourceMethodRegistry.java

@@ -81,15 +81,15 @@ public void addPerRequestResource(ResourceClass clazz)
    {
       POJOResourceFactory resourceFactory = new POJOResourceFactory(clazz);
       register(resourceFactory, null, clazz);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
    @Override
    public void addPerRequestResource(ResourceClass clazz, String basePath)
    {
       POJOResourceFactory resourceFactory = new POJOResourceFactory(clazz);
       register(resourceFactory, basePath, clazz);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
    public void addSingletonResource(Object singleton)
@@ -107,15 +107,15 @@ public void addSingletonResource(Object singleton, ResourceClass resourceClass)
    {
       SingletonResource resourceFactory = new SingletonResource(singleton, resourceClass);
       register(resourceFactory, null, resourceClass);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
    @Override
    public void addSingletonResource(Object singleton, ResourceClass resourceClass, String basePath)
    {
       SingletonResource resourceFactory = new SingletonResource(singleton);
       register(resourceFactory, basePath, resourceClass);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
 
@@ -134,15 +134,15 @@ public void addJndiResource(String jndiName, ResourceClass resourceClass)
    {
       JndiResourceFactory resourceFactory = new JndiResourceFactory(jndiName);
       register(resourceFactory, null, resourceClass);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
    @Override
    public void addJndiResource(String jndiName, ResourceClass resourceClass, String basePath)
    {
       JndiResourceFactory resourceFactory = new JndiResourceFactory(jndiName);
       register(resourceFactory, basePath, resourceClass);
-      if (resourceFactory != null) resourceFactory.registered(providerFactory);
+      resourceFactory.registered(providerFactory);
    }
 
 

resteasy-wadl/src/main/java/org/jboss/resteasy/wadl/ResteasyWadlMethodMetaData.java

@@ -78,16 +78,16 @@ public ResteasyWadlMethodMetaData(ResteasyWadlServiceRegistry serviceRegistry, R
         List<Method> methodsUntilRoot = new ArrayList<Method>();
         methodsUntilRoot.add(method);
         serviceRegistry.collectResourceMethodsUntilRoot(methodsUntilRoot);
-        for (Method method : methodsUntilRoot) {
-            Annotation[][] allAnnotations = method.getParameterAnnotations();
-            Class<?>[] parameterTypes = method.getParameterTypes();
+        for (Method m : methodsUntilRoot) {
+            Annotation[][] allAnnotations = m.getParameterAnnotations();
+            Class<?>[] parameterTypes = m.getParameterTypes();
             for (int i = 0; i < parameterTypes.length; i++) {
                 processMetaData(parameterTypes[i], allAnnotations[i], true);
             }
         }
         // this must be after we scan the params in case of @Form
         this.consumesMIMETypes = getConsumes(consumes);
-        if (wantsForm && !"application/x-www-form-urlencoded".equals(consumesMIMETypes)) {
+        if (wantsForm && !consumesMIMETypes.contains("application/x-www-form-urlencoded")) {
             LogMessages.LOGGER.warn(Messages.MESSAGES.overridingConsumesAnnotation());
             this.consumesMIMETypes = Arrays.asList("application/x-www-form-urlencoded");
         }