Merge pull request #124 from alecharp/chore/commons-lang-2-removal

Removes Commons Lang 2 usage

Author: malice00

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.2102.v5f5fe09fccf1</version>
+        <version>6.2122.v70b_7b_f659d72</version>
         <relativePath />
     </parent>
     <groupId>io.jenkins.plugins</groupId>
@@ -21,6 +21,7 @@
         <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
         <node.version>24.12.0</node.version>
         <npm.version>11.6.2</npm.version>
+        <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
     </properties>
     <name>Calendar View Plugin</name>
     <developers>
@@ -68,9 +69,25 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>parameterized-scheduler</artifactId>
+                <!-- TODO Until https://github.com/jenkinsci/bom/commit/72bb85360ded90bce299adc93e385795764fc8c2 in BOM used here -->
+                <version>378.va_234d1c44456</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jenkins.plugins</groupId>
+                <artifactId>extended-timer-trigger</artifactId>
+                <!-- TODO Until BOM updated with plugin in it -->
+                <version>48.vf99b_c63a_685b_</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>commons-text-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>jquery3-api</artifactId>
@@ -88,13 +105,11 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>parameterized-scheduler</artifactId>
-            <version>374.v531b_4f4d99b_3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>extended-timer-trigger</artifactId>
-            <version>48.vf99b_c63a_685b_</version>
             <optional>true</optional>
         </dependency>
         <dependency>

src/main/java/io/jenkins/plugins/view/calendar/CalendarView.java

@@ -32,7 +32,7 @@
 import io.jenkins.plugins.view.calendar.service.CronJobService;
 import io.jenkins.plugins.view.calendar.time.Moment;
 import io.jenkins.plugins.view.calendar.util.RequestUtil;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -423,7 +423,7 @@ public List<CalendarEvent> getEvents() throws ParseException {
     }
 
     public String jsonEscape(final String text) {
-        return StringEscapeUtils.escapeJavaScript(text);
+        return StringEscapeUtils.escapeEcmaScript(text);
     }
 
     @Extension

src/main/java/io/jenkins/plugins/view/calendar/event/CalendarEventFactory.java

@@ -32,14 +32,14 @@
 import io.jenkins.plugins.view.calendar.time.MomentRange;
 import io.jenkins.plugins.view.calendar.util.DateUtil;
 
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 @Restricted(NoExternalUse.class)
 public class CalendarEventFactory {
@@ -70,7 +70,7 @@ private abstract class CalendarEventImpl implements CalendarEvent {
         private transient List<StartedCalendarEvent> lastEvents;
 
         /* default */ final String initId(final String url, final long startTimeInMillis) {
-            return StringUtils.defaultString(url, "")
+            return Objects.requireNonNullElse(url, "")
               .replace("/", "-")
               .toLowerCase(Locale.ENGLISH) + startTimeInMillis;
         }

src/main/java/io/jenkins/plugins/view/calendar/service/CronJobService.java

@@ -35,7 +35,6 @@
 import io.jenkins.plugins.view.calendar.util.PluginUtil;
 
 import jenkins.triggers.TriggeredItem;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.jenkinsci.plugins.parameterizedscheduler.ParameterizedTimerTrigger;
 import org.kohsuke.accmod.Restricted;
@@ -119,15 +118,17 @@ public List<Trigger> getCronTriggers(final Job job, final CalendarViewEventsType
         for (final Trigger<?> jobTrigger: jobTriggers) {
             if (eventsType == CalendarViewEventsType.ALL ||
                     (eventsType == CalendarViewEventsType.BUILDS ^ jobTrigger instanceof SCMTrigger)) {
-                if (StringUtils.isNotBlank(jobTrigger.getSpec())) {
+                if (jobTrigger.getSpec() != null && !jobTrigger.getSpec().isBlank()) {
                     cronTriggers.add(jobTrigger);
                 } else if (PluginUtil.hasParameterizedSchedulerPluginInstalled()
-                        && jobTrigger instanceof ParameterizedTimerTrigger
-                        && StringUtils.isNotBlank(((ParameterizedTimerTrigger) jobTrigger).getParameterizedSpecification())) {
+                        && jobTrigger instanceof ParameterizedTimerTrigger ptt
+                        && ptt.getParameterizedSpecification() != null
+                        && !ptt.getParameterizedSpecification().isBlank()) {
                     cronTriggers.add(jobTrigger);
-                } else if (PluginUtil.hasExtendedTimerTriggerPluginInstalled() &&
-                        jobTrigger instanceof ExtendedTimerTrigger
-                        && StringUtils.isNotBlank(((ExtendedTimerTrigger) jobTrigger).getCronSpec())) {
+                } else if (PluginUtil.hasExtendedTimerTriggerPluginInstalled()
+                        && jobTrigger instanceof ExtendedTimerTrigger ett
+                        && ett.getCronSpec() != null
+                        && !ett.getCronSpec().isBlank()) {
                     cronTriggers.add(jobTrigger);
                 }
             }