Merge pull request #189 from jenkinsci/ee9

Require Jenkins 2.479.1

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>
 
@@ -35,8 +35,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.462</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <gitHubRepo>jenkinsci/customizable-header-plugin</gitHubRepo>
     <node.version>20.18.0</node.version>
     <npm.version>10.9.1</npm.version>
@@ -50,7 +50,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3893.v213a_42768d35</version>
+        <version>4051.v78dce3ce8b_d6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/io/jenkins/plugins/customizable_header/AppNavLink.java

@@ -17,7 +17,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -98,7 +98,7 @@ public String getLinkUrl() {
         if (url.startsWith("/")) {
           return url;
         }
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
         String rootURL = currentRequest.getContextPath();
         return rootURL + "/" + url;
       }

src/main/java/io/jenkins/plugins/customizable_header/CustomHeaderConfiguration.java

@@ -32,7 +32,7 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 @org.jenkinsci.Symbol("customHeader")
@@ -77,7 +77,7 @@ public GlobalConfigurationCategory getCategory() {
   }
 
   @Override
-  public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+  public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
     boolean result = false;
     try (BulkChange bc = new BulkChange(this)) {
       links.clear();

src/main/java/io/jenkins/plugins/customizable_header/HeaderRootAction.java

@@ -4,18 +4,18 @@
 import hudson.model.UnprotectedRootAction;
 import hudson.model.User;
 import io.jenkins.plugins.customizable_header.headers.LogoSelector;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 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.export.ExportConfig;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -133,7 +133,7 @@ public List<AbstractLink> getLinks() {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object o)
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object o)
         throws IOException, ServletException {
       rsp.serveExposedBean(req, this, new ExportConfig().withFlavor(Flavor.JSON));
     }

src/main/java/io/jenkins/plugins/customizable_header/UserHeader.java

@@ -16,7 +16,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class UserHeader extends UserProperty {
 
@@ -92,7 +92,7 @@ public Set<String> getDismissedMessages() {
   }
 
   @Override
-  public UserProperty reconfigure(StaplerRequest req, @CheckForNull JSONObject form) {
+  public UserProperty reconfigure(StaplerRequest2 req, @CheckForNull JSONObject form) {
     if (links != null) {
       links.clear();
     }

src/main/java/io/jenkins/plugins/customizable_header/headers/ContextAwareHeader.java

@@ -42,7 +42,7 @@ public boolean isEnabled() {
 
   @Override
   public Logo getLogo() {
-    List<Ancestor> ancestors = new ArrayList<>(Stapler.getCurrentRequest().getAncestors());
+    List<Ancestor> ancestors = new ArrayList<>(Stapler.getCurrentRequest2().getAncestors());
     Collections.reverse(ancestors);
     HeaderSelector header = CustomHeaderConfiguration.get().getActiveHeader();
     ContextSelector contextSelector = null;
@@ -53,16 +53,14 @@ public Logo getLogo() {
     for (Ancestor ancestor : ancestors) {
       Object obj = ancestor.getObject();
       LOGGER.log(Level.FINE, "Context: {0}", obj.getClass().getName());
-      if (obj instanceof Run) {
-        Run<?, ?> run = (Run<?, ?>) obj;
+      if (obj instanceof Run<?, ?> run) {
         String symbol = translateSymbol(run.getBuildStatusIconClassName());
         if (symbol != null) {
           return new Symbol(symbol);
         }
         return new Icon(run.getBuildStatusIconClassName());
       }
-      if (obj instanceof Job) {
-        Job<?, ?> job = (Job<?, ?>) obj;
+      if (obj instanceof Job<?, ?> job) {
         if (contextSelector != null && contextSelector.isShowJobWeather()) {
           HealthReport health = job.getBuildHealth();
           return getLogoOrDefault(health.getIconClassName());
@@ -73,17 +71,15 @@ public Logo getLogo() {
         }
         return new Icon(job.getBuildStatusIconClassName());
       }
-      if (obj instanceof AbstractFolder) {
-        AbstractFolder<?> folder = (AbstractFolder<?>) obj;
+      if (obj instanceof AbstractFolder<?> folder) {
         if (contextSelector != null && contextSelector.isShowFolderWeather()) {
           HealthReport health = folder.getBuildHealth();
           return getLogoOrDefault(health.getIconClassName());
         }
         FolderIcon folderIcon = folder.getIcon();
         return new Icon(folderIcon.getIconClassName());
       }
-      if (obj instanceof Computer) {
-        Computer computer = (Computer) obj;
+      if (obj instanceof Computer computer) {
         Logo logo = handleComputerUrl("hudson.model.Computer");
         return Objects.requireNonNullElseGet(logo, () -> new Icon(computer.getIconClassName()));
       }
@@ -105,7 +101,7 @@ public Logo getLogo() {
   }
 
   private Logo handleComputerUrl(String context) {
-    String path = Stapler.getCurrentRequest().getPathInfo();
+    String path = Stapler.getCurrentRequest2().getPathInfo();
     path = path.substring(path.lastIndexOf('/'));
     if (knownPathes.contains(path)) {
       return getLogoOrDefault(context + path);