Excavator: Format Java files (#30)

Author: svc-excavator-bot

build.gradle

@@ -11,7 +11,8 @@ buildscript {
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.75.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.26.0'
-        classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.28.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.89.0'
+        classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.31.0'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:8.1.0'
     }
 }
@@ -144,6 +145,7 @@ repositories {
 
 allprojects {
     apply plugin: 'com.palantir.baseline-null-away'
+    apply plugin: 'com.palantir.java-format'
     tasks.withType(JavaCompile) {
     }
 

src/main/java/com/palantir/onb/BootRulesParser.java

@@ -138,8 +138,7 @@ final String loadRulesFile(String filename) {
     @SuppressWarnings("for-rollout:NullAway")
     public BootRules loadRules(String fileData) {
         newRuleSet = new BootRules();
-        handleJson =
-                new JsonReader(new StringReader(fileData.replace("\\", "\\\\")));
+        handleJson = new JsonReader(new StringReader(fileData.replace("\\", "\\\\")));
         try {
             while (handleJson.hasNext()) {
                 JsonToken tempToken = handleJson.peek();
@@ -166,8 +165,8 @@ private boolean nameProcessor() throws IOException {
 
         if ("compversion".equalsIgnoreCase(nextName)) {
             if (!checkVersionNumber(handleJson.nextString())) {
-                logger.simpleReport("Failed to load rules file, rules seem to be "
-                        + "from a unsupported version.", true);
+                logger.simpleReport(
+                        "Failed to load rules file, rules seem to be " + "from a unsupported version.", true);
                 return false;
             } else {
                 return true;
@@ -228,9 +227,7 @@ private String fileLocParser(String tempLogFileLoc) {
             final int pos = newTempFileLoc.indexOf('\\');
             if (pos + 1 < newTempFileLoc.length()) {
                 if (newTempFileLoc.charAt(pos + 1) == '\\') {
-                    newTempFileLoc = newTempFileLoc.substring(0, pos)
-                            + newTempFileLoc.substring(
-                            pos + 1);
+                    newTempFileLoc = newTempFileLoc.substring(0, pos) + newTempFileLoc.substring(pos + 1);
                 }
             }
         }
@@ -342,15 +339,13 @@ private boolean checkVersionNumber(String readVersion) {
                 }
 
                 // The digit is not the same
-                if (Integer.parseInt(readSplitVal[i]) < Integer.parseInt(
-                        supportedSplitVal[i])) {
+                if (Integer.parseInt(readSplitVal[i]) < Integer.parseInt(supportedSplitVal[i])) {
                     // Read number is smaller than supported
                     return false;
                 } else {
                     // Read number is higher than supported, check against higher
                     for (int k = 0; k < readSplitVal.length; k++) {
-                        if (Integer.parseInt(readSplitVal[k]) == Integer.parseInt(
-                                currentSplitVal[k])) {
+                        if (Integer.parseInt(readSplitVal[k]) == Integer.parseInt(currentSplitVal[k])) {
                             continue;
                         }
                         // The digit is not the same

src/main/java/com/palantir/onb/Core.java

@@ -35,8 +35,7 @@ public final class Core {
 
     public static final String ONB_VERSION = loadVersion();
 
-    private Core() {
-    }
+    private Core() {}
 
     public static Manager getManager() {
         return manager;
@@ -105,7 +104,7 @@ public static void main(final String[] args) {
         }
     }
 
-    //CHECKSTYLE.OFF: CyclomaticComplexity
+    // CHECKSTYLE.OFF: CyclomaticComplexity
     /**
      * Process the parameters the user has entered.
      * @param newLogger Logger to log errors
@@ -126,7 +125,7 @@ private static byte processArgs(Logging newLogger, String[] args) {
                 case "-i" -> {
                     if (argIterator.hasNext()) {
                         if ("any".equalsIgnoreCase(argIterator.next())) {
-                            //this is so we know its set
+                            // this is so we know its set
                             manager.overrideInterfaces(new String[0]);
                         } else {
                             String temp = argIterator.next();
@@ -220,7 +219,7 @@ private static byte processArgs(Logging newLogger, String[] args) {
         }
         return returnStatus;
     }
-    //CHECKSTYLE:ON
+    // CHECKSTYLE:ON
 
     /**
      * Echo out the help information to the console.
@@ -248,7 +247,7 @@ private static void printHelp() {
                 + "\t-lc [level]\t- starts console logger on specified level\n"
                 + "\t-lf [level]\t- starts file logger on specified level\n" + "\t\n" + "\t\n"
                 + "Examples\n" + "\tonb.jar -i vmnet1,en0";
-        //CHECKSTYLE.OFF: RegexpSinglelineJava
+        // CHECKSTYLE.OFF: RegexpSinglelineJava
         System.out.println(output);
     }
 

src/main/java/com/palantir/onb/GeneralTools.java

@@ -22,8 +22,7 @@
  * Functions that are used multiple times.
  */
 public final class GeneralTools {
-    private GeneralTools() {
-    }
+    private GeneralTools() {}
 
     /**
      * Convert from the relative filenames that the packet has in them, to a real system path.

src/main/java/com/palantir/onb/InterfaceData.java

@@ -29,27 +29,26 @@
  */
 public final class InterfaceData {
 
-    private InterfaceData() {
-    }
+    private InterfaceData() {}
 
     /**
      * Output list of interfaces to the console.
      */
     static void printInterfaces() {
         try {
-            final Enumeration<NetworkInterface> interfaces =
-                    NetworkInterface.getNetworkInterfaces();
+            final Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             while (interfaces.hasMoreElements()) {
                 final NetworkInterface networkInterface = interfaces.nextElement();
-                Manager.getManagerLogger().simpleReport(
-                        "Interface \"" + networkInterface.getDisplayName() + "\" - "
-                                + networkInterface.getName() + " - Online:"
-                                + networkInterface.isUp(), false);
-                final List<InterfaceAddress> listingAddress =
-                        networkInterface.getInterfaceAddresses();
+                Manager.getManagerLogger()
+                        .simpleReport(
+                                "Interface \"" + networkInterface.getDisplayName() + "\" - "
+                                        + networkInterface.getName() + " - Online:"
+                                        + networkInterface.isUp(),
+                                false);
+                final List<InterfaceAddress> listingAddress = networkInterface.getInterfaceAddresses();
                 for (final InterfaceAddress singleAddress : listingAddress) {
-                    Manager.getManagerLogger().simpleReport("\t" + singleAddress.getAddress().getHostAddress(),
-                            false);
+                    Manager.getManagerLogger()
+                            .simpleReport("\t" + singleAddress.getAddress().getHostAddress(), false);
                 }
             }
         } catch (final SocketException e) {
@@ -64,8 +63,8 @@ static void printInterfaces() {
      */
     public static boolean verifyNics(String intString) {
         if (intString.contains("-")) {
-            Manager.getManagerLogger().simpleReport("It appears a option was given instead of "
-                    + "a list of interfaces?", true);
+            Manager.getManagerLogger()
+                    .simpleReport("It appears a option was given instead of " + "a list of interfaces?", true);
             return false;
         }
         final List<String> singleInterfaces = new ArrayList<>(Arrays.asList(intString.split(",")));
@@ -74,8 +73,7 @@ public static boolean verifyNics(String intString) {
             return false;
         }
         try {
-            final Enumeration<NetworkInterface> interfaces =
-                    NetworkInterface.getNetworkInterfaces();
+            final Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             while (interfaces.hasMoreElements()) {
                 final NetworkInterface networkInterface = interfaces.nextElement();
                 singleInterfaces.remove(networkInterface.getName());
@@ -102,8 +100,7 @@ public static boolean verifyNics(String intString) {
     public static String[] getInterfaces() {
         List<String> ints = new ArrayList<>();
         try {
-            final Enumeration<NetworkInterface> interfaces =
-                    NetworkInterface.getNetworkInterfaces();
+            final Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             while (interfaces.hasMoreElements()) {
                 final NetworkInterface networkInterface = interfaces.nextElement();
                 ints.add(networkInterface.getName());

src/main/java/com/palantir/onb/LogStandard.java

@@ -38,12 +38,7 @@ public interface LogStandard {
 
     void simpleReport(String allLevels, boolean reportingError);
 
-    void report(String level0,
-                       String level1,
-                       String level2,
-                       String level3,
-                       String level4,
-                       boolean reportingError);
+    void report(String level0, String level1, String level2, String level3, String level4, boolean reportingError);
 
     List<TimeStampedLog> getLogNDump();
 

src/main/java/com/palantir/onb/Logging.java

@@ -36,7 +36,7 @@
  * about packet and response 4 - Most verbose level of output 5 - Pcap File, currently disabled.
  */
 public class Logging implements LogStandard {
-    //CHECKSTYLE.OFF: RegexpSinglelineJava
+    // CHECKSTYLE.OFF: RegexpSinglelineJava
     private int consoleLogLevel;
     private int fileLogLevel;
     private String fileLogSaveLoc = "log.txt";
@@ -159,7 +159,7 @@ public void simpleReport(String allLevels, boolean reportingError) {
         }
     }
 
-    //CHECKSTYLE.OFF: CyclomaticComplexity
+    // CHECKSTYLE.OFF: CyclomaticComplexity
     /**
      * Report for each level.
      * @param level0 console lowest log, file disabled
@@ -171,12 +171,8 @@ public void simpleReport(String allLevels, boolean reportingError) {
      */
     @Override
     @SuppressWarnings("JavaTimeDefaultTimeZone")
-    public void report(String level0,
-                       String level1,
-                       String level2,
-                       String level3,
-                       String level4,
-                       boolean reportingError) {
+    public void report(
+            String level0, String level1, String level2, String level3, String level4, boolean reportingError) {
         String prefix = "";
         if (setDates) {
             final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss - ", Locale.ROOT);
@@ -277,7 +273,7 @@ public void report(String level0,
             System.err.println("Error writing log file");
         }
     }
-    //CHECKSTYLE.ON
+    // CHECKSTYLE.ON
 
     /**
      * Write this log line to the log file.
@@ -286,9 +282,11 @@ public void report(String level0,
      */
     @SuppressWarnings("JavaTimeDefaultTimeZone")
     private boolean writeLog(String passedText) {
-        try (PrintWriter out =
-                new PrintWriter(Files.newBufferedWriter(Paths.get(fileLogSaveLoc), StandardCharsets.UTF_8,
-                        StandardOpenOption.CREATE, StandardOpenOption.APPEND))) {
+        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(
+                Paths.get(fileLogSaveLoc),
+                StandardCharsets.UTF_8,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.APPEND))) {
             final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss - ", Locale.ROOT);
             final LocalDateTime date = LocalDateTime.now(ZoneId.systemDefault());
             out.println(formatter.format(date) + "\t" + passedText);

src/main/java/com/palantir/onb/Manager.java

@@ -198,7 +198,10 @@ void combineRules() {
         }
 
         if (overrides.getTftpSettingSet().getRootFs() != null
-                && overrides.getTftpSettingSet().getRootFs().equals(fileLoaded.getTftpSettingSet().getRootFs())) {
+                && overrides
+                        .getTftpSettingSet()
+                        .getRootFs()
+                        .equals(fileLoaded.getTftpSettingSet().getRootFs())) {
             fileLoaded.setTftpSettingSet(overrides.getTftpSettingSet());
         }
     }
@@ -253,7 +256,8 @@ public boolean startTftpWithLogger(LogStandard passedLogger) {
     public void startHttpWithLogger(LogStandard passedLogger) {
         if (fileLoaded.getTftpSettingSet().getRootFs() != null) {
             httpProcess = new ApacheHttp(
-                    fileLoaded.getTftpSettingSet().getRootFs(), fileLoaded.getHttpPort(),
+                    fileLoaded.getTftpSettingSet().getRootFs(),
+                    fileLoaded.getHttpPort(),
                     fileLoaded.isAllowIsoExtracting());
             httpProcess.setLocalLogger(passedLogger);
             httpProcess.setLogger(0);
@@ -399,6 +403,7 @@ public boolean flipHttp() {
             return startHttp("Http - ");
         }
     }
+
     private boolean startHttp(String name) {
         httpProcess.setStartPort(fileLoaded.getHttpPort());
         httpProcess.setFolderLoc(fileLoaded.getTftpSettingSet().getRootFs());