Merge pull request #237 from jenkinsci/ee9

Require Jenkins 2.479.1

Author: mawinter69

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.86</version>
+    <version>5.6</version>
     <relativePath/>
   </parent>
 
@@ -43,8 +43,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/agent-maintenance-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.440</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <powermock.version>1.6.1</powermock.version>
     <checkstyle.version>10.21.2</checkstyle.version>
     <hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
             <artifactId>bom-${jenkins.baseline}.x</artifactId>
-            <version>3234.v5ca_5154341ef</version>
+            <version>4051.v78dce3ce8b_d6</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceAction.java

@@ -9,6 +9,7 @@
 import hudson.security.Permission;
 import hudson.slaves.SlaveComputer;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -20,13 +21,12 @@
 import java.util.SortedSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.verb.POST;
 
@@ -183,7 +183,7 @@ public Set<RecurringMaintenanceWindow> getRecurringMaintenanceWindows() {
    * @throws ServletException if an error occurs reading the form
    */
   @POST
-  public HttpResponse doAdd(StaplerRequest req) throws IOException, ServletException {
+  public HttpResponse doAdd(StaplerRequest2 req) throws IOException, ServletException {
     computer.checkAnyPermission(CONFIGURE_AND_DISCONNECT);
 
     JSONObject src = req.getSubmittedForm();
@@ -201,7 +201,7 @@ public HttpResponse doAdd(StaplerRequest req) throws IOException, ServletExcepti
    * @throws ServletException if an error occurs reading the form
    */
   @POST
-  public void doAddRecurring(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+  public void doAddRecurring(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
     computer.checkAnyPermission(CONFIGURE_AND_DISCONNECT);
 
     JSONObject src = req.getSubmittedForm();
@@ -325,7 +325,7 @@ public boolean deleteRecurringMaintenance(String id) {
    * @throws ServletException if an error occurs reading the form
    */
   @POST
-  public synchronized HttpResponse doConfigSubmit(StaplerRequest req) throws IOException, ServletException {
+  public synchronized HttpResponse doConfigSubmit(StaplerRequest2 req) throws IOException, ServletException {
     computer.checkPermission(Computer.CONFIGURE);
 
     JSONObject src = req.getSubmittedForm();
@@ -354,7 +354,7 @@ public synchronized HttpResponse doConfigSubmit(StaplerRequest req) throws IOExc
    * @throws IOException when something goes wrong
    */
   @POST
-  public void doEnable(StaplerResponse rsp) throws IOException {
+  public void doEnable(StaplerResponse2 rsp) throws IOException {
     computer.checkPermission(Computer.CONFIGURE);
 
     MaintenanceHelper.getInstance().injectRetentionStrategy(computer);
@@ -368,7 +368,7 @@ public void doEnable(StaplerResponse rsp) throws IOException {
    * @throws IOException when something goes wrong
    */
   @POST
-  public void doDisable(StaplerResponse rsp) throws IOException {
+  public void doDisable(StaplerResponse2 rsp) throws IOException {
     computer.checkPermission(Computer.CONFIGURE);
 
     MaintenanceHelper.getInstance().removeRetentionStrategy(computer);

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceHelper.java

@@ -10,6 +10,7 @@
 import hudson.slaves.SlaveComputer;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -217,6 +218,9 @@ public Set<RecurringMaintenanceWindow> getRecurringMaintenanceWindows(String com
   public MaintenanceDefinitions getMaintenanceDefinitions(String computerName) throws IOException {
 
     LOGGER.log(Level.FINEST, "Loading maintenance list for {0}", getSafeComputerName(computerName));
+    if (Jenkins.get().getComputer(computerName) == null) {
+      return new MaintenanceDefinitions(new TreeSet<>(), new HashSet<>());
+    }
 
     MaintenanceDefinitions md = cache.get(computerName);
 

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceLink.java

@@ -11,6 +11,7 @@
 import hudson.slaves.AbstractCloudComputer;
 import hudson.slaves.SlaveComputer;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -22,15 +23,14 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.management.Badge;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 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;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.verb.POST;
 
@@ -236,7 +236,7 @@ public AutoCompletionCandidates doAutoCompleteLabel(@QueryParameter String value
    * @throws ServletException when reading the form failed
    */
   @POST
-  public void doAdd(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+  public void doAdd(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
     Jenkins j = Jenkins.get();
 
     JSONObject src = req.getSubmittedForm();

src/test/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceActionTest.java

@@ -17,18 +17,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.security.access.AccessDeniedException;
 
 /** Tests for the action. */
 public class MaintenanceActionTest extends BasePermissionChecks {
   @Mock
-  private StaplerRequest req;
+  private StaplerRequest2 req;
   @Mock
-  private StaplerResponse rsp;
+  private StaplerResponse2 rsp;
   private AutoCloseable mocks;
 
   @Before

src/test/java/com/sap/prd/jenkins/plugins/agent_maintenance/MaintenanceHelperTest.java

@@ -35,7 +35,6 @@ public void getMaintenanceWindowsExistingAgent() throws Exception {
   public void getMaintenanceWindowsNonExistingAgent() throws Exception {
     String agentName = "notExisting";
     Set<MaintenanceWindow> mwSet = helper.getMaintenanceWindows(agentName);
-    assertThat(helper.getMaintenanceWindows(agentName).size(), is(0));
     assertThat(mwSet.size(), is(0));
     MaintenanceWindow mw = new MaintenanceWindow("1970-01-01 11:00", "2099-12-31 23:59", "test", true, true, "10", "user", null);
     mwSet.add(mw);