Upgrade Commons Lang from 2 to 3 (#2700)

basil · web-flow · commit dda32d0c4eab · 2025-07-30T07:17:33.000+01:00
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -62,6 +62,10 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>caffeine-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>commons-text-api</artifactId>
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/Attribute.java b/plugin/src/main/java/io/jenkins/plugins/casc/Attribute.java
@@ -26,7 +26,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.AccessRestriction;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/BaseConfigurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/BaseConfigurator.java
@@ -33,7 +33,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.AccessRestriction;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java b/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java
@@ -77,7 +77,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationContext.java b/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationContext.java
@@ -7,7 +7,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.kohsuke.stapler.Stapler;
 
 /**
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/Configurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/Configurator.java
@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 
 /**
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java b/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java
@@ -16,7 +16,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringSubstitutor;
 import org.apache.commons.text.TextStringBuilder;
 import org.apache.commons.text.lookup.StringLookup;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/core/HudsonPrivateSecurityRealmConfigurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/core/HudsonPrivateSecurityRealmConfigurator.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/impl/configurators/GlobalConfigurationCategoryConfigurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/impl/configurators/GlobalConfigurationCategoryConfigurator.java
@@ -22,7 +22,7 @@
 import java.util.stream.Collectors;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/DockerSecretSource.java b/plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/DockerSecretSource.java
@@ -8,7 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * {@link SecretSource} implementation relying on <a href="https://docs.docker.com/engine/swarm/secrets">docker secrets</a>.
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/EnvSecretSource.java b/plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/EnvSecretSource.java
@@ -3,7 +3,7 @@
 import hudson.Extension;
 import io.jenkins.plugins.casc.SecretSource;
 import java.util.Optional;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/util/ExtraFieldUtils.java b/plugin/src/main/java/io/jenkins/plugins/casc/util/ExtraFieldUtils.java
@@ -19,16 +19,16 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.lang.reflect.Field;
 import java.util.Iterator;
-import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang3.ClassUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
- * Extends {@link org.apache.commons.lang.reflect.FieldUtils} by adding
+ * Extends {@link org.apache.commons.lang3.reflect.FieldUtils} by adding
  * some utility methods.
  */
 @Restricted(NoExternalUse.class)
-public class ExtraFieldUtils extends org.apache.commons.lang.reflect.FieldUtils {
+public class ExtraFieldUtils extends org.apache.commons.lang3.reflect.FieldUtils {
 
     /**
      * Gets an accessible <code>Field</code> by name without breaking scope.
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategyFactory.java b/plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategyFactory.java
@@ -4,7 +4,7 @@
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class MergeStrategyFactory {
     private static MergeStrategy getMergeStrategy(@Nonnull String name) {
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/yaml/ModelConstructor.java b/plugin/src/main/java/io/jenkins/plugins/casc/yaml/ModelConstructor.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.map.AbstractMapDecorator;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
 import org.yaml.snakeyaml.constructor.Construct;
diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithCodeRule.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithCodeRule.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
 import org.hamcrest.core.StringContains;
 
 /**
@@ -49,7 +48,8 @@ public void before() throws Throwable {
                 if (!configuredWithCode.expected().isInstance(t)) {
                     throw new AssertionError("Unexpected exception ", t);
                 } else {
-                    if (!StringUtils.isBlank(configuredWithCode.message())) {
+                    if (configuredWithCode.message() != null
+                            && !configuredWithCode.message().isBlank()) {
                         boolean match = new StringContains(false, configuredWithCode.message()).matches(t.getMessage());
                         if (!match) {
                             throw new AssertionError("Exception did not contain the expected string: "
diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
 import org.hamcrest.core.StringContains;
 
 /**
@@ -73,7 +72,8 @@ public void before() throws Throwable {
                 if (!configuredWithReadme.expected().isInstance(t)) {
                     throw new AssertionError("Unexpected exception ", t);
                 } else {
-                    if (!StringUtils.isBlank(configuredWithReadme.message())) {
+                    if (configuredWithReadme.message() != null
+                            && !configuredWithReadme.message().isBlank()) {
                         boolean match =
                                 new StringContains(false, configuredWithReadme.message()).matches(t.getMessage());
                         if (!match) {
