From b15e07608f5ddcfb9d88b5a76d860e04f97e60c1 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 21 Dec 2023 07:56:41 -0700
Subject: [PATCH 1/2] Initialize strategy to avoid spotbugs warning

No evidence of any detected bug, but initializing a field in the
constructor seems reasonable, especially since it is using the value
that is assigned in the init() method.

Automated tests pass and the code is covered by the automated tests.
---
 .../jenkins/advancedqueue/PrioritySorterConfiguration.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java b/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
index 4143ccc7..24f6ec6a 100644
--- a/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
+++ b/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
@@ -67,7 +67,10 @@ public class PrioritySorterConfiguration extends GlobalConfiguration {
 
     private SorterStrategy strategy;
 
-    public PrioritySorterConfiguration() {}
+    public PrioritySorterConfiguration() {
+        /* Initalize strategy to prevent spotbugs uninitialized field warning */
+        strategy = DEFAULT_STRATEGY;
+    }
 
     public static void init() {
         PrioritySorterConfiguration prioritySorterConfiguration = PrioritySorterConfiguration.get();

From 3c57d44245c167b66b541689aeacfdf1863c32e3 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 21 Dec 2023 07:58:12 -0700
Subject: [PATCH 2/2] Use spotbugs 4.8.2

Suppress an unread field warning to retain compatibility
---
 pom.xml                                                        | 3 +++
 .../jenkins/advancedqueue/PrioritySorterConfiguration.java     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 46a5f8bd..52f4f973 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,9 @@
     <gitHubRepo>jenkinsci/priority-sorter-plugin</gitHubRepo>
     <jenkins.version>2.401.3</jenkins.version>
     <pmdVersion>6.55.0</pmdVersion>
+    <!-- TODO: Remove when plugin pom is using this version or newer -->
+    <!-- https://github.com/jenkinsci/plugin-pom/pull/869 -->
+    <spotbugs-maven-plugin.version>4.8.2.0</spotbugs-maven-plugin.version>
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
     <spotless.check.skip>false</spotless.check.skip>
diff --git a/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java b/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
index 24f6ec6a..06e06682 100644
--- a/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
+++ b/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
@@ -61,6 +61,7 @@ public class PrioritySorterConfiguration extends GlobalConfiguration {
      * @deprecated used in 2.x - replaces with XXX
      */
     @Deprecated
+    @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "Allow deserialization of old definitions")
     private boolean allowPriorityOnJobs;
 
     private boolean onlyAdminsMayEditPriorityConfiguration = false;