Upgrade to Jakarta EE 9

pom.xml

@@ -81,10 +81,6 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>commons-text-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>

src/main/java/hudson/plugins/plot/CSVSeries.java

@@ -30,7 +30,7 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Represents a plot data series configuration from an CSV file.
@@ -113,7 +113,7 @@
             }
 
             if (results == 0) {
-                this.exclusionValuesList = Arrays.asList(PAT_COMMA.split((String) this.exclusionValues));
+                this.exclusionValuesList = Arrays.asList(PAT_COMMA.split(this.exclusionValues));
             }
         }
         loadExclusionSet();
@@ -195,7 +195,7 @@
             }
 
             // load existing plot file
-            inputReader = new InputStreamReader(in, Charset.defaultCharset().name());
+            inputReader = new InputStreamReader(in, Charset.defaultCharset());
             reader = new CSVReader(inputReader);
             String[] nextLine;
 
@@ -206,7 +206,7 @@
             int lineNum = 0;
             while ((nextLine = reader.readNext()) != null) {
                 // skip empty lines
-                if (nextLine.length == 1 && nextLine[0].length() == 0) {
+                if (nextLine.length == 1 && nextLine[0].isEmpty()) {
                     continue;
                 }
 
@@ -217,7 +217,7 @@
                     yvalue = nextLine[index].trim();
 
                     // empty value, caused by e.g. trailing comma in CSV
-                    if (yvalue.trim().length() == 0) {
+                    if (yvalue.trim().isEmpty()) {
                         continue;
                     }
 
@@ -278,27 +278,22 @@
             return false;
         }
 
-        boolean retVal;
-        switch (inclusionFlag) {
-            case INCLUDE_BY_STRING:
-                // if the set contains it, don't exclude it.
-                retVal = !checkExclusionSet(label);
-                break;
-            case EXCLUDE_BY_STRING:
-                // if the set doesn't contain it, exclude it.
-                retVal = checkExclusionSet(label);
-                break;
-            case INCLUDE_BY_COLUMN:
-                // if the set contains it, don't exclude it.
-                retVal = !(colExclusionSet.contains(Integer.valueOf(index)));
-                break;
-            case EXCLUDE_BY_COLUMN:
-                // if the set doesn't contain it, don't exclude it.
-                retVal = colExclusionSet.contains(Integer.valueOf(index));
-                break;
-            default:
-                retVal = false;
-        }
+        boolean retVal =
+                switch (inclusionFlag) {
+                    case INCLUDE_BY_STRING ->
+                    // if the set contains it, don't exclude it.
+                    !checkExclusionSet(label);
+                    case EXCLUDE_BY_STRING ->
+                    // if the set doesn't contain it, exclude it.
+                    checkExclusionSet(label);
+                    case INCLUDE_BY_COLUMN ->
+                    // if the set contains it, don't exclude it.
+                    !(colExclusionSet.contains(index));
+                    case EXCLUDE_BY_COLUMN ->
+                    // if the set doesn't contain it, don't exclude it.
+                    colExclusionSet.contains(index);
+                    default -> false;
+                };
 
         if (LOGGER.isLoggable(Level.FINEST)) {
             LOGGER.finest(((retVal) ? "excluded" : "included") + " CSV Column: " + index + " : " + label);
@@ -405,7 +400,7 @@
         }
 
         @Override
-        public Series newInstance(StaplerRequest req, @NonNull JSONObject formData) throws FormException {
+        public Series newInstance(StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
             return SeriesFactory.createSeries(formData, req);
         }
     }

src/main/java/hudson/plugins/plot/MatrixPlotPublisher.java

@@ -24,7 +24,7 @@
 import org.apache.commons.lang.ObjectUtils;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author lucinka
@@ -33,12 +33,12 @@
 
     private transient Map<MatrixConfiguration, List<Plot>> plotsOfConfigurations = new HashMap<>();
 
-    private transient Map<String, List<Plot>> groupMap = new HashMap<String, List<Plot>>();
+    private transient Map<String, List<Plot>> groupMap = new HashMap<>();
 
     /**
      * Configured plots.
      */
-    private List<Plot> plots = new ArrayList<Plot>();
+    private List<Plot> plots = new ArrayList<>();
 
     public String urlGroupToOriginalGroup(String urlGroup, MatrixConfiguration c) {
         if (urlGroup == null || "nogroup".equals(urlGroup)) {
@@ -51,7 +51,7 @@
                     plotList.add(plot);
                 }
             }
-            if (plotList.size() > 0) {
+            if (!plotList.isEmpty()) {
                 return plotList.get(0).group;
             }
         }
@@ -110,7 +110,7 @@
      */
     public List<Plot> getPlots(MatrixConfiguration configuration) {
         List<Plot> p = plotsOfConfigurations.get(configuration);
-        return (p != null) ? p : new ArrayList<Plot>();
+        return (p != null) ? p : new ArrayList<>();
     }
 
     public List<Plot> getPlots() {
@@ -164,7 +164,7 @@
                         p.yaxisMaximum,
                         p.description);
                 plot.series = p.series;
-                plot.setProject((MatrixConfiguration) build.getProject());
+                plot.setProject(build.getProject());
                 addPlot(plot);
             }
         }
@@ -226,17 +226,17 @@
          * Called when the user saves the project configuration.
          */
         @Override
-        public Publisher newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public Publisher newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             MatrixPlotPublisher publisher = new MatrixPlotPublisher();
-            List<Plot> plots = new ArrayList<Plot>();
+            List<Plot> plots = new ArrayList<>();
             for (Object data : SeriesFactory.getArray(formData.get("plots"))) {
                 plots.add(bindPlot((JSONObject) data, req));
             }
             publisher.setPlots(plots);
             return publisher;
         }
 
-        private static Plot bindPlot(JSONObject data, StaplerRequest req) {
+        private static Plot bindPlot(JSONObject data, StaplerRequest2 req) {
             Plot p = req.bindJSON(Plot.class, data);
             p.series = SeriesFactory.createSeriesList(data.get("series"), req);
             return p;