Take into account Sonar comments

Author: thboileau

org.restlet/src/main/java/org/restlet/engine/Engine.java

@@ -26,9 +26,11 @@
 import org.restlet.Context;
 import org.restlet.Request;
 import org.restlet.Response;
+import org.restlet.Server;
 import org.restlet.data.ChallengeScheme;
 import org.restlet.data.Method;
 import org.restlet.data.Protocol;
+import org.restlet.engine.connector.ConnectorHelper;
 import org.restlet.engine.io.IoUtils;
 import org.restlet.engine.log.LoggerFacade;
 
@@ -121,23 +123,18 @@ public static Thread createThreadWithLocalVariables(final Runnable runnable, Str
         final Integer currentVirtualHost = org.restlet.routing.VirtualHost.getCurrent();
         final Response currentResponse = Response.getCurrent();
 
-        Runnable r =
-                new Runnable() {
+        Runnable r = () -> {
+                    // Copy the thread local variables
+                    Response.setCurrent(currentResponse);
+                    Context.setCurrent(currentContext);
+                    org.restlet.routing.VirtualHost.setCurrent(currentVirtualHost);
+                    org.restlet.Application.setCurrent(currentApplication);
 
-                    @Override
-                    public void run() {
-                        // Copy the thread local variables
-                        Response.setCurrent(currentResponse);
-                        Context.setCurrent(currentContext);
-                        org.restlet.routing.VirtualHost.setCurrent(currentVirtualHost);
-                        org.restlet.Application.setCurrent(currentApplication);
-
-                        try {
-                            // Run the user task
-                            runnable.run();
-                        } finally {
-                            Engine.clearThreadLocalVariables();
-                        }
+                    try {
+                        // Run the user task
+                        runnable.run();
+                    } finally {
+                        Engine.clearThreadLocalVariables();
                     }
                 };
 
@@ -385,7 +382,7 @@ public static void setRestletLogLevel(Level restletLogLevel) {
     private final List<org.restlet.engine.connector.ProtocolHelper> registeredProtocols;
 
     /** List of available server connectors. */
-    private final List<org.restlet.engine.connector.ConnectorHelper<org.restlet.Server>>
+    private final List<ConnectorHelper<Server>>
             registeredServers;
 
     /** User class loader to use for dynamic class loading. */
@@ -529,26 +526,22 @@ public org.restlet.engine.connector.ConnectorHelper<Client> createHelper(
      * @return The new helper.
      */
     @SuppressWarnings("unchecked")
-    public org.restlet.engine.connector.ConnectorHelper<org.restlet.Server> createHelper(
-            org.restlet.Server server, String helperClass) {
-        org.restlet.engine.connector.ConnectorHelper<org.restlet.Server> result = null;
+    public ConnectorHelper<Server> createHelper(Server server, String helperClass) {
+        ConnectorHelper<Server> result = null;
 
         if (!server.getProtocols().isEmpty()) {
-            org.restlet.engine.connector.ConnectorHelper<org.restlet.Server> connector = null;
-            for (final Iterator<org.restlet.engine.connector.ConnectorHelper<org.restlet.Server>>
-                            iter = getRegisteredServers().iterator();
-                    (result == null) && iter.hasNext(); ) {
+            ConnectorHelper<Server> connector = null;
+            for (final Iterator<ConnectorHelper<Server>> iter = getRegisteredServers().iterator(); (result == null) && iter.hasNext(); ) {
                 connector = iter.next();
 
-                if ((helperClass == null)
-                        || connector.getClass().getCanonicalName().equals(helperClass)) {
-                    if (new HashSet<>(connector.getProtocols())
-                            .containsAll(server.getProtocols())) {
+                if (((helperClass == null)
+                        || connector.getClass().getCanonicalName().equals(helperClass))
+                        && new HashSet<>(connector.getProtocols()).containsAll(server.getProtocols())) {
                         try {
                             result =
                                     connector
                                             .getClass()
-                                            .getConstructor(org.restlet.Server.class)
+                                            .getConstructor(Server.class)
                                             .newInstance(server);
                         } catch (Exception e) {
                             Context.getCurrentLogger()
@@ -558,7 +551,7 @@ public org.restlet.engine.connector.ConnectorHelper<org.restlet.Server> createHe
                                             e);
                         }
                     }
-                }
+
             }
 
             if (result == null) {
@@ -600,7 +593,7 @@ private void discoverAuthenticators() throws IOException {
      */
     private void discoverConnectors() throws IOException {
         registerHelpers(DESCRIPTOR_CLIENT_PATH, getRegisteredClients(), Client.class);
-        registerHelpers(DESCRIPTOR_SERVER_PATH, getRegisteredServers(), org.restlet.Server.class);
+        registerHelpers(DESCRIPTOR_SERVER_PATH, getRegisteredServers(), Server.class);
         registerDefaultConnectors();
     }
 
@@ -739,7 +732,7 @@ public List<org.restlet.engine.connector.ProtocolHelper> getRegisteredProtocols(
      *
      * @return The list of available server connectors.
      */
-    public List<org.restlet.engine.connector.ConnectorHelper<org.restlet.Server>>
+    public List<ConnectorHelper<Server>>
             getRegisteredServers() {
         return this.registeredServers;
     }
@@ -805,9 +798,9 @@ public void registerHelper(
                                     .getConstructor(constructorClass)
                                     .newInstance(constructorClass.cast(null)));
                 }
-            } catch (Throwable t) {
+            } catch (Exception exception) {
                 Context.getCurrentLogger()
-                        .log(Level.INFO, "Unable to register the helper " + provider, t);
+                        .log(Level.INFO, "Unable to register the helper " + provider, exception);
             }
         }
     }
@@ -883,7 +876,9 @@ protected java.net.URLConnection openConnection(java.net.URL url)
                                 return new java.net.URLConnection(url) {
 
                                     @Override
-                                    public void connect() throws IOException {}
+                                    public void connect() {
+                                        // no connection to open
+                                    }
 
                                     @Override
                                     public InputStream getInputStream() throws IOException {
@@ -1010,7 +1005,7 @@ public void setRegisteredProtocols(
      * @param registeredServers The list of available server helpers.
      */
     public void setRegisteredServers(
-            List<org.restlet.engine.connector.ConnectorHelper<org.restlet.Server>>
+            List<ConnectorHelper<Server>>
                     registeredServers) {
         synchronized (this.registeredServers) {
             if (registeredServers != this.registeredServers) {

org.restlet/src/test/java/org/restlet/engine/io/UnclosableOutputStreamTestCase.java

@@ -22,7 +22,7 @@
  *
  * @author Kevin Conaway
  */
-public class UnclosableOutputStreamTestCase {
+class UnclosableOutputStreamTestCase {
 
     static class MockOutputStream extends OutputStream {
         boolean closed = false;
@@ -33,11 +33,13 @@ public void close() {
         }
 
         @Override
-        public void write(int b) {}
+        public void write(int b) {
+            // Do nothing, only closing is relevant for this test
+        }
     }
 
     @Test
-    public void testClose() throws IOException {
+    void testClose() throws IOException {
         final MockOutputStream stream = new MockOutputStream();
         final OutputStream out = new UnclosableOutputStream(stream);
         out.close();
@@ -48,7 +50,7 @@ public void testClose() throws IOException {
     }
 
     @Test
-    public void testWrite() throws IOException {
+    void testWrite() throws IOException {
         final ByteArrayOutputStream stream = new ByteArrayOutputStream();
         final OutputStream out = new UnclosableOutputStream(stream);