Use isEmpty() where possible

jenkinsci · Dec 17, 2024 · ca0562e · ca0562e
1 parent 898e98d
commit ca0562e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/CloudHelper.java b/src/main/java/hudson/plugins/ec2/CloudHelper.java
@@ -58,7 +58,7 @@ static Instance getInstance(String instanceId, EC2Cloud cloud) throws AmazonClie
         if (reservations.size() != 1) {
             String message = "Unexpected number of reservations reported by EC2 for instance id '" + instanceId
                     + "', expected 1 result, found " + reservations + ".";
-            if (reservations.size() == 0) {
+            if (reservations.isEmpty()) {
                 message += " Instance seems to be dead.";
             }
             LOGGER.info(message);
@@ -70,7 +70,7 @@ static Instance getInstance(String instanceId, EC2Cloud cloud) throws AmazonClie
         if (instances.size() != 1) {
             String message = "Unexpected number of instances reported by EC2 for instance id '" + instanceId
                     + "', expected 1 result, found " + instances + ".";
-            if (instances.size() == 0) {
+            if (instances.isEmpty()) {
                 message += " Instance seems to be dead.";
             }
             LOGGER.info(message);

diff --git a/src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java b/src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java
@@ -765,7 +765,7 @@ public long getLaunchTimeoutInMillis() {
     }
 
     public String getRemoteAdmin() {
-        if (remoteAdmin == null || remoteAdmin.length() == 0) {
+        if (remoteAdmin == null || remoteAdmin.isEmpty()) {
             return amiType.isWindows() ? "Administrator" : "root";
         }
         return remoteAdmin;
@@ -775,7 +775,7 @@ String getRootCommandPrefix() {
         String commandPrefix = (amiType.isUnix()
                 ? ((UnixData) amiType).getRootCommandPrefix()
                 : (amiType.isMac() ? ((MacData) amiType).getRootCommandPrefix() : ""));
-        if (commandPrefix == null || commandPrefix.length() == 0) {
+        if (commandPrefix == null || commandPrefix.isEmpty()) {
             return "";
         }
         return commandPrefix + " ";
@@ -785,7 +785,7 @@ String getSlaveCommandPrefix() {
         String commandPrefix = (amiType.isUnix()
                 ? ((UnixData) amiType).getSlaveCommandPrefix()
                 : (amiType.isMac() ? ((MacData) amiType).getSlaveCommandPrefix() : ""));
-        if (commandPrefix == null || commandPrefix.length() == 0) {
+        if (commandPrefix == null || commandPrefix.isEmpty()) {
             return "";
         }
         return commandPrefix + " ";
@@ -795,7 +795,7 @@ String getSlaveCommandSuffix() {
         String commandSuffix = (amiType.isUnix()
                 ? ((UnixData) amiType).getSlaveCommandSuffix()
                 : (amiType.isMac() ? ((MacData) amiType).getSlaveCommandSuffix() : ""));
-        if (commandSuffix == null || commandSuffix.length() == 0) {
+        if (commandSuffix == null || commandSuffix.isEmpty()) {
             return "";
         }
         return " " + commandSuffix;
@@ -813,7 +813,7 @@ public int getSshPort() {
         String sshPort = (amiType.isUnix()
                 ? ((UnixData) amiType).getSshPort()
                 : (amiType.isMac() ? ((MacData) amiType).getSshPort() : "22"));
-        if (sshPort == null || sshPort.length() == 0) {
+        if (sshPort == null || sshPort.isEmpty()) {
             return 22;
         }
 

diff --git a/src/main/java/hudson/plugins/ec2/EC2Cloud.java b/src/main/java/hudson/plugins/ec2/EC2Cloud.java
@@ -965,7 +965,7 @@ void attemptReattachOrphanOrStoppedNodes(Jenkins jenkinsInstance, SlaveTemplate
             orphansOrStopped.remove(0);
         }
         attachSlavesToJenkins(jenkinsInstance, template.toSlaves(orphansOrStopped), template);
-        if (orphansOrStopped.size() > 0) {
+        if (!orphansOrStopped.isEmpty()) {
             LOGGER.info("Found and re-attached " + orphansOrStopped.size() + " orphan/stopped nodes");
         }
     }
@@ -1170,7 +1170,7 @@ public static String getAwsPartitionHostForService(String region, String service
      * Convert a configured hostname like 'us-east-1' to a FQDN or ip address
      */
     public static String convertHostName(String ec2HostName) {
-        if (ec2HostName == null || ec2HostName.length() == 0) {
+        if (ec2HostName == null || ec2HostName.isEmpty()) {
             ec2HostName = DEFAULT_EC2_HOST;
         }
         if (!ec2HostName.contains(".")) {
@@ -1183,7 +1183,7 @@ public static String convertHostName(String ec2HostName) {
      * Convert a user entered string into a port number "" -&gt; -1 to indicate default based on SSL setting
      */
     public static Integer convertPort(String ec2Port) {
-        if (ec2Port == null || ec2Port.length() == 0) {
+        if (ec2Port == null || ec2Port.isEmpty()) {
             return -1;
         }
         return Integer.parseInt(ec2Port);
@@ -1424,7 +1424,7 @@ protected FormValidation doTestConnection(
                 AmazonEC2 ec2 = AmazonEC2Factory.getInstance().connect(credentialsProvider, ec2endpoint);
                 ec2.describeInstances();
 
-                if (privateKey.trim().length() > 0) {
+                if (!privateKey.trim().isEmpty()) {
                     // check if this key exists
                     EC2PrivateKey pk = new EC2PrivateKey(privateKey);
                     if (pk.find(ec2) == null) {

diff --git a/src/main/java/hudson/plugins/ec2/SlaveTemplate.java b/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
@@ -2117,7 +2117,7 @@ private void setupRootDevice(Image image, List<BlockDeviceMapping> deviceMapping
 
         // get the root device (only one expected in the blockmappings)
         final List<BlockDeviceMapping> rootDeviceMappings = image.getBlockDeviceMappings();
-        if (rootDeviceMappings.size() == 0) {
+        if (rootDeviceMappings.isEmpty()) {
             LOGGER.warning("AMI missing block devices");
             return;
         }
@@ -2553,7 +2553,7 @@ private List<String> getEc2SecurityGroups(AmazonEC2 ec2) throws AmazonClientExce
                         securityGroupSet, this.getParent().name, getCurrentSubnetId()));
         List<String> groupIds = new ArrayList<>();
         DescribeSecurityGroupsResult groupResult = getSecurityGroupsBy("group-name", securityGroupSet, ec2);
-        if (groupResult.getSecurityGroups().size() == 0) {
+        if (groupResult.getSecurityGroups().isEmpty()) {
             groupResult = getSecurityGroupsBy("group-id", securityGroupSet, ec2);
         }
 

diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2MacLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2MacLauncher.java
@@ -193,7 +193,7 @@ protected void launchScript(EC2Computer computer, TaskListener listener)
             conn.exec("mkdir -p " + tmpDir, logger);
 
             if (initScript != null
-                    && initScript.trim().length() > 0
+                    && !initScript.trim().isEmpty()
                     && conn.exec("test -e ~/.hudson-run-init", logger) != 0) {
                 logInfo(computer, listener, "Executing init script");
                 scp.put(initScript.getBytes("UTF-8"), "init.sh", tmpDir, "0700");

diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java
@@ -204,7 +204,7 @@ protected void launchScript(EC2Computer computer, TaskListener listener)
             conn.exec("mkdir -p " + tmpDir, logger);
 
             if (initScript != null
-                    && initScript.trim().length() > 0
+                    && !initScript.trim().isEmpty()
                     && conn.exec("test -e ~/.hudson-run-init", logger) != 0) {
                 logInfo(computer, listener, "Executing init script");
                 scp.put(initScript.getBytes("UTF-8"), "init.sh", tmpDir, "0700");

diff --git a/src/main/java/hudson/plugins/ec2/ssh/verifiers/SshHostKeyVerificationStrategy.java b/src/main/java/hudson/plugins/ec2/ssh/verifiers/SshHostKeyVerificationStrategy.java
@@ -97,7 +97,7 @@ HostKey getHostKeyFromConsole(
         }
 
         String line = getLineWithKey(logger, computer, serverHostKeyAlgorithm);
-        if (line != null && line.length() > 0) {
+        if (line != null && !line.isEmpty()) {
             key = getKeyFromLine(logger, line, listener);
         } else if (line != null) {
             key = new HostKey(serverHostKeyAlgorithm, new byte[] {});

diff --git a/src/main/java/hudson/plugins/ec2/win/EC2WindowsLauncher.java b/src/main/java/hudson/plugins/ec2/win/EC2WindowsLauncher.java
@@ -60,7 +60,7 @@ protected void launchScript(EC2Computer computer, TaskListener listener)
                 return;
             }
 
-            if (initScript != null && initScript.trim().length() > 0 && !connection.exists(tmpDir + ".jenkins-init")) {
+            if (initScript != null && !initScript.trim().isEmpty() && !connection.exists(tmpDir + ".jenkins-init")) {
                 logger.println("Executing init script");
                 try (OutputStream init = connection.putFile(tmpDir + "init.bat")) {
                     init.write(initScript.getBytes("utf-8"));