formating and codacy recommended updates

dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java

@@ -34,6 +34,15 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
      */
     private static final Logger LOGGER = LoggerFactory.getLogger(SSLSocketFactoryEx.class);
 
+    /**
+     * The SSL context.
+     */
+    private SSLContext sslCtxt;
+    /**
+     * The protocols.
+     */
+    private String[] protocols;
+
     /**
      * Constructs a new SSLSocketFactory.
      *
@@ -284,13 +293,4 @@ public class SSLSocketFactoryEx extends SSLSocketFactory {
 
         return aa.toArray(new String[0]);
     }
-
-    /**
-     * The SSL context.
-     */
-    private SSLContext sslCtxt;
-    /**
-     * The protocols.
-     */
-    private String[] protocols;
 }

dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java

@@ -38,6 +38,28 @@ import java.util.Properties;
  * @author Jeremy Long
  */
 public final class Settings {
+    /**
+     * The logger.
+     */
+    private static final Logger LOGGER = LoggerFactory.getLogger(Settings.class);
+    /**
+     * The properties file location.
+     */
+    private static final String PROPERTIES_FILE = "dependencycheck.properties";
+    /**
+     * Thread local settings.
+     */
+    private static final ThreadLocal<Settings> LOCAL_SETTINGS = new ThreadLocal<Settings>();
+    /**
+     * The properties.
+     */
+    private Properties props = null;
+
+    /**
+     * A reference to the temporary directory; used incase it needs to be
+     * deleted during cleanup.
+     */
+    private static File tempDirectory = null;
 
     //<editor-fold defaultstate="collapsed" desc="KEYS used to access settings">
     /**
@@ -403,22 +425,6 @@ public final class Settings {
     }
     //</editor-fold>
 
-    /**
-     * The logger.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(Settings.class);
-    /**
-     * The properties file location.
-     */
-    private static final String PROPERTIES_FILE = "dependencycheck.properties";
-    /**
-     * Thread local settings.
-     */
-    private static final ThreadLocal<Settings> LOCAL_SETTINGS = new ThreadLocal<Settings>();
-    /**
-     * The properties.
-     */
-    private Properties props = null;
 
     /**
      * Private constructor for the Settings class. This class loads the
@@ -788,12 +794,6 @@ public final class Settings {
         return str;
     }
 
-    /**
-     * A reference to the temporary directory; used incase it needs to be
-     * deleted during cleanup.
-     */
-    private static File tempDirectory = null;
-
     /**
      * Returns the temporary directory.
      *

dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedOjectInputStreamTest.java

@@ -24,11 +24,7 @@ import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
 import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -37,25 +33,6 @@ import org.junit.Test;
  */
 public class ExpectedOjectInputStreamTest {
 
-    public ExpectedOjectInputStreamTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     /**
      * Test of resolveClass method, of class ExpectedOjectInputStream.
      */