Require Jenkins 2.479.1 or newer

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.4</version>
     <relativePath />
   </parent>
 
@@ -33,8 +33,9 @@
     <revision>5.2.1</revision>
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/priority-sorter-plugin</gitHubRepo>
-    <jenkins.baseline>2.452</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.4</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
     <spotless.check.skip>false</spotless.check.skip>

src/main/java/jenkins/advancedqueue/JobGroup.java

@@ -167,8 +167,8 @@
     @Deprecated
     @CheckForNull
     public String getView() {
-        if (jobGroupStrategy instanceof ViewBasedJobInclusionStrategy) {
-            return ((ViewBasedJobInclusionStrategy) jobGroupStrategy).getViewName();
+        if (jobGroupStrategy instanceof ViewBasedJobInclusionStrategy strategy) {
+            return strategy.getViewName();
         }
         return null;
     }

src/main/java/jenkins/advancedqueue/PriorityConfiguration.java

@@ -40,6 +40,7 @@
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -50,7 +51,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.servlet.ServletException;
 import jenkins.advancedqueue.jobinclusion.JobInclusionStrategy;
 import jenkins.advancedqueue.priority.PriorityStrategy;
 import jenkins.model.GlobalConfiguration;
@@ -62,8 +62,8 @@
 import org.jenkins.ui.icon.IconSpec;
 import org.jenkinsci.plugins.workflow.support.steps.ExecutorStepExecution;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * @author Magnus Sandberg
@@ -165,7 +165,7 @@
         return items;
     }
 
-    public void doPriorityConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doPriorityConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         jobGroups = new LinkedList<JobGroup>();
         id2jobGroup = new HashMap<Integer, JobGroup>();
         //
@@ -271,8 +271,8 @@
     }
 
     private boolean isJobInView(Job<?, ?> job, View view) {
-        if (view instanceof ViewGroup) {
-            return isJobInViewGroup(job, (ViewGroup) view);
+        if (view instanceof ViewGroup group) {
+            return isJobInViewGroup(job, group);
         } else {
             return view.contains((TopLevelItem) job);
         }

src/main/java/jenkins/advancedqueue/PriorityConfigurationPlaceholderTaskHelper.java

@@ -25,8 +25,7 @@
             @NonNull ExecutorStepExecution.PlaceholderTask task,
             @NonNull PriorityConfigurationCallback priorityCallback) {
         Queue.Task ownerTask = task.getOwnerTask();
-        if (ownerTask instanceof Job<?, ?>) {
-            Job<?, ?> job = (Job<?, ?>) ownerTask;
+        if (ownerTask instanceof Job<?, ?> job) {
             ItemInfo itemInfo = QueueItemCache.get().getItem(job.getName());
             if (itemInfo != null) {
                 priorityCallback.setPrioritySelection(itemInfo.getPriority());

src/main/java/jenkins/advancedqueue/jobinclusion/strategy/FolderPropertyLoader.java

@@ -44,14 +44,12 @@
         ItemGroup<?> parent = job.getParent();
         decisionLogger.addDecisionLog(2, "Checking for Cloudbees Folder inclusion ...");
         while (parent != null) {
-            if (parent instanceof AbstractFolder) {
-                AbstractFolder folder = (AbstractFolder) parent;
+            if (parent instanceof AbstractFolder<?> folder) {
                 decisionLogger.addDecisionLog(3, "Evaluating Folder [" + folder.getFullName() + "] ...");
                 DescribableList<AbstractFolderProperty<?>, AbstractFolderPropertyDescriptor> properties =
                         folder.getProperties();
                 for (AbstractFolderProperty<?> property : properties) {
-                    if (property instanceof JobInclusionFolderProperty) {
-                        JobInclusionFolderProperty incProperty = (JobInclusionFolderProperty) property;
+                    if (property instanceof JobInclusionFolderProperty incProperty) {
                         if (incProperty.isUseJobGroup()) {
                             String name = incProperty.getJobGroupName();
                             decisionLogger.addDecisionLog(4, "JobGroup is enabled, with JobGroup [" + name + "] ...");
@@ -60,8 +58,8 @@
                     }
                 }
             }
-            if (parent instanceof TopLevelItem) {
-                parent = ((TopLevelItem) parent).getParent();
+            if (parent instanceof TopLevelItem item) {
+                parent = item.getParent();
             } else {
                 parent = null;
             }

src/main/java/jenkins/advancedqueue/jobinclusion/strategy/PropertyBasedJobInclusionStrategy.java

@@ -125,8 +125,8 @@
         ListBoxModel strategies = new ListBoxModel();
         for (JobGroup jobGroup : jobGroups) {
             JobInclusionStrategy inclusionStrategy = jobGroup.getJobGroupStrategy();
-            if (inclusionStrategy instanceof PropertyBasedJobInclusionStrategy) {
-                strategies.add(((PropertyBasedJobInclusionStrategy) inclusionStrategy).getName());
+            if (inclusionStrategy instanceof PropertyBasedJobInclusionStrategy strategy) {
+                strategies.add(strategy.getName());
             }
         }
         return strategies;

src/main/java/jenkins/advancedqueue/jobinclusion/strategy/ViewBasedJobInclusionStrategy.java

@@ -68,8 +68,8 @@
         private void addViews(String parent, ListBoxModel items, Collection<View> views) {
             for (View view : views) {
                 items.add(parent + view.getDisplayName(), parent + view.getViewName());
-                if (view instanceof ViewGroup) {
-                    addViews(parent + view.getDisplayName() + "/", items, ((ViewGroup) view).getViews());
+                if (view instanceof ViewGroup group) {
+                    addViews(parent + view.getDisplayName() + "/", items, group.getViews());
                 }
             }
         }
@@ -203,8 +203,8 @@
             return true;
         }
         // Then try to iterate over the ViewGroup (Nested View)
-        if (view instanceof ViewGroup) {
-            return isJobInViewGroup(job, (ViewGroup) view);
+        if (view instanceof ViewGroup group) {
+            return isJobInViewGroup(job, group);
         }
         return false;
     }

src/main/java/jenkins/advancedqueue/priority/strategy/JobPropertyStrategy.java

@@ -51,8 +51,7 @@
 
     @CheckForNull
     private Integer getPriorityInternal(Queue.Item item) {
-        if (item != null && item.task instanceof Job<?, ?>) {
-            Job<?, ?> job = (Job<?, ?>) item.task;
+        if (item != null && item.task instanceof Job<?, ?> job) {
             PriorityJobProperty priorityProperty = job.getProperty(PriorityJobProperty.class);
             if (priorityProperty != null && priorityProperty.getUseJobPriority()) {
                 return priorityProperty.priority;

src/main/java/jenkins/advancedqueue/priority/strategy/PriorityJobProperty.java

@@ -41,7 +41,7 @@
 import jenkins.advancedqueue.priority.PriorityStrategy;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Magnus Sandberg
@@ -55,7 +55,7 @@ public class PriorityJobProperty extends JobProperty<Job<?, ?>> {
     public final int priority;
 
     @Override
-    public JobProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+    public JobProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
         return super.reconfigure(req, form);
     }
 

src/main/java/jenkins/advancedqueue/sorter/AdvancedQueueSorter.java

@@ -92,19 +92,21 @@
         //
         if (items.size() > 0 && LOGGER.isLoggable(Level.FINER)) {
             StringBuilder queueStr = new StringBuilder(items.get(0).getClass().getName());
-            queueStr.append(" Queue:\n"
-                    + "+----------------------------------------------------------------------+\n"
-                    + "|   Item Id  |        Job Name       | Priority |        Weight        |\n"
-                    + "+----------------------------------------------------------------------+\n");
+            queueStr.append(
+                    """
+                     Queue:
+                    +----------------------------------------------------------------------+
+                    |   Item Id  |        Job Name       | Priority |        Weight        |
+                    +----------------------------------------------------------------------+
+                    """);
             for (Queue.NotWaitingItem item : items) {
                 ItemInfo itemInfo = QueueItemCache.get().getItem(item.getId());
                 String jobName = itemInfo.getJobName();
                 if (jobName.length() > 21) {
                     jobName = jobName.substring(0, 9) + "..." + jobName.substring(jobName.length() - 9);
                 }
-                queueStr.append(String.format(
-                        "| %10d | %20s | %8d | %20.5f |%n",
-                        item.getId(), jobName, itemInfo.getPriority(), itemInfo.getWeight()));
+                queueStr.append("| %10d | %20s | %8d | %20.5f |%n"
+                        .formatted(item.getId(), jobName, itemInfo.getPriority(), itemInfo.getWeight()));
             }
             queueStr.append("+----------------------------------------------------------------------+");
             LOGGER.log(Level.FINER, queueStr.toString());

src/main/java/jenkins/advancedqueue/sorter/ItemInfo.java

@@ -87,7 +87,7 @@
     }
 
     public PriorityConfigurationCallback addDecisionLog(int indent, String log) {
-        this.decisionLog.add(String.format("%" + ((indent + 1) * 2) + "s%s", "", log));
+        this.decisionLog.add(("%" + ((indent + 1) * 2) + "s%s").formatted("", log));
         return this;
     }
 
@@ -162,8 +162,7 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof ItemInfo) {
-            ItemInfo itemInfo = (ItemInfo) obj;
+        if (obj instanceof ItemInfo itemInfo) {
             return compareTo(itemInfo) == 0;
         }
         return false;
@@ -190,9 +189,8 @@
         if (priorityStrategy != null) {
             reason = priorityStrategy.getDescriptor().getDisplayName();
         }
-        return String.format(
-                "Id: %s, JobName: %s, jobGroupId: %s, reason: %s, priority: %s, weight: %s, status: %s",
-                itemId, jobName, jobGroupId, reason, priority, weight, itemStatus);
+        return "Id: %s, JobName: %s, jobGroupId: %s, reason: %s, priority: %s, weight: %s, status: %s"
+                .formatted(itemId, jobName, jobGroupId, reason, priority, weight, itemStatus);
     }
 
     public String getDescisionLog() {

src/main/java/jenkins/advancedqueue/sorter/StartedJobItemCache.java

@@ -127,8 +127,8 @@ private void maintainCache() {
             final PendingItem pi = it.next();
             final Executable e = pi.workUnit.getExecutable();
 
-            if (e instanceof Run) {
-                startedItems.put(new StartedItem(pi.itemInfo.getJobName(), ((Run<?, ?>) e).getNumber()), pi.itemInfo);
+            if (e instanceof Run<?, ?> run) {
+                startedItems.put(new StartedItem(pi.itemInfo.getJobName(), run.getNumber()), pi.itemInfo);
                 it.remove();
             }
         }

src/main/java/jenkins/advancedqueue/sorter/strategy/MultiBucketStrategy.java

@@ -25,8 +25,8 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.util.ListBoxModel;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import jenkins.advancedqueue.PrioritySorterConfiguration;
 import jenkins.advancedqueue.sorter.SorterStrategy;
 import jenkins.advancedqueue.sorter.SorterStrategyDescriptor;

src/test/java/jenkins/advancedqueue/sorter/strategy/FQStrategyTest.java

@@ -27,7 +27,7 @@ private void assertIncreasingWeight(float initialWeight) {
         for (int i = 0; i < 10; ++i) {
             float newWeight = new FQStrategy().getWeightToUse(1, previousWeight);
             Assert.assertTrue(
-                    String.format("New weight %s should be greater than previous weight %s", newWeight, previousWeight),
+                    "New weight %s should be greater than previous weight %s".formatted(newWeight, previousWeight),
                     newWeight > previousWeight);
             previousWeight = newWeight;
         }

src/test/java/jenkins/advancedqueue/test/SubmitTest.java

@@ -6,10 +6,10 @@
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Charsets;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.advancedqueue.JobGroup;
 import jenkins.advancedqueue.PriorityConfiguration;
 import jenkins.advancedqueue.jobinclusion.strategy.ViewBasedJobInclusionStrategy;
@@ -20,8 +20,8 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.recipes.LocalData;
 import org.kohsuke.stapler.MockStaplerRequest;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class SubmitTest {
 
@@ -33,8 +33,8 @@ public class SubmitTest {
     public void shouldGeneratePriorityConfigurationUsingDataBoundConstructor() throws IOException, ServletException {
         PriorityConfiguration priorityConfiguration =
                 (PriorityConfiguration) j.jenkins.getDescriptor(PriorityConfiguration.class);
-        StaplerResponse staplerResponse = mock(StaplerResponse.class);
-        StaplerRequest staplerRequest = new MockStaplerRequest.MockStaplerRequestBuilder(
+        StaplerResponse2 staplerResponse = mock(StaplerResponse2.class);
+        StaplerRequest2 staplerRequest = new MockStaplerRequest.MockStaplerRequestBuilder(
                         j, "advanced-build-queue/priorityConfigSubmit")
                 .build();
 

src/test/java/org/kohsuke/stapler/MockStaplerRequest.java

@@ -26,11 +26,11 @@
 import static org.mockito.Mockito.mock;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.jvnet.hudson.test.JenkinsRule;
 
 public class MockStaplerRequest {
@@ -63,14 +63,14 @@ public MockStaplerRequestBuilder withAncestor(AncestorImpl ancestor) {
             return this;
         }
 
-        public StaplerRequest build() throws AssertionError {
+        public StaplerRequest2 build() throws AssertionError {
             HttpServletRequest rawRequest = mock(HttpServletRequest.class);
             return new RequestImpl(stapler != null ? stapler : getStapler(), rawRequest, ancestors, tokens);
         }
 
         private Stapler getStapler() {
             final Stapler stapler = new Stapler();
-            stapler.setWebApp(new WebApp(r.jenkins.servletContext));
+            stapler.setWebApp(new WebApp(r.jenkins.getServletContext()));
             return stapler;
         }
     }