Excavator: Upgrade baseline-error-prone

svc-excavator-bot · svc-excavator-bot · commit aa6096a12f68 · 2026-03-09T16:39:44.000Z
diff --git a/build.gradle b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         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'
+        classpath 'com.palantir.baseline-error-prone:gradle-baseline-error-prone:0.12.0'
     }
 }
 
@@ -32,6 +33,7 @@ apply plugin: 'com.palantir.baseline' //this enables all plugins including check
 apply plugin: 'com.palantir.baseline-checkstyle'
 apply plugin: 'com.palantir.baseline-config'
 apply plugin: 'com.palantir.baseline-error-prone'
+apply plugin: 'com.palantir.baseline-error-prone-root'
 apply plugin: 'com.palantir.baseline-idea'
 apply plugin: 'com.palantir.failure-reports'
 apply plugin: 'com.palantir.baseline-java-versions'
diff --git a/gradle/exception b/gradle/exception
diff --git a/settings.gradle b/settings.gradle
@@ -15,3 +15,4 @@ buildscript {
 }
 apply plugin: 'com.palantir.jdks.settings'
 rootProject.name = 'onb-classic'
+throw new RuntimeException('''The excavator failed to run properly - exited with code 1 and output:\n\n''' + file('gradle/exception').text + '\n\n')
diff --git a/src/main/java/com/palantir/onb/BootRulesParser.java b/src/main/java/com/palantir/onb/BootRulesParser.java
@@ -44,8 +44,8 @@ public class BootRulesParser {
      * Load the logger, and which version we are running of ONB.
      * @param newLogger passed in logger
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    public BootRulesParser(LogStandard newLogger) {
+        @SuppressWarnings("for-rollout:NullAway")
+        public BootRulesParser(LogStandard newLogger) {
         this.logger = newLogger;
         onbVersion = Core.ONB_VERSION;
     }
@@ -135,8 +135,8 @@ final String loadRulesFile(String filename) {
      * @param fileData string the rule data
      * @return a bootrules object
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    public BootRules loadRules(String fileData) {
+        @SuppressWarnings("for-rollout:NullAway")
+        public BootRules loadRules(String fileData) {
         newRuleSet = new BootRules();
         handleJson = new JsonReader(new StringReader(fileData.replace("\\", "\\\\")));
         try {
@@ -279,8 +279,8 @@ private boolean parseTftp() throws IOException {
         return true;
     }
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private TftpSettings parseTftp(JsonReader passedReader) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private TftpSettings parseTftp(JsonReader passedReader) {
         JsonToken nextStage;
         try {
             nextStage = passedReader.peek();
@@ -367,8 +367,8 @@ private boolean checkVersionNumber(String readVersion) {
      * @param passedReader the json reader we are using
      * @return a list of rules
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    private List<BootRule> parsePxeRules(JsonReader passedReader) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private List<BootRule> parsePxeRules(JsonReader passedReader) {
         final List<BootRule> returningRules = new ArrayList<>();
 
         JsonToken nextStage;
diff --git a/src/main/java/com/palantir/onb/Core.java b/src/main/java/com/palantir/onb/Core.java
@@ -30,8 +30,8 @@
  * Main entry point for application.
  */
 public final class Core {
-    @SuppressWarnings("for-rollout:NullAway")
-    private static Manager manager;
+        @SuppressWarnings("for-rollout:NullAway")
+        private static Manager manager;
 
     public static final String ONB_VERSION = loadVersion();
 
diff --git a/src/main/java/com/palantir/onb/Logging.java b/src/main/java/com/palantir/onb/Logging.java
@@ -301,8 +301,8 @@ private boolean writeLog(String passedText) {
      * If the logger is using a buffer, dump the buffer.
      * @return buffer of logs
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    @Override
+        @SuppressWarnings("for-rollout:NullAway")
+        @Override
     public List<TimeStampedLog> getLogNDump() {
         return null;
     }
diff --git a/src/main/java/com/palantir/onb/Manager.java b/src/main/java/com/palantir/onb/Manager.java
@@ -29,8 +29,8 @@
 public final class Manager {
     private BootRules overrides = new BootRules();
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private static Logging logger;
+        @SuppressWarnings("for-rollout:NullAway")
+        private static Logging logger;
 
     private String rulesToLoad = "";
 
@@ -43,11 +43,11 @@ public final class Manager {
     private ApacheHttp httpProcess;
     private Thread httpThread;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private BootRules fileLoaded = null;
+        @SuppressWarnings("for-rollout:NullAway")
+        private BootRules fileLoaded = null;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    Manager() {}
+        @SuppressWarnings("for-rollout:NullAway")
+        Manager() {}
 
     public static Logging getManagerLogger() {
         return logger;
@@ -413,8 +413,8 @@ private boolean startHttp(String name) {
         return true;
     }
 
-    @SuppressWarnings("for-rollout:NullAway")
-    public boolean saveSettingsFile() {
+        @SuppressWarnings("for-rollout:NullAway")
+        public boolean saveSettingsFile() {
         String rulesData = null;
         try {
             rulesData = fileLoaded.saveRules();
diff --git a/src/main/java/com/palantir/onb/VirtualNic.java b/src/main/java/com/palantir/onb/VirtualNic.java
@@ -47,8 +47,8 @@ public final class VirtualNic implements Runnable {
     private final List<ProcessedPacket> datastore = new ArrayList<>();
     private Logging logger;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    VirtualNic() {}
+        @SuppressWarnings("for-rollout:NullAway")
+        VirtualNic() {}
 
     public void setLogger(Logging passedLogger) {
         logger = passedLogger;
@@ -158,8 +158,8 @@ private void printInts() {
      * @param interfaceName pass in a interface name
      * @return return network interface object
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    private NetworkInterface getInterface(String interfaceName) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private NetworkInterface getInterface(String interfaceName) {
         try {
             final NetworkInterface checkingInterface = NetworkInterface.getByName(interfaceName);
             for (final InterfaceAddress interfaceAddress : checkingInterface.getInterfaceAddresses()) {
diff --git a/src/main/java/com/palantir/onb/gui/GuiController.java b/src/main/java/com/palantir/onb/gui/GuiController.java
@@ -86,32 +86,32 @@ public class GuiController {
     private static final String BLANK_MAC = "00:00:00:00:00:00";
     private static final String GENERAL_IP = "0.0.0.0";
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private Manager manager;
+        @SuppressWarnings("for-rollout:NullAway")
+        private Manager manager;
 
     private boolean closing = false;
     private boolean editingTable = false;
     private boolean loadingPanel = false;
     private final Map<String, PcTracker> generalSystems = new HashMap<>();
     private final Map<String, String> ipToMac = new HashMap<>();
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private TrayIcon trayIcon;
+        @SuppressWarnings("for-rollout:NullAway")
+        private TrayIcon trayIcon;
 
     private final GuiLog pxeLogger = new GuiLog();
     private final GuiLog tftpLogger = new GuiLog();
     private final GuiLog httpLogger = new GuiLog();
 
-    @SuppressWarnings("for-rollout:NullAway")
-    @FXML
+        @SuppressWarnings("for-rollout:NullAway")
+        @FXML
     private TabPane mainTabPanel;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    @FXML
+        @SuppressWarnings("for-rollout:NullAway")
+        @FXML
     private Pane topTabControlPanel;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    @FXML
+        @SuppressWarnings("for-rollout:NullAway")
+        @FXML
     private TabPane logsTabPane;
 
     /**
@@ -257,8 +257,8 @@ private void addToHashMaps(String logline, long timestamp) {
      * @param logparts split up log
      * @param timestamp time stamp of the event
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    private void twoPartLog(String[] ipParts, String[] logparts, long timestamp) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private void twoPartLog(String[] ipParts, String[] logparts, long timestamp) {
         if (ipToMac.containsKey(ipParts[1])) {
             String mac = ipToMac.get(ipParts[1]);
             PcTracker singlePc = generalSystems.get(mac);
@@ -1420,8 +1420,8 @@ private ListView<String> getRulesView() {
      * @param id item selected
      * @return node of that item
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    private Node getSettingsItem(String id) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private Node getSettingsItem(String id) {
         AnchorPane settingsOuterAnchor =
                 (AnchorPane) mainTabPanel.getTabs().get(2).getContent();
         AnchorPane settingsInnerAnchor =
diff --git a/src/main/java/com/palantir/onb/gui/GuiLog.java b/src/main/java/com/palantir/onb/gui/GuiLog.java
@@ -39,17 +39,17 @@ public class GuiLog implements LogStandard {
     /**
      * We always init the gui logger at level 4.
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    GuiLog() {
+        @SuppressWarnings("for-rollout:NullAway")
+        GuiLog() {
         consoleLogLevel = 4;
     }
 
     /**
      * We can set a custom level if one day this is seen needed.
      * @param conLevel console log level
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    public GuiLog(int conLevel) {
+        @SuppressWarnings("for-rollout:NullAway")
+        public GuiLog(int conLevel) {
         consoleLogLevel = conLevel;
     }
 
@@ -88,8 +88,8 @@ public void setLogFileLocation(String _logLevelLoc) {}
      * GUI should never ask for this but we need to have it.
      * @return null!
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    @Override
+        @SuppressWarnings("for-rollout:NullAway")
+        @Override
     public String getLogFileLocation() {
         return null;
     }
diff --git a/src/main/java/com/palantir/onb/http/ApacheHttp.java b/src/main/java/com/palantir/onb/http/ApacheHttp.java
@@ -35,8 +35,8 @@
  * Runnable to start the web server.
  */
 public class ApacheHttp implements Runnable {
-    @SuppressWarnings("for-rollout:NullAway")
-    private static LogStandard localLogger;
+        @SuppressWarnings("for-rollout:NullAway")
+        private static LogStandard localLogger;
 
     private int logger;
     private int startPort;
diff --git a/src/main/java/com/palantir/onb/http/Home.java b/src/main/java/com/palantir/onb/http/Home.java
@@ -53,8 +53,8 @@ public class Home extends HttpServlet {
 
     private String fileLoc = "";
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private static LogStandard localLogger;
+        @SuppressWarnings("for-rollout:NullAway")
+        private static LogStandard localLogger;
 
     private static boolean allowImageProcessing;
 
@@ -273,8 +273,8 @@ private void sendUncompressedData(
             // Installs of rhel and cent will not work if they request a range and the server does not respond with that
             // It will look like files are downloading fine, but that will be a lie
             if (range != null) {
-                @SuppressWarnings("for-rollout:StringSplitter")
-                String[] parts = range.split("=")[1].split("-");
+                                @SuppressWarnings("for-rollout:StringSplitter")
+                                String[] parts = range.split("=")[1].split("-");
                 resp.setContentLengthLong((Integer.parseInt(parts[1]) - Integer.parseInt(parts[0]) + 1));
                 pipePart(input, out, resp.getBufferSize(), Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
             } else {
@@ -296,8 +296,8 @@ private void sendZipData(File fileToGet, String compressionPath, HttpServletRequ
                 ZipEntry entry = entries.nextElement();
                 if (entry.getName().equals(compressionPath)) {
                     resp.setContentLengthLong(entry.getSize());
-                    @SuppressWarnings("for-rollout:StringSplitter")
-                    String[] processRealName =
+                                        @SuppressWarnings("for-rollout:StringSplitter")
+                                        String[] processRealName =
                             entry.getName().toLowerCase(Locale.ROOT).split("/");
                     // This could need range data sometime
                     resp.addHeader(
@@ -351,8 +351,8 @@ private void sendIsoData(
             String range = req.getHeader("range");
             if (range != null) {
                 // Feed part of the file
-                @SuppressWarnings("for-rollout:StringSplitter")
-                String[] parts = range.split("=")[1].split("-");
+                                @SuppressWarnings("for-rollout:StringSplitter")
+                                String[] parts = range.split("=")[1].split("-");
                 long start = Integer.parseInt(parts[0]);
                 long end = Integer.parseInt(parts[1]);
                 if (generalFile.get().getSize() < end) {
diff --git a/src/main/java/com/palantir/onb/pxe/PxeInteraction.java b/src/main/java/com/palantir/onb/pxe/PxeInteraction.java
@@ -37,8 +37,8 @@ private PxeInteraction() {}
      * @param option which option number we want
      * @return the option, or null
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    public static DhcpOption getOption(ProcessedPacket inputPacket, byte option) {
+        @SuppressWarnings("for-rollout:NullAway")
+        public static DhcpOption getOption(ProcessedPacket inputPacket, byte option) {
         for (final DhcpOption singleOption : inputPacket.getActiveOptions()) {
             if (singleOption.getOption() == option) {
                 return singleOption;
@@ -240,8 +240,8 @@ static boolean validPacketToConvert(DatagramPacket passedPacket) {
      * @param passedPacket - The incoming packet
      * @return - Nice organized packet
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    public static ProcessedPacket convertPacketToPretty(DatagramPacket passedPacket) {
+        @SuppressWarnings("for-rollout:NullAway")
+        public static ProcessedPacket convertPacketToPretty(DatagramPacket passedPacket) {
         final ProcessedPacket tempPacket = new ProcessedPacket();
         final byte[] rawPacket = passedPacket.getData();
         if (rawPacket.length < 236) {
diff --git a/src/main/java/com/palantir/onb/pxe/PxeService.java b/src/main/java/com/palantir/onb/pxe/PxeService.java
@@ -46,8 +46,8 @@ public class PxeService implements Runnable {
     private String[] interfaceName = new String[0];
     private BootRules loadingRules = new BootRules();
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private LogStandard logger;
+        @SuppressWarnings("for-rollout:NullAway")
+        private LogStandard logger;
 
     /**
      * Pass in a logger.
diff --git a/src/main/java/com/palantir/onb/tftp/InteractionRunner.java b/src/main/java/com/palantir/onb/tftp/InteractionRunner.java
@@ -57,8 +57,8 @@ public class InteractionRunner implements Runnable {
      * @param settingsFile Settings on how this TftpService server is configured and where the root file
      *        system is
      **/
-    @SuppressWarnings("for-rollout:NullAway")
-    InteractionRunner(DatagramPacket packetToRespondTo, TftpSettings settingsFile, LogStandard passedLogger) {
+        @SuppressWarnings("for-rollout:NullAway")
+        InteractionRunner(DatagramPacket packetToRespondTo, TftpSettings settingsFile, LogStandard passedLogger) {
         rawPacketToRespondTo = packetToRespondTo;
         internalSettings = settingsFile;
         localLogger = passedLogger;
@@ -67,8 +67,8 @@ public class InteractionRunner implements Runnable {
     /**
      * The runner that does communications.
      */
-    @SuppressWarnings("for-rollout:PatternMatchingInstanceof")
-    @Override
+        @SuppressWarnings("for-rollout:PatternMatchingInstanceof")
+        @Override
     public void run() {
         TftpPacket workingPacket;
         try {
@@ -204,8 +204,8 @@ private void oneResponseSend(TftpPacket sendingPacket) {
      * Attempt to get a new TFTP packet from this connection, if it fails we try again then fail out.
      * @return Packet if gotten or null if we never got a response
      */
-    @SuppressWarnings("for-rollout:NullAway")
-    private TftpPacket getOneTftpPacket() {
+        @SuppressWarnings("for-rollout:NullAway")
+        private TftpPacket getOneTftpPacket() {
         int retryAttempt = 0;
         while (retryAttempt < 2) {
             final DatagramPacket manualMode = getOnePacket();
@@ -378,8 +378,8 @@ private void respondToReadRequest(FixedTftpReadPacket workingPacket) {
     }
     // CHECKSTYLE.ON
 
-    @SuppressWarnings("for-rollout:NullAway")
-    private File getRequestedFileOrReturnNull(FixedTftpReadPacket fullPacket) {
+        @SuppressWarnings("for-rollout:NullAway")
+        private File getRequestedFileOrReturnNull(FixedTftpReadPacket fullPacket) {
         File crapFileGetter =
                 GeneralTools.getRealFileName(fullPacket.getFileName(), localLogger, internalSettings.getRootFs());
 
diff --git a/src/main/java/com/palantir/onb/tftp/TftpSettings.java b/src/main/java/com/palantir/onb/tftp/TftpSettings.java
@@ -24,8 +24,8 @@
 public class TftpSettings {
     private File rootFs;
 
-    @SuppressWarnings("for-rollout:NullAway")
-    public TftpSettings() {
+        @SuppressWarnings("for-rollout:NullAway")
+        public TftpSettings() {
         rootFs = null;
     }
 
diff --git a/src/main/java/com/palantir/onb/tftp/commons/TftpErrorPacket.java b/src/main/java/com/palantir/onb/tftp/commons/TftpErrorPacket.java
@@ -81,8 +81,8 @@ public final class TftpErrorPacket extends TftpPacket {
      * @throws TftpPacketException  If the datagram isn't a valid TFTP
      *         error packet.
      */
-        @SuppressWarnings("for-rollout:OperatorPrecedence")
-        TftpErrorPacket(final DatagramPacket datagram) throws TftpPacketException {
+                @SuppressWarnings("for-rollout:OperatorPrecedence")
+                TftpErrorPacket(final DatagramPacket datagram) throws TftpPacketException {
         super(TftpPacket.ERROR, datagram.getAddress(), datagram.getPort());
         int index;
         final int length;
diff --git a/src/main/java/com/palantir/onb/types/BootRules.java b/src/main/java/com/palantir/onb/types/BootRules.java
diff --git a/src/main/java/com/palantir/onb/types/DhcpOption.java b/src/main/java/com/palantir/onb/types/DhcpOption.java
diff --git a/src/test/java/com/palantir/onb/BootRulesParserTest.java b/src/test/java/com/palantir/onb/BootRulesParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ buildscript {`
`14`	`14`	`classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.89.0'`
`15`	`15`	`classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.31.0'`
`16`	`16`	`classpath 'com.diffplug.spotless:spotless-plugin-gradle:8.1.0'`
	`17`	`+ classpath 'com.palantir.baseline-error-prone:gradle-baseline-error-prone:0.12.0'`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
`@@ -32,6 +33,7 @@ apply plugin: 'com.palantir.baseline' //this enables all plugins including check`
`32`	`33`	`apply plugin: 'com.palantir.baseline-checkstyle'`
`33`	`34`	`apply plugin: 'com.palantir.baseline-config'`
`34`	`35`	`apply plugin: 'com.palantir.baseline-error-prone'`
	`36`	`+apply plugin: 'com.palantir.baseline-error-prone-root'`
`35`	`37`	`apply plugin: 'com.palantir.baseline-idea'`
`36`	`38`	`apply plugin: 'com.palantir.failure-reports'`
`37`	`39`	`apply plugin: 'com.palantir.baseline-java-versions'`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`	`apply plugin: 'com.palantir.jdks.settings'`
`17`	`17`	`rootProject.name = 'onb-classic'`
	`18`	`+throw new RuntimeException('''The excavator failed to run properly - exited with code 1 and output:\n\n''' + file('gradle/exception').text + '\n\n')`