Minor auto-refactor code cleanup on a massive scale (#1086)

Author: labkey-jeckels

server/bootstrap/src/org/apache/tools/ant/util/FileUtils.java

@@ -37,8 +37,8 @@ public class FileUtils
     // constants, for use in subsequent code (e.g., resolveFile()). These simplified versions should be identical.
     private static final String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.US);
     private static final String PATH_SEP = System.getProperty("path.separator");
-    private static boolean onNetWare = OS_NAME.contains("netware");     // Essentially what Os.isFamily("netware") does
-    private static boolean onDos = PATH_SEP.equals(";") && !onNetWare;  // Essentially what Os.isFamily("dos") does
+    private static final boolean onNetWare = OS_NAME.contains("netware");     // Essentially what Os.isFamily("netware") does
+    private static final boolean onDos = PATH_SEP.equals(";") && !onNetWare;  // Essentially what Os.isFamily("dos") does
 
     /**
      * Method to retrieve The FileUtils, which is shared by all users of this
@@ -109,7 +109,7 @@ public File resolveFile(File file, String filename) {
      * @since Ant 1.7
      */
     public static boolean isContextRelativePath(String filename) {
-        if (!(onDos || onNetWare) || filename.length() == 0) {
+        if (!(onDos || onNetWare) || filename.isEmpty()) {
             return false;
         }
         char sep = File.separatorChar;
@@ -222,7 +222,7 @@ public String[] dissect(String path) {
         if (!isAbsolutePath(path)) {
             throw new BuildException(path + " is not an absolute path");
         }
-        String root = null;
+        String root;
         int colon = path.indexOf(':');
         if (colon > 0 && (onDos || onNetWare)) {
 

server/bootstrap/src/org/labkey/bootstrap/ArgumentParser.java

@@ -24,8 +24,8 @@
  */
 public class ArgumentParser
 {
-    private List<String> _params = new ArrayList<>();
-    private Map<String, String> _options = new HashMap<>();
+    private final List<String> _params = new ArrayList<>();
+    private final Map<String, String> _options = new HashMap<>();
 
     public ArgumentParser(String[] args)
     {

server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java

@@ -64,9 +64,9 @@ public class ExplodedModule
 
     private static final FileComparator _fileComparator = new FileComparator();
 
-    private File _rootDirectory;
+    private final File _rootDirectory;
     private File _sourceModuleFile;
-    private Map<File, Long> _watchedFiles = new HashMap<>();
+    private final Map<File, Long> _watchedFiles = new HashMap<>();
 
     public ExplodedModule(File rootDirectory)
     {

server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java

@@ -77,7 +77,7 @@ private String nameFromModuleXML(InputStream is) throws IOException
             SAXParser parser = SAXParserFactory.newDefaultInstance().newSAXParser();
             parser.parse(is, new DefaultHandler()
             {
-                ArrayList<String> elementStack = new ArrayList<>();
+                final ArrayList<String> elementStack = new ArrayList<>();
 
                 @Override
                 public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException

server/bootstrap/src/org/labkey/bootstrap/ModuleDirectories.java

@@ -16,7 +16,6 @@
 package org.labkey.bootstrap;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.stream.Stream;
 
 /*
@@ -33,7 +32,7 @@ public class ModuleDirectories
     public static final String DEFAULT_MODULES_DIR = "modules";
     public static final String DEFAULT_EXTERNAL_MODULES_DIR = "externalModules";
 
-    private File _modulesDirectory;
+    private final File _modulesDirectory;
     private File _externalModulesDirectory;
 
     public ModuleDirectories(File webAppDirectory)