Clean up compiler warnings

src/rest/src/main/java/org/geoserver/rest/DispatcherCallback.java

@@ -44,8 +44,7 @@ public interface DispatcherCallback {
      */
     static Object getControllerBean(Object handler) {
         if (handler instanceof HandlerMethod) {
-            Object controller = ((HandlerMethod) handler).getBean();
-            return controller;
+            return ((HandlerMethod) handler).getBean();
         }
         return handler;
     }

src/rest/src/main/java/org/geoserver/rest/EnviromentInjectionCallback.java

@@ -27,7 +27,7 @@
 public class EnviromentInjectionCallback extends DispatcherCallbackAdapter {
 
     public void init(HttpServletRequest request, HttpServletResponse response) {
-        Map<String, Object> envVars = new HashMap<String, Object>();
+        Map<String, Object> envVars = new HashMap<>();
 
         // TODO: do we want to support a OWS like "env" param here?
 

src/rest/src/main/java/org/geoserver/rest/MediaTypeCallback.java

@@ -11,5 +11,5 @@
  */
 public interface MediaTypeCallback {
 
-    public void configure(ContentNegotiationConfigurer configurer);
+    void configure(ContentNegotiationConfigurer configurer);
 }

src/rest/src/main/java/org/geoserver/rest/ObjectToMapWrapper.java

@@ -118,12 +118,12 @@ public TemplateModel wrap(Object object) throws TemplateModelException {
      * @return
      */
     protected Map<String, Object> objectToMap(Object object, Class clazz) {
-        HashMap<String, Object> map = new HashMap<String, Object>();
+        HashMap<String, Object> map = new HashMap<>();
 
         ClassProperties cp = OwsUtils.getClassProperties(clazz);
         for ( String p : cp.properties() ) {
             if ( "Class".equals( p ) ) continue;
-            Object value = null;
+            Object value;
             try {
                 value = OwsUtils.get(object, p);
             } catch(Exception e) {
@@ -165,7 +165,7 @@ private Class getClassForUnwrapping(Object o) {
     }
     private static Set<Class<?>> getValueTypes()
     {
-        Set<Class<?>> ret = new HashSet<Class<?>>();
+        Set<Class<?>> ret = new HashSet<>();
         //primitives
         ret.add(Boolean.class);
         ret.add(Character.class);

src/rest/src/main/java/org/geoserver/rest/RequestInfo.java

@@ -17,7 +17,7 @@
  * An object which contains information about the "page" or "resource" being accessed
  * in a rest request.
  *
- * Equivalent of {@link PageInfo} used by the old rest module.
+ * Equivalent of PageInfo used by the old rest module.
  * <p>
  * An instance of this class can be referenced by any restlet via:
  * <pre>

src/rest/src/main/java/org/geoserver/rest/RestBaseController.java

@@ -195,7 +195,7 @@ protected String getTemplateName(Object object) {
      * @return
      */
     protected <T> RestWrapper<T> wrapList(Collection<T> list, Class<T> clazz) {
-        return new RestListWrapper<T>(list, clazz, this, getTemplate(list, clazz));
+        return new RestListWrapper<>(list, clazz, this, getTemplate(list, clazz));
     }
 
     /**
@@ -206,7 +206,7 @@ protected <T> RestWrapper<T> wrapList(Collection<T> list, Class<T> clazz) {
      * @return
      */
     protected <T> RestWrapper<T> wrapObject(T object, Class<T> clazz) {
-        return new RestWrapperAdapter<T>(object, clazz, this, getTemplate(object, clazz));
+        return new RestWrapperAdapter<>(object, clazz, this, getTemplate(object, clazz));
     }
 
     /**
@@ -223,7 +223,7 @@ protected <T> RestWrapper<T> wrapObject(T object, Class<T> clazz, String errorMe
         if (object == null){
             throw new RestException(errorMessage, HttpStatus.NOT_FOUND);
         }
-        return new RestWrapperAdapter<T>(object, clazz, this, getTemplate(object, clazz));
+        return new RestWrapperAdapter<>(object, clazz, this, getTemplate(object, clazz));
     }
 
     @Override

src/rest/src/main/java/org/geoserver/rest/RestConfiguration.java

@@ -11,7 +11,6 @@
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.rest.converters.*;
 import org.geotools.util.Version;
-import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -20,7 +19,6 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
-import org.springframework.web.accept.ContentNegotiationManagerFactoryBean;
 import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
@@ -36,7 +34,6 @@
 import java.util.Comparator;
 import java.util.List;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 /**

src/rest/src/main/java/org/geoserver/rest/converters/BaseMessageConverter.java

@@ -5,7 +5,6 @@
 package org.geoserver.rest.converters;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.logging.Logger;
 
@@ -75,7 +74,7 @@ protected BaseMessageConverter(Charset defaultCharset, MediaType... supportedMed
     }
 
     /**
-     * Returns the priority of the {@link BaseMessageConverte}.
+     * Returns the priority of the {@link BaseMessageConverter}.
      */
     public int getPriority() {
         return ExtensionPriority.LOWEST;

src/rest/src/main/java/org/geoserver/rest/converters/FreemarkerHTMLMessageConverter.java

@@ -15,12 +15,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Logger;
 
 import org.geoserver.platform.ExtensionPriority;
 import org.geoserver.rest.RequestInfo;
 import org.geoserver.rest.wrapper.RestWrapper;
-import org.geotools.util.logging.Logging;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -114,22 +112,19 @@ public List<URL> createCollectionLink(String link) {
         try {
             String href = href(link);
             URL url2 = new URL(href);
-            return (List<URL>) Collections.singletonList(url2);
+            return Collections.singletonList(url2);
         } catch (MalformedURLException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
 
-        return new ArrayList<URL>();
+        return new ArrayList<>();
     }
 
     protected String href(String link) {
 
         final RequestInfo pg = RequestInfo.get();
-        String ext = "html";
-
-        if (ext != null && ext.length() > 0)
-            link = link + "." + ext;
+        link += ".html";
 
         // encode as relative or absolute depending on the link type
         if (link.startsWith("/")) {

src/rest/src/main/java/org/geoserver/rest/converters/InputStreamConverter.java

@@ -13,9 +13,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * Convert InputStream directly to provided output.

src/rest/src/main/java/org/geoserver/rest/converters/StyleReaderConverter.java

@@ -5,26 +5,15 @@
 package org.geoserver.rest.converters;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
 
-import org.apache.commons.io.IOUtils;
 import org.geoserver.catalog.StyleHandler;
-import org.geoserver.catalog.StyleInfo;
 import org.geoserver.catalog.Styles;
-import org.geoserver.config.GeoServerDataDirectory;
-import org.geoserver.platform.GeoServerExtensions;
-import org.geoserver.platform.resource.Resource;
-import org.geoserver.rest.wrapper.RestWrapper;
 import org.geotools.styling.Style;
 import org.geotools.styling.StyledLayerDescriptor;
 import org.geotools.util.Version;
 import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.xml.sax.EntityResolver;
 
 /**

src/rest/src/main/java/org/geoserver/rest/converters/StyleWriterConverter.java

@@ -83,11 +83,8 @@ public void writeInternal(Object object, HttpOutputMessage outputMessage)
     void copyDefinition(StyleInfo style, OutputStream out) throws IOException {
         GeoServerDataDirectory dd = GeoServerExtensions.bean(GeoServerDataDirectory.class);
         Resource resource = dd.style(style);
-        InputStream in = resource.in();
-        try {
+        try (InputStream in = resource.in()) {
             IOUtils.copy(in, out);
-        } finally {
-            in.close();
         }
     }
 }

src/rest/src/main/java/org/geoserver/rest/converters/XStreamCatalogListConverter.java

@@ -5,11 +5,7 @@
 package org.geoserver.rest.converters;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
-
-import javax.print.attribute.standard.Media;
 
 import org.geoserver.config.util.SecureXStream;
 import org.geoserver.config.util.XStreamPersister;
@@ -105,14 +101,14 @@ public boolean canConvert(Class type) {
             public void marshal(Object source, HierarchicalStreamWriter writer,
                     MarshallingContext context) {
 
-                String ref = null;
+                String ref;
                 if (OwsUtils.getter(clazz, "name", String.class) != null) {
                     ref = (String) OwsUtils.get(source, "name");
                 } else if (OwsUtils.getter(clazz, "id", String.class) != null) {
                     ref = (String) OwsUtils.get(source, "id");
                 } else if (OwsUtils.getter(clazz, "id", Long.class) != null) {
                     // For some reason Importer objects have Long ids so this catches that case
-                    ref = (String) OwsUtils.get(source, "id").toString();
+                    ref = OwsUtils.get(source, "id").toString();
                 }
 
                 else {

src/rest/src/main/java/org/geoserver/rest/converters/XStreamJSONMessageConverter.java

@@ -68,10 +68,8 @@ public Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
     //
     @Override
     public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-        if( RestListWrapper.class.isAssignableFrom(clazz) ){
-            return false; // we can only write RestWrapper, not RestListWrapper
-        }
-        return RestWrapper.class.isAssignableFrom(clazz) && canWrite(mediaType);
+        // we can only write RestWrapper, not RestListWrapper
+        return !RestListWrapper.class.isAssignableFrom(clazz) && RestWrapper.class.isAssignableFrom(clazz) && canWrite(mediaType);
     }
     @Override
     public void writeInternal(Object o, HttpOutputMessage outputMessage)

src/rest/src/main/java/org/geoserver/rest/converters/XStreamMessageConverter.java

@@ -10,7 +10,6 @@
 
 import org.geoserver.rest.RequestInfo;
 import org.geotools.util.logging.Logging;
-import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
 
 import com.thoughtworks.xstream.XStream;

src/rest/src/main/java/org/geoserver/rest/converters/XStreamXMLMessageConverter.java

@@ -5,15 +5,12 @@
 package org.geoserver.rest.converters;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 
 import org.geoserver.config.util.SecureXStream;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.rest.wrapper.RestHttpInputWrapper;
 import org.geoserver.rest.wrapper.RestListWrapper;
 import org.geoserver.rest.wrapper.RestWrapper;
-import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -34,10 +31,8 @@ public XStreamXMLMessageConverter() {
 
     @Override
     protected boolean supports(Class<?> clazz) {
-        if( RestWrapper.class.isAssignableFrom(clazz) ){
-            return !RestListWrapper.class.isAssignableFrom(clazz); // we can only read RestWrapper, not RestListWrapper
-        }
-        return true; // reading objects is fine
+        // we can only read RestWrapper, not RestListWrapper
+        return !RestWrapper.class.isAssignableFrom(clazz) || !RestListWrapper.class.isAssignableFrom(clazz);
     }
 
     //
@@ -50,7 +45,7 @@ protected boolean supports(Class<?> clazz) {
 
 
     @Override
-    protected Object readInternal(Class<? extends Object> clazz, HttpInputMessage inputMessage)
+    protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
             throws IOException, HttpMessageNotReadableException {
         XStreamPersister p = xpf.createXMLPersister();
         if (inputMessage instanceof RestHttpInputWrapper) {
@@ -65,10 +60,8 @@ protected Object readInternal(Class<? extends Object> clazz, HttpInputMessage in
     //
     @Override
     public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-        if( RestListWrapper.class.isAssignableFrom(clazz) ){
-            return false; // we can only write RestWrapper, not RestListWrapper
-        }
-        return RestWrapper.class.isAssignableFrom(clazz) && canWrite(mediaType);
+        // we can only write RestWrapper, not RestListWrapper
+        return !RestListWrapper.class.isAssignableFrom(clazz) && RestWrapper.class.isAssignableFrom(clazz) && canWrite(mediaType);
     }
     @Override
     protected void writeInternal(Object o, HttpOutputMessage outputMessage)