Remove Commons Lang 2 usage

pom.xml

@@ -83,6 +83,7 @@ THE SOFTWARE.
     <hpi.compatibleSinceVersion>1885</hpi.compatibleSinceVersion>
     <spotless.check.skip>false</spotless.check.skip>
     <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
+    <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
   </properties>
 
   <dependencyManagement>

src/main/java/hudson/plugins/ec2/CloudHelper.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import org.apache.commons.lang.StringUtils;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.services.ec2.Ec2Client;
@@ -46,7 +45,7 @@
 
     @CheckForNull
     static Instance getInstance(String instanceId, EC2Cloud cloud) throws SdkException {
-        if (StringUtils.isEmpty(instanceId) || cloud == null) {
+        if (instanceId == null || instanceId.isEmpty() || cloud == null) {
             return null;
         }
 

src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java

@@ -50,7 +50,6 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.POST;
@@ -1124,7 +1123,7 @@
     public static ListBoxModel fillZoneItems(AwsCredentialsProvider credentialsProvider, String region) {
         ListBoxModel model = new ListBoxModel();
 
-        if (!StringUtils.isEmpty(region)) {
+        if (region != null && !region.isEmpty()) {
             Ec2Client client =
                     AmazonEC2Factory.getInstance().connect(credentialsProvider, EC2Cloud.parseRegion(region), null);
             DescribeAvailabilityZonesResponse zones = client.describeAvailabilityZones();

src/main/java/hudson/plugins/ec2/EC2Cloud.java

@@ -94,7 +94,6 @@
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.util.Timer;
-import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -924,8 +923,8 @@
                 if (template != null) {
                     List<Tag> instanceTags = sir.tags();
                     for (Tag tag : instanceTags) {
-                        if (StringUtils.equals(tag.key(), EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE)
-                                && StringUtils.equals(
+                        if (Objects.equals(tag.key(), EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE)
+                                && Objects.equals(
                                         tag.value(), getSlaveTypeTagValue(EC2_SLAVE_TYPE_SPOT, template.description))
                                 && sir.launchSpecification().imageId().equals(template.getAmi())) {
 
@@ -988,16 +987,16 @@
 
     private boolean isEc2ProvisionedAmiSlave(List<Tag> tags, String description) {
         for (Tag tag : tags) {
-            if (StringUtils.equals(tag.key(), EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE)) {
+            if (Objects.equals(tag.key(), EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE)) {
                 if (description == null) {
                     return true;
-                } else if (StringUtils.equals(tag.value(), EC2Cloud.EC2_SLAVE_TYPE_DEMAND)
-                        || StringUtils.equals(tag.value(), EC2Cloud.EC2_SLAVE_TYPE_SPOT)) {
+                } else if (Objects.equals(tag.value(), EC2Cloud.EC2_SLAVE_TYPE_DEMAND)
+                        || Objects.equals(tag.value(), EC2Cloud.EC2_SLAVE_TYPE_SPOT)) {
                     // To handle cases where description is null and also upgrade cases for existing agent nodes.
                     return true;
-                } else if (StringUtils.equals(
+                } else if (Objects.equals(
                                 tag.value(), getSlaveTypeTagValue(EC2Cloud.EC2_SLAVE_TYPE_DEMAND, description))
-                        || StringUtils.equals(
+                        || Objects.equals(
                                 tag.value(), getSlaveTypeTagValue(EC2Cloud.EC2_SLAVE_TYPE_SPOT, description))) {
                     return true;
                 } else {
@@ -1229,7 +1228,7 @@
                                         t);
                                 return null;
                             }
-                            if (StringUtils.isEmpty(instanceId)) {
+                            if (instanceId == null || instanceId.isEmpty()) {
                                 try {
                                     Thread.sleep(5000);
                                 } catch (InterruptedException e) {
@@ -1394,7 +1393,7 @@
             final boolean useInstanceProfileForCredentials, final String credentialsId) {
         if (useInstanceProfileForCredentials) {
             return InstanceProfileCredentialsProvider.create();
-        } else if (StringUtils.isBlank(credentialsId)) {
+        } else if (credentialsId == null || credentialsId.isBlank()) {
             return DefaultCredentialsProvider.builder().build();
         } else {
             AmazonWebServicesCredentials credentials = getCredentials(credentialsId);
@@ -1414,10 +1413,11 @@
 
         AwsCredentialsProvider provider = createCredentialsProvider(useInstanceProfileForCredentials, credentialsId);
 
-        if (StringUtils.isNotEmpty(roleArn)) {
+        if (roleArn != null && !roleArn.isEmpty()) {
             AssumeRoleRequest assumeRoleRequest = AssumeRoleRequest.builder()
                     .roleArn(roleArn)
-                    .roleSessionName(StringUtils.defaultIfBlank(roleSessionName, "Jenkins"))
+                    .roleSessionName(
+                            roleSessionName != null && !roleSessionName.isBlank() ? roleSessionName : "Jenkins")
                     .build();
 
             StsClientBuilder stsClientBuilder = StsClient.builder()
@@ -1441,7 +1441,7 @@
 
     @CheckForNull
     private static AmazonWebServicesCredentials getCredentials(@CheckForNull String credentialsId) {
-        if (StringUtils.isBlank(credentialsId)) {
+        if (credentialsId == null || credentialsId.isBlank()) {
             return null;
         }
         return CredentialsMatchers.firstOrNull(
@@ -1592,7 +1592,7 @@
                 @QueryParameter String roleArn, @QueryParameter String roleSessionName) {
             // Don't do anything if the user is only reading the configuration
             if (Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
-                if (StringUtils.isNotEmpty(roleArn) && StringUtils.isBlank(roleSessionName)) {
+                if (roleArn != null && !roleArn.isEmpty() && (roleSessionName == null || roleSessionName.isBlank())) {
                     return FormValidation.warning(
                             "Session Name is recommended when specifying an Arn Role. If empty, 'Jenkins' will be used.");
                 }
@@ -1628,132 +1628,132 @@
                 if (k == null) {
                     validations.add(FormValidation.error(
                             "Failed to find private key file " + System.getProperty(SSH_PRIVATE_KEY_FILEPATH)));
-                    if (!StringUtils.isEmpty(value)) {
+                    if (value != null && !value.isEmpty()) {
                         validations.add(FormValidation.warning(
                                 "Private key file path defined, selected credential will be ignored"));
                     }
                     return FormValidation.aggregate(validations);
                 }
                 privateKey = k.getPrivateKey();
             }
 
             boolean hasStart = false, hasEnd = false;
             BufferedReader br = new BufferedReader(new StringReader(privateKey));
             String line;
             while ((line = br.readLine()) != null) {
                 if (line.equals("-----BEGIN RSA PRIVATE KEY-----")
                         || line.equals("-----BEGIN OPENSSH PRIVATE KEY-----")) {
                     hasStart = true;
                 }
                 if (line.equals("-----END RSA PRIVATE KEY-----") || line.equals("-----END OPENSSH PRIVATE KEY-----")) {
                     hasEnd = true;
                 }
             }
             if (!hasStart) {
                 validations.add(FormValidation.error("This doesn't look like a private key at all"));
             }
             if (!hasEnd) {
                 validations.add(FormValidation.error(
                         "The private key is missing the trailing 'END RSA PRIVATE KEY' marker. Copy&paste error?"));
             }
 
             if (!System.getProperty(SSH_PRIVATE_KEY_FILEPATH, "").isEmpty()) {
-                if (!StringUtils.isEmpty(value)) {
+                if (value != null && !value.isEmpty()) {
                     validations.add(FormValidation.warning("Using private key file instead of selected credential"));
                 } else {
                     validations.add(FormValidation.ok("Using private key file"));
                 }
             }
 
             try {
                 FIPS140Utils.ensurePrivateKeyInFipsMode(privateKey);
             } catch (IllegalArgumentException ex) {
                 validations.add(FormValidation.error(ex, ex.getLocalizedMessage()));
             }
 
             validations.add(FormValidation.ok("SSH key validation successful"));
             return FormValidation.aggregate(validations);
         }
 
         /**
          * Tests the connection settings.
          * <p>
          * Overriding needs to {@code @RequirePOST}
          * @param region
          * @param useInstanceProfileForCredentials
          * @param credentialsId
          * @param sshKeysCredentialsId
          * @param roleArn
          * @param roleSessionName
          * @return the validation result
          * @throws IOException
          * @throws ServletException
          */
         @RequirePOST
         public FormValidation doTestConnection(
                 @AncestorInPath ItemGroup context,
                 @QueryParameter String region,
                 @QueryParameter String altEC2Endpoint,
                 @QueryParameter boolean useInstanceProfileForCredentials,
                 @QueryParameter String credentialsId,
                 @QueryParameter String sshKeysCredentialsId,
                 @QueryParameter String roleArn,
                 @QueryParameter String roleSessionName)
                 throws IOException, ServletException {
             if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
                 return FormValidation.ok();
             }
             try {
                 List<FormValidation> validations = new ArrayList<>();
 
                 LOGGER.fine(() -> "begin doTestConnection()");
                 String privateKey = "";
                 if (System.getProperty(SSH_PRIVATE_KEY_FILEPATH, "").isEmpty()) {
                     LOGGER.fine(() -> "static credential is in use");
                     SSHUserPrivateKey sshCredential = getSshCredential(sshKeysCredentialsId, context);
                     if (sshCredential != null) {
                         privateKey = sshCredential.getPrivateKey();
                     } else {
                         return FormValidation.error(
                                 "Failed to find credential \"" + sshKeysCredentialsId + "\" in store.");
                     }
                 } else {
                     EC2PrivateKey k = EC2PrivateKey.fetchFromDisk();
                     if (k == null) {
                         validations.add(FormValidation.error(
                                 "Failed to find private key file " + System.getProperty(SSH_PRIVATE_KEY_FILEPATH)));
-                        if (!StringUtils.isEmpty(sshKeysCredentialsId)) {
+                        if (sshKeysCredentialsId != null && !sshKeysCredentialsId.isEmpty()) {
                             validations.add(FormValidation.warning(
                                     "Private key file path defined, selected credential will be ignored"));
                         }
                         return FormValidation.aggregate(validations);
                     }
                     privateKey = k.getPrivateKey();
                 }
                 LOGGER.fine(() -> "private key found ok");
 
                 if (Util.fixEmpty(region) == null) {
                     region = DEFAULT_EC2_HOST;
                 }
 
                 AwsCredentialsProvider credentialsProvider = createCredentialsProvider(
                         useInstanceProfileForCredentials, credentialsId, roleArn, roleSessionName, region);
                 Ec2Client ec2 = AmazonEC2Factory.getInstance()
                         .connect(credentialsProvider, parseRegion(region), parseEndpoint(altEC2Endpoint));
                 ec2.describeInstances();
 
                 if (!privateKey.trim().isEmpty()) {
                     // check if this key exists
                     EC2PrivateKey pk = new EC2PrivateKey(privateKey);
                     if (pk.find(ec2) == null) {
                         validations.add(FormValidation.error(
                                 "The EC2 key pair private key isn't registered to this EC2 region (fingerprint is "
                                         + pk.getFingerprint() + ")"));
                     }
                 }
 
                 if (!System.getProperty(SSH_PRIVATE_KEY_FILEPATH, "").isEmpty()) {
-                    if (!StringUtils.isEmpty(sshKeysCredentialsId)) {
+                    if (sshKeysCredentialsId != null && !sshKeysCredentialsId.isEmpty()) {
                         validations.add(
                                 FormValidation.warning("Using private key file instead of selected credential"));
                     } else {

src/main/java/hudson/plugins/ec2/EC2HostAddressProvider.java

@@ -1,7 +1,6 @@
 package hudson.plugins.ec2;
 
 import java.util.Optional;
-import org.apache.commons.lang.StringUtils;
 import software.amazon.awssdk.services.ec2.model.Instance;
 
 public class EC2HostAddressProvider {
@@ -62,6 +61,6 @@ private static String getPrivateIpAddress(Instance instance) {
     }
 
     private static Optional<String> filterNonEmpty(String value) {
-        return Optional.ofNullable(value).filter(StringUtils::isNotEmpty);
+        return Optional.ofNullable(value).filter(s -> !s.isEmpty());
     }
 }

src/main/java/hudson/plugins/ec2/EC2PrivateKey.java

@@ -38,7 +38,6 @@
 import java.util.logging.Logger;
 import javax.crypto.Cipher;
 import jenkins.bouncycastle.api.PEMEncodable;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -145,7 +144,7 @@
             cipher.init(
                     Cipher.DECRYPT_MODE,
                     PEMEncodable.decode(privateKey.getPlainText()).toPrivateKey());
-            byte[] cipherText = Base64.getDecoder().decode(StringUtils.deleteWhitespace(encodedPassword));
+            byte[] cipherText = Base64.getDecoder().decode(encodedPassword.replaceAll("\\s+", ""));
             byte[] plainText = cipher.doFinal(cipherText);
             return new String(plainText, StandardCharsets.US_ASCII);
         } catch (Exception e) {
@@ -161,7 +160,7 @@
 
     @CheckForNull
     public static EC2PrivateKey fetchFromDisk(String filepath) {
-        if (StringUtils.isNotEmpty(filepath)) {
+        if (filepath != null && !filepath.isEmpty()) {
             try {
                 return new EC2PrivateKey(Files.readString(Paths.get(filepath), StandardCharsets.UTF_8));
             } catch (IOException e) {

src/main/java/hudson/plugins/ec2/EC2SlaveMonitor.java

@@ -14,7 +14,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.services.ec2.model.Ec2Exception;
 import software.amazon.awssdk.services.ec2.model.Instance;
@@ -51,7 +50,7 @@
         for (Node node : Jenkins.get().getNodes()) {
             if (node instanceof EC2AbstractSlave ec2Slave) {
                 String instanceId = ec2Slave.getInstanceId();
-                if (StringUtils.isEmpty(instanceId)) {
+                if (instanceId == null || instanceId.isEmpty()) {
                     continue;
                 }
                 EC2Cloud cloud = ec2Slave.getCloud();

src/main/java/hudson/plugins/ec2/EC2SpotSlave.java

@@ -16,7 +16,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.services.ec2.Ec2Client;
@@ -308,7 +307,7 @@
 
     @Override
     public String getInstanceId() {
-        if (StringUtils.isEmpty(instanceId)) {
+        if (instanceId == null || instanceId.isEmpty()) {
             SpotInstanceRequest sr = getSpotRequest();
             if (sr != null) {
                 instanceId = sr.instanceId();

src/main/java/hudson/plugins/ec2/MacData.java

@@ -3,7 +3,6 @@
 import hudson.Extension;
 import hudson.model.Descriptor;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class MacData extends SSHData {
@@ -59,29 +58,29 @@
             return false;
         }
         final MacData other = (MacData) obj;
-        if (StringUtils.isEmpty(rootCommandPrefix)) {
-            if (!StringUtils.isEmpty(other.rootCommandPrefix)) {
+        if (rootCommandPrefix == null || rootCommandPrefix.isEmpty()) {
+            if (other.rootCommandPrefix != null && !other.rootCommandPrefix.isEmpty()) {
                 return false;
             }
         } else if (!rootCommandPrefix.equals(other.rootCommandPrefix)) {
             return false;
         }
-        if (StringUtils.isEmpty(slaveCommandPrefix)) {
-            if (!StringUtils.isEmpty(other.slaveCommandPrefix)) {
+        if (slaveCommandPrefix == null || slaveCommandPrefix.isEmpty()) {
+            if (other.slaveCommandPrefix != null && !other.slaveCommandPrefix.isEmpty()) {
                 return false;
             }
         } else if (!slaveCommandPrefix.equals(other.slaveCommandPrefix)) {
             return false;
         }
-        if (StringUtils.isEmpty(slaveCommandSuffix)) {
-            if (!StringUtils.isEmpty(other.slaveCommandSuffix)) {
+        if (slaveCommandSuffix == null || slaveCommandSuffix.isEmpty()) {
+            if (other.slaveCommandSuffix != null && !other.slaveCommandSuffix.isEmpty()) {
                 return false;
             }
         } else if (!slaveCommandSuffix.equals(other.slaveCommandSuffix)) {
             return false;
         }
-        if (StringUtils.isEmpty(sshPort)) {
-            if (!StringUtils.isEmpty(other.sshPort)) {
+        if (sshPort == null || sshPort.isEmpty()) {
+            if (other.sshPort != null && !other.sshPort.isEmpty()) {
                 return false;
             }
         } else if (!sshPort.equals(other.sshPort)) {

src/main/java/hudson/plugins/ec2/SSHData.java

@@ -1,7 +1,6 @@
 package hudson.plugins.ec2;
 
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
 
 public abstract class SSHData extends AMITypeData {
     protected final String rootCommandPrefix;
@@ -103,29 +102,29 @@
             return false;
         }
         final SSHData other = (SSHData) obj;
-        if (StringUtils.isEmpty(rootCommandPrefix)) {
-            if (!StringUtils.isEmpty(other.rootCommandPrefix)) {
+        if (rootCommandPrefix == null || rootCommandPrefix.isEmpty()) {
+            if (other.rootCommandPrefix != null && !other.rootCommandPrefix.isEmpty()) {
                 return false;
             }
         } else if (!rootCommandPrefix.equals(other.rootCommandPrefix)) {
             return false;
         }
-        if (StringUtils.isEmpty(slaveCommandPrefix)) {
-            if (!StringUtils.isEmpty(other.slaveCommandPrefix)) {
+        if (slaveCommandPrefix == null || slaveCommandPrefix.isEmpty()) {
+            if (other.slaveCommandPrefix != null && !other.slaveCommandPrefix.isEmpty()) {
                 return false;
             }
         } else if (!slaveCommandPrefix.equals(other.slaveCommandPrefix)) {
             return false;
         }
-        if (StringUtils.isEmpty(slaveCommandSuffix)) {
-            if (!StringUtils.isEmpty(other.slaveCommandSuffix)) {
+        if (slaveCommandSuffix == null || slaveCommandSuffix.isEmpty()) {
+            if (other.slaveCommandSuffix != null && !other.slaveCommandSuffix.isEmpty()) {
                 return false;
             }
         } else if (!slaveCommandSuffix.equals(other.slaveCommandSuffix)) {
             return false;
         }
-        if (StringUtils.isEmpty(sshPort)) {
-            if (!StringUtils.isEmpty(other.sshPort)) {
+        if (sshPort == null || sshPort.isEmpty()) {
+            if (other.sshPort != null && !other.sshPort.isEmpty()) {
                 return false;
             }
         } else if (!sshPort.equals(other.sshPort)) {